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

Change the way that unit conversion affects the scene.

This commit is contained in:
PLAINCONCEPTS\davila 2018-01-25 15:42:04 +01:00 committed by Pär Winzell
parent f6ce7e345d
commit 4ec8c8e34d
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Fbx2Raw.cpp
View File

@ -26,6 +26,8 @@
extern bool verboseOutput; extern bool verboseOutput;
float scaleFactor;
template<typename _type_> template<typename _type_>
class FbxLayerElementAccess class FbxLayerElementAccess
{ {
@ -757,6 +759,9 @@ static void ReadMesh(RawModel &raw, FbxScene *pScene, FbxNode *pNode, const std:
} }
RawSurface &rawSurface = raw.GetSurface(rawSurfaceIndex); RawSurface &rawSurface = raw.GetSurface(rawSurfaceIndex);
Mat4f scaleMatrix = Mat4f::FromScaleVector(Vec3f(scaleFactor, scaleFactor, scaleFactor));
Mat4f invScaleMatrix = scaleMatrix.Inverse();
rawSurface.skeletonRootId = (skinning.IsSkinned()) ? skinning.GetRootNode() : pNode->GetUniqueID(); rawSurface.skeletonRootId = (skinning.IsSkinned()) ? skinning.GetRootNode() : pNode->GetUniqueID();
for (int jointIndex = 0; jointIndex < skinning.GetNodeCount(); jointIndex++) { for (int jointIndex = 0; jointIndex < skinning.GetNodeCount(); jointIndex++) {
@ -764,7 +769,7 @@ static void ReadMesh(RawModel &raw, FbxScene *pScene, FbxNode *pNode, const std:
raw.GetNode(raw.GetNodeById(jointId)).isJoint = true; raw.GetNode(raw.GetNodeById(jointId)).isJoint = true;
rawSurface.jointIds.emplace_back(jointId); rawSurface.jointIds.emplace_back(jointId);
rawSurface.inverseBindMatrices.push_back(toMat4f(skinning.GetInverseBindMatrix(jointIndex))); rawSurface.inverseBindMatrices.push_back(invScaleMatrix * toMat4f(skinning.GetInverseBindMatrix(jointIndex)) * scaleMatrix);
rawSurface.jointGeometryMins.emplace_back(FLT_MAX, FLT_MAX, FLT_MAX); rawSurface.jointGeometryMins.emplace_back(FLT_MAX, FLT_MAX, FLT_MAX);
rawSurface.jointGeometryMaxs.emplace_back(-FLT_MAX, -FLT_MAX, -FLT_MAX); rawSurface.jointGeometryMaxs.emplace_back(-FLT_MAX, -FLT_MAX, -FLT_MAX);
} }
@ -870,9 +875,9 @@ static void ReadMesh(RawModel &raw, FbxScene *pScene, FbxNode *pNode, const std:
const FbxVector2 fbxUV1 = uvLayer1.GetElement(polygonIndex, polygonVertexIndex, controlPointIndex, FbxVector2(0.0f, 0.0f)); const FbxVector2 fbxUV1 = uvLayer1.GetElement(polygonIndex, polygonVertexIndex, controlPointIndex, FbxVector2(0.0f, 0.0f));
RawVertex &vertex = rawVertices[vertexIndex]; RawVertex &vertex = rawVertices[vertexIndex];
vertex.position[0] = (float) fbxPosition[0]; vertex.position[0] = (float) fbxPosition[0] * scaleFactor;
vertex.position[1] = (float) fbxPosition[1]; vertex.position[1] = (float) fbxPosition[1] * scaleFactor;
vertex.position[2] = (float) fbxPosition[2]; vertex.position[2] = (float) fbxPosition[2] * scaleFactor;
vertex.normal[0] = (float) fbxNormal[0]; vertex.normal[0] = (float) fbxNormal[0];
vertex.normal[1] = (float) fbxNormal[1]; vertex.normal[1] = (float) fbxNormal[1];
vertex.normal[2] = (float) fbxNormal[2]; vertex.normal[2] = (float) fbxNormal[2];
@ -906,7 +911,7 @@ static void ReadMesh(RawModel &raw, FbxScene *pScene, FbxNode *pNode, const std:
RawBlendVertex blendVertex; RawBlendVertex blendVertex;
// the morph target data must be transformed just as with the vertex positions above // the morph target data must be transformed just as with the vertex positions above
const FbxVector4 &shapePosition = transform.MultNormalize(targetShape->positions[controlPointIndex]); const FbxVector4 &shapePosition = transform.MultNormalize(targetShape->positions[controlPointIndex]);
blendVertex.position = toVec3f(shapePosition - fbxPosition); blendVertex.position = toVec3f(shapePosition - fbxPosition) * scaleFactor;
if (targetShape->normals.LayerPresent()) { if (targetShape->normals.LayerPresent()) {
const FbxVector4 &normal = targetShape->normals.GetElement( const FbxVector4 &normal = targetShape->normals.GetElement(
polygonIndex, polygonVertexIndex, controlPointIndex, FbxVector4(0.0f, 0.0f, 0.0f, 0.0f), inverseTransposeTransform, true); polygonIndex, polygonVertexIndex, controlPointIndex, FbxVector4(0.0f, 0.0f, 0.0f, 0.0f), inverseTransposeTransform, true);
@ -1108,7 +1113,7 @@ static void ReadNodeHierarchy(
const FbxQuaternion localRotation = localTransform.GetQ(); const FbxQuaternion localRotation = localTransform.GetQ();
const FbxVector4 localScaling = computeLocalScale(pNode); const FbxVector4 localScaling = computeLocalScale(pNode);
node.translation = toVec3f(localTranslation); node.translation = toVec3f(localTranslation) * scaleFactor;
node.rotation = toQuatf(localRotation); node.rotation = toQuatf(localRotation);
node.scale = toVec3f(localScaling); node.scale = toVec3f(localScaling);
@ -1129,7 +1134,7 @@ static void ReadNodeHierarchy(
} }
static void ReadAnimations(RawModel &raw, FbxScene *pScene) static void ReadAnimations(RawModel &raw, FbxScene *pScene)
{ {
FbxTime::EMode eMode = FbxTime::eFrames24; FbxTime::EMode eMode = FbxTime::eFrames24;
const double epsilon = 1e-5f; const double epsilon = 1e-5f;
@ -1205,7 +1210,7 @@ static void ReadAnimations(RawModel &raw, FbxScene *pScene)
fabs(localScale[1] - baseScaling[1]) > epsilon || fabs(localScale[1] - baseScaling[1]) > epsilon ||
fabs(localScale[2] - baseScaling[2]) > epsilon); fabs(localScale[2] - baseScaling[2]) > epsilon);
channel.translations.push_back(toVec3f(localTranslation)); channel.translations.push_back(toVec3f(localTranslation) * scaleFactor);
channel.rotations.push_back(toQuatf(localRotation)); channel.rotations.push_back(toQuatf(localRotation));
channel.scales.push_back(toVec3f(localScale)); channel.scales.push_back(toVec3f(localScale));
} }
@ -1419,9 +1424,7 @@ bool LoadFBXFile(RawModel &raw, const char *fbxFileName, const char *textureExte
// Use meters as the default unit for glTF // Use meters as the default unit for glTF
FbxSystemUnit sceneSystemUnit = pScene->GetGlobalSettings().GetSystemUnit(); FbxSystemUnit sceneSystemUnit = pScene->GetGlobalSettings().GetSystemUnit();
if (sceneSystemUnit != FbxSystemUnit::m) { scaleFactor = FbxSystemUnit::m.GetConversionFactorFrom(sceneSystemUnit);
FbxSystemUnit::m.ConvertScene(pScene);
}
ReadNodeHierarchy(raw, pScene, pScene->GetRootNode(), 0, ""); ReadNodeHierarchy(raw, pScene, pScene->GetRootNode(), 0, "");
ReadNodeAttributes(raw, pScene, pScene->GetRootNode(), textureLocations); ReadNodeAttributes(raw, pScene, pScene->GetRootNode(), textureLocations);