Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 22:29:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Need to allow multiple blendshape mappings per shape index.

Browse source
This commit is contained in:
Andrzej Kapolka 2013-10-03 14:35:58 -07:00
parent cc5cc1a409
commit b2b9e1e0bf
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
interface/src/renderer/FBXReader.cpp
View file

@ -210,7 +210,7 @@ QVariantHash parseMapping(QIODevice* device) {
for (int i = 2; i < sections.size(); i++) {
contents.append(sections.at(i).trimmed());
}
heading.insert(sections.at(1).trimmed(), contents);
heading.insertMulti(sections.at(1).trimmed(), contents);
properties.insert(name, heading);
}
}
@ -360,12 +360,15 @@ FBXGeometry extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping)
if (blendshapeName.isEmpty()) {
break;
}
QVariantList blendshapeMapping = blendshapeMappings.value(blendshapeName).toList();
if (blendshapeMapping.isEmpty()) {
QList<QVariant> mappings = blendshapeMappings.values(blendshapeName);
if (mappings.isEmpty()) {
blendshapeIndices.insert("ExpressionBlendshapes." + blendshapeName, QPair<int, float>(i, 1.0f));
} else {
blendshapeIndices.insert(blendshapeMapping.at(0).toByteArray(),
QPair<int, float>(i, blendshapeMapping.at(1).toFloat()));
foreach (const QVariant& mapping, mappings) {
QVariantList blendshapeMapping = mapping.toList();
blendshapeIndices.insert(blendshapeMapping.at(0).toByteArray(),
QPair<int, float>(i, blendshapeMapping.at(1).toFloat()));
}
}
}
QHash<qint64, QPair<int, float> > blendshapeChannelIndices;