Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not apply geometric offset to loaded FBX. Proper fix TBD

Browse source
This commit is contained in:
sabrina-shanman 2019-10-30 14:28:55 -07:00
parent 9b41fa20c6
commit ecdca05679
1 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1340,9 +1340,6 @@ HFMModel* FBXSerializer::extractHFMModel(const hifi::VariantHash& mapping, const
joint.rotation *= upAxisZRotation;
joint.translation = upAxisZRotation * joint.translation;
}
if (fbxModel.hasGeometricOffset) {
joint.postTransform *= joint.geometricOffset;
}
glm::quat combinedRotation = joint.preRotation * joint.rotation * joint.postRotation;
joint.localTransform = glm::translate(joint.translation) * joint.preTransform * glm::mat4_cast(combinedRotation) * joint.postTransform;
@ -1358,14 +1355,6 @@ HFMModel* FBXSerializer::extractHFMModel(const hifi::VariantHash& mapping, const
joint.globalTransform = parentJoint.globalTransform * joint.localTransform;
joint.inverseDefaultRotation = glm::inverse(combinedRotation) * parentJoint.inverseDefaultRotation;
joint.distanceToParent = glm::distance(extractTranslation(parentJoint.transform), extractTranslation(joint.transform));
if (fbxModel.hasGeometricOffset) {
// Per the FBX standard, geometric offset should not propagate to children.
// However, we must be careful when modifying the behavior of FBXSerializer.
// So, we leave this here, as a breakpoint for debugging, or stub for implementation.
// qCDebug(modelformat) << "Geometric offset encountered on non-leaf node. jointIndex: " << jointIndex << ", modelURL: " << url;
// joint.preTransform = glm::inverse(parentJoint.geometricOffset) * joint.preTransform;
}
}
joint.inverseBindRotation = joint.inverseDefaultRotation;
@ -1381,9 +1370,6 @@ HFMModel* FBXSerializer::extractHFMModel(const hifi::VariantHash& mapping, const
} else {
transformForCluster = localTransformForCluster;
}
if (fbxModel.hasGeometricOffset) {
transformForCluster = transformForCluster * joint.geometricOffset;
}
} else {
transformForCluster = joint.transform;
}