Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 16:30:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

(WIP, has debug) Fix FBXSerializer applying geometric transform inconsistently, let HFM prep calculate FBX extents

Browse source
This commit is contained in:
sabrina-shanman 2019-10-29 10:47:27 -07:00
parent f8017d28ff
commit a70f0f2791
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1326,6 +1326,8 @@ HFMModel* FBXSerializer::extractHFMModel(const hifi::VariantHash& mapping, const
joint.isSkeletonJoint = fbxModel.isLimbNode; joint.isSkeletonJoint = fbxModel.isLimbNode;
hfmModel.hasSkeletonJoints = (hfmModel.hasSkeletonJoints || joint.isSkeletonJoint); hfmModel.hasSkeletonJoints = (hfmModel.hasSkeletonJoints || joint.isSkeletonJoint);
// First, calculate the FBX-specific transform used for inverse bind transform calculations
glm::quat jointBindCombinedRotation = joint.preRotation * joint.rotation * joint.postRotation; glm::quat jointBindCombinedRotation = joint.preRotation * joint.rotation * joint.postRotation;
glm::mat4 globalTransformForCluster = glm::translate(joint.translation) * joint.preTransform * glm::mat4_cast(jointBindCombinedRotation) * joint.postTransform; glm::mat4 globalTransformForCluster = glm::translate(joint.translation) * joint.preTransform * glm::mat4_cast(jointBindCombinedRotation) * joint.postTransform;
if (joint.parentIndex != -1 && joint.parentIndex < (int)jointIndex && !needMixamoHack) { if (joint.parentIndex != -1 && joint.parentIndex < (int)jointIndex && !needMixamoHack) {
@ -1338,10 +1340,16 @@ HFMModel* FBXSerializer::extractHFMModel(const hifi::VariantHash& mapping, const
} }
globalTransformForClusters.push_back(globalTransformForCluster); globalTransformForClusters.push_back(globalTransformForCluster);
// Then, calculate the transforms proper
if (applyUpAxisZRotation && joint.parentIndex == -1) { if (applyUpAxisZRotation && joint.parentIndex == -1) {
joint.rotation *= upAxisZRotation; joint.rotation *= upAxisZRotation;
joint.translation = upAxisZRotation * joint.translation; joint.translation = upAxisZRotation * joint.translation;
} }
if (joint.hasGeometricOffset) {
glm::mat4 geometricOffset = createMatFromScaleQuatAndPos(joint.geometricScaling, joint.geometricRotation, joint.geometricTranslation);
joint.postTransform *= geometricOffset;
}
glm::quat combinedRotation = joint.preRotation * joint.rotation * joint.postRotation; glm::quat combinedRotation = joint.preRotation * joint.rotation * joint.postRotation;
if (joint.parentIndex == -1) { if (joint.parentIndex == -1) {
joint.transform = hfmModel.offset * glm::translate(joint.translation) * joint.preTransform * joint.transform = hfmModel.offset * glm::translate(joint.translation) * joint.preTransform *
@ -1405,12 +1413,15 @@ HFMModel* FBXSerializer::extractHFMModel(const hifi::VariantHash& mapping, const
// However, we must be careful when modifying the behavior of FBXSerializer. // 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. // 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; // qCDebug(modelformat) << "Geometric offset encountered on non-leaf node. jointIndex: " << jointIndex << ", modelURL: " << url;
// glm::mat4 geometricOffset = createMatFromScaleQuatAndPos(parentJoint.geometricScaling, parentJoint.geometricRotation, parentJoint.geometricTranslation); // glm::mat4 parentGeometricOffset = createMatFromScaleQuatAndPos(parentJoint.geometricScaling, parentJoint.geometricRotation, parentJoint.geometricTranslation);
// globalTransform = globalTransform * glm::inverse(geometricOffset); // joint.preTransform = glm::inverse(parentGeometricOffset) * joint.preTransform;
} }
} }
if (joint.hasGeometricOffset) { // TODO: Revert after testing
if (false) {
//if (joint.hasGeometricOffset) {
glm::mat4 geometricOffset = createMatFromScaleQuatAndPos(joint.geometricScaling, joint.geometricRotation, joint.geometricTranslation); glm::mat4 geometricOffset = createMatFromScaleQuatAndPos(joint.geometricScaling, joint.geometricRotation, joint.geometricTranslation);
joint.transform = joint.transform * geometricOffset;
joint.globalTransform = joint.globalTransform * geometricOffset; joint.globalTransform = joint.globalTransform * geometricOffset;
} }
@ -1514,8 +1525,6 @@ HFMModel* FBXSerializer::extractHFMModel(const hifi::VariantHash& mapping, const
shape.mesh = meshIndex; shape.mesh = meshIndex;
shape.meshPart = i; shape.meshPart = i;
shape.joint = transformIndex; shape.joint = transformIndex;
hfm::calculateExtentsForShape(shape, hfmModel.meshes, hfmModel.joints);
auto matName = mesh.parts[i].materialID; auto matName = mesh.parts[i].materialID;
auto materialIt = materialNameToID.find(matName.toStdString()); auto materialIt = materialNameToID.find(matName.toStdString());
@ -1687,12 +1696,12 @@ HFMModel* FBXSerializer::extractHFMModel(const hifi::VariantHash& mapping, const
HFMJoint& joint = hfmModel.joints[transformIndex]; HFMJoint& joint = hfmModel.joints[transformIndex];
// Apply geometric offset, if present, by transforming the vertices directly // Apply geometric offset, if present, by transforming the vertices directly
if (joint.hasGeometricOffset) { /*if (joint.hasGeometricOffset) {
glm::mat4 geometricOffset = createMatFromScaleQuatAndPos(joint.geometricScaling, joint.geometricRotation, joint.geometricTranslation); glm::mat4 geometricOffset = createMatFromScaleQuatAndPos(joint.geometricScaling, joint.geometricRotation, joint.geometricTranslation);
for (int i = 0; i < mesh.vertices.size(); i++) { for (int i = 0; i < mesh.vertices.size(); i++) {
mesh.vertices[i] = transformPoint(geometricOffset, mesh.vertices[i]); mesh.vertices[i] = transformPoint(geometricOffset, mesh.vertices[i]);
} }
} }*/
} }
// Store the parts for this mesh (or instance of this mesh, as the case may be) // Store the parts for this mesh (or instance of this mesh, as the case may be)
@ -1719,9 +1728,6 @@ HFMModel* FBXSerializer::extractHFMModel(const hifi::VariantHash& mapping, const
} }
} }
// TODO: The ordering of shape extent calculations is wrong. The entire mesh vertex set is transformed if there is a geometric offset, which would break instancing for FBX models with a geometricOffset.
hfm::calculateExtentsForModel(hfmModel.meshExtents, hfmModel.shapes);
return hfmModelPtr; return hfmModelPtr;
} }