Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-19 10:00:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support using blendshapes in file without needing an FST

Browse source
This commit is contained in:
David Rowe 2020-08-31 21:31:55 +12:00
parent 0fcc73d5cd
commit bd1be872a8
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libraries/fbx/src/GLTFSerializer.cpp
View file

@ -1544,25 +1544,33 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash&
// Build morph targets (blend shapes) // Build morph targets (blend shapes)
if (!primitive.targets.isEmpty()) { if (!primitive.targets.isEmpty()) {
// Build list of blendshapes from FST // Build list of blendshapes from FST and model.
typedef QPair<int, float> WeightedIndex; typedef QPair<int, float> WeightedIndex;
hifi::VariantHash blendshapeMappings = mapping.value("bs").toHash(); hifi::VariantHash blendshapeMappings = mapping.value("bs").toHash();
QMultiHash<QString, WeightedIndex> blendshapeIndices; QMultiHash<QString, WeightedIndex> blendshapeIndices;
for (int i = 0;; ++i) { for (int i = 0;; ++i) {
hifi::ByteArray blendshapeName = BLENDSHAPE_NAMES[i]; auto blendshapeName = QString(BLENDSHAPE_NAMES[i]);
if (blendshapeName.isEmpty()) { if (blendshapeName.isEmpty()) {
break; break;
} }
QList<QVariant> mappings = blendshapeMappings.values(blendshapeName); auto mappings = blendshapeMappings.values(blendshapeName);
if (mappings.count() > 0) {
// Use blendshape from mapping.
foreach(const QVariant& mapping, mappings) { foreach(const QVariant& mapping, mappings) {
QVariantList blendshapeMapping = mapping.toList(); auto blendshapeMapping = mapping.toList();
blendshapeIndices.insert(blendshapeMapping.at(0).toByteArray(), WeightedIndex(i, blendshapeMapping.at(1).toFloat())); blendshapeIndices.insert(blendshapeMapping.at(0).toString(),
WeightedIndex(i, blendshapeMapping.at(1).toFloat()));
}
} else {
// Use blendshape from model.
if (_file.meshes[node.mesh].extras.targetNames.contains(blendshapeName)) {
blendshapeIndices.insert(blendshapeName, WeightedIndex(i, 1.0f));
}
} }
} }
// glTF morph targets may or may not have names. if they are labeled, add them based on // Create blendshapes.
// the corresponding names from the FST. otherwise, just add them in the order they are given
mesh.blendshapes.resize((int)Blendshapes::BlendshapeCount); mesh.blendshapes.resize((int)Blendshapes::BlendshapeCount);
auto keys = blendshapeIndices.keys(); auto keys = blendshapeIndices.keys();
auto values = blendshapeIndices.values(); auto values = blendshapeIndices.values();