dqn
/
FBX2glTF
mirror of https://github.com/facebookincubator/FBX2glTF.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'geometric_pivot'

This commit is contained in:
K. S. Ernest (iFire) Lee 2022-04-03 16:14:44 -07:00
parent 2bc3fb7bb8 124d12cbde
commit b994b47970
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conanfile.py
View File

@ -9,7 +9,7 @@ from conans import ConanFile, CMake
class FBX2glTFConan(ConanFile):
settings = "os", "compiler", "build_type", "arch"
requires = (
("boost/1.76.0"),
("boost/1.78.0"),
("libiconv/1.15"),
("zlib/1.2.11"),
("libxml2/2.9.12"),

30
src/fbx/Fbx2Raw.cpp
View File

@ -733,8 +733,31 @@ static void ReadNodeHierarchy(
node.rotation = toQuatf(localRotation);
node.scale = toVec3f(localScaling);
const FbxVector4 nodeGeometricTranslationPivot =
pNode->GetGeometricTranslation(FbxNode::eSourcePivot);
const FbxVector4 nodeGeometricRotationPivot = pNode->GetGeometricRotation(FbxNode::eSourcePivot);
FbxVector4 nodeGeometricScalePivot = pNode->GetGeometricScaling(FbxNode::eSourcePivot);
if (abs(nodeGeometricScalePivot[0]) < FBXSDK_FLOAT_EPSILON) {
nodeGeometricScalePivot[0] = 1.0;
}
if (abs(nodeGeometricScalePivot[1]) < FBXSDK_FLOAT_EPSILON) {
nodeGeometricScalePivot[1] = 1.0;
}
if (abs(nodeGeometricScalePivot[2]) < FBXSDK_FLOAT_EPSILON) {
nodeGeometricScalePivot[2] = 1.0;
}
FbxAMatrix matrixGeo;
matrixGeo.SetIdentity();
matrixGeo.SetT(nodeGeometricTranslationPivot);
matrixGeo.SetR(nodeGeometricRotationPivot);
matrixGeo.SetS(nodeGeometricScalePivot);
if (parentId) {
RawNode& parentNode = raw.GetNode(raw.GetNodeById(parentId));
parentNode.translation += toVec3f(matrixGeo.GetT());
const FbxQuaternion nodeRotation = matrixGeo.GetQ();
parentNode.rotation = parentNode.rotation * toQuatf(nodeRotation);
parentNode.scale *= toVec3f(matrixGeo.GetS());
// Add unique child name to the parent node.
if (std::find(parentNode.childIds.begin(), parentNode.childIds.end(), nodeId) ==
parentNode.childIds.end()) {
@ -744,9 +767,14 @@ static void ReadNodeHierarchy(
// If there is no parent then this is the root node.
raw.SetRootNode(nodeId);
}
matrixGeo = matrixGeo.Inverse();
for (int child = 0; child < pNode->GetChildCount(); child++) {
ReadNodeHierarchy(raw, pScene, pNode->GetChild(child), nodeId, newPath);
RawNode& childNode = raw.GetNode(child);
childNode.translation += toVec3f(matrixGeo.GetT());
const FbxQuaternion nodeRotation = matrixGeo.GetQ();
childNode.rotation = childNode.rotation * toQuatf(nodeRotation);
childNode.scale *= toVec3f(matrixGeo.GetS());
}
}