Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 18:23:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Only recalculate globalTransformForCluster if needed

Browse source
This commit is contained in:
sabrina-shanman 2019-10-30 12:01:25 -07:00
parent 61825f2e06
commit c8bf1ddfea
1 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1330,27 +1330,12 @@ HFMModel* FBXSerializer::extractHFMModel(const hifi::VariantHash& mapping, const
joint.name = fbxModel.name;
joint.bindTransformFoundInCluster = false;
// With the basic joint information, we can start to calculate compound transform information
// modelIDs is ordered from parent to children, so we can safely get parent transforms from earlier joints as we iterate
// First, calculate the FBX-specific transform used for inverse bind transform calculations
glm::quat jointBindCombinedRotation = fbxModel.preRotation * fbxModel.rotation * fbxModel.postRotation;
const glm::mat4 localTransformForCluster = glm::translate(fbxModel.translation) * fbxModel.preTransform * glm::mat4_cast(jointBindCombinedRotation) * fbxModel.postTransform;
glm::mat4 globalTransformForCluster;
if (fbxModel.parentIndex != -1 && fbxModel.parentIndex < (int)jointIndex && !needMixamoHack) {
const glm::mat4& parentGlobalTransformForCluster = globalTransformForClusters[fbxModel.parentIndex];
globalTransformForCluster = parentGlobalTransformForCluster * localTransformForCluster;
} else {
globalTransformForCluster = localTransformForCluster;
}
if (fbxModel.hasGeometricOffset) {
glm::mat4 geometricOffset = createMatFromScaleQuatAndPos(fbxModel.geometricScaling, fbxModel.geometricRotation, fbxModel.geometricTranslation);
globalTransformForCluster = globalTransformForCluster * geometricOffset;
}
globalTransformForClusters.push_back(globalTransformForCluster);
// Make final adjustments to the static joint properties, and pre-calculate static transforms
// Make adjustments to the static joint properties, and pre-calculate static transforms
if (applyUpAxisZRotation && joint.parentIndex == -1) {
joint.rotation *= upAxisZRotation;
@ -1387,7 +1372,26 @@ HFMModel* FBXSerializer::extractHFMModel(const hifi::VariantHash& mapping, const
}
joint.inverseBindRotation = joint.inverseDefaultRotation;
joint.bindTransformFoundInCluster = false;
// If needed, separately calculate the FBX-specific transform used for inverse bind transform calculations
glm::mat4 globalTransformForCluster;
if (applyUpAxisZRotation && joint.parentIndex == -1) {
const glm::quat jointBindCombinedRotation = fbxModel.preRotation * fbxModel.rotation * fbxModel.postRotation;
const glm::mat4 localTransformForCluster = glm::translate(fbxModel.translation) * fbxModel.preTransform * glm::mat4_cast(jointBindCombinedRotation) * fbxModel.postTransform;
if (fbxModel.parentIndex != -1 && fbxModel.parentIndex < (int)jointIndex && !needMixamoHack) {
const glm::mat4& parentGlobalTransformForCluster = globalTransformForClusters[fbxModel.parentIndex];
globalTransformForCluster = parentGlobalTransformForCluster * localTransformForCluster;
} else {
globalTransformForCluster = localTransformForCluster;
}
if (fbxModel.hasGeometricOffset) {
glm::mat4 geometricOffset = createMatFromScaleQuatAndPos(fbxModel.geometricScaling, fbxModel.geometricRotation, fbxModel.geometricTranslation);
globalTransformForCluster = globalTransformForCluster * geometricOffset;
}
} else {
globalTransformForCluster = joint.transform;
}
globalTransformForClusters.push_back(globalTransformForCluster);
// Initialize animation information next
// And also get the joint poses from the first frame of the animation, if present