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

added the lean joint back and fixed a name mapping reversal in fbxserializer.cpp

Browse source
This commit is contained in:
amantley 2018-12-06 20:16:03 -08:00
parent ca0133a2a6
commit f8ae0227c3
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/fbx/src/FBXSerializer.cpp
View file

@ -1418,7 +1418,7 @@ HFMModel* FBXSerializer::extractHFMModel(const QVariantHash& mapping, const QStr
joint.bindTransformFoundInCluster = false; joint.bindTransformFoundInCluster = false;
hfmModel.joints.append(joint); hfmModel.joints.append(joint);
hfmModel.jointIndices.insert(fbxModel.name, hfmModel.joints.size()); hfmModel.jointIndices.insert(joint.name, hfmModel.joints.size());
QString rotationID = localRotations.value(modelID); QString rotationID = localRotations.value(modelID);
AnimationCurve xRotCurve = animationCurves.value(xComponents.value(rotationID)); AnimationCurve xRotCurve = animationCurves.value(xComponents.value(rotationID));
@ -1843,7 +1843,7 @@ HFMModel* FBXSerializer::extractHFMModel(const QVariantHash& mapping, const QStr
glm::quat rotationOffset = itr.value(); glm::quat rotationOffset = itr.value();
int jointIndex = hfmModel.getJointIndex(jointName); int jointIndex = hfmModel.getJointIndex(jointName);
if (hfmModel.hfmToHifiJointNameMapping.contains(jointName)) { if (hfmModel.hfmToHifiJointNameMapping.contains(jointName)) {
jointIndex = hfmModel.getJointIndex(hfmModel.hfmToHifiJointNameMapping[jointName]); jointIndex = hfmModel.getJointIndex(jointName);
} }
if (jointIndex != -1) { if (jointIndex != -1) {
hfmModel.jointRotationOffsets.insert(jointIndex, rotationOffset); hfmModel.jointRotationOffsets.insert(jointIndex, rotationOffset);