TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Assimp Import Axis

Browse source 
Build a matrix to fix the assimp import to be zup yforward
This commit is contained in:
marauder2k7 2025-12-10 04:50:58 +00:00
parent b919ab50ed
commit a716107dd2
3 changed files with 81 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/ts/assimp/assimpAppNode.cpp
View file

@ -84,7 +84,11 @@ MatrixF AssimpAppNode::getTransform(F32 time)
// no parent (ie. root level) => scale by global shape <unit>
mLastTransform.identity();
mLastTransform.scale(ColladaUtils::getOptions().unit * ColladaUtils::getOptions().formatScaleFactor);
ColladaUtils::convertTransform(mLastTransform);
if (!isBounds())
{
MatrixF axisFix = ColladaUtils::getOptions().axisCorrectionMat;
mLastTransform.mulL(axisFix);
}
}
// If this node is animated in the active sequence, fetch the animated transform

76
Engine/source/ts/assimp/assimpShapeLoader.cpp
View file

@ -380,7 +380,81 @@ void AssimpShapeLoader::getRootAxisTransform()
meta->Get("CoordAxis", coordAxis);
meta->Get("CoordAxisSign", coordSign);
ColladaUtils::getOptions().upAxis = (domUpAxisType)upAxis;
switch (upAxis)
{
case 0: ColladaUtils::getOptions().upAxis = UPAXISTYPE_X_UP; break;
case 1: ColladaUtils::getOptions().upAxis = UPAXISTYPE_Y_UP; break;
case 2: ColladaUtils::getOptions().upAxis = UPAXISTYPE_Z_UP; break;
default: ColladaUtils::getOptions().upAxis = UPAXISTYPE_Y_UP; break;
}
MatrixF rot(true);
// ===== Y-UP SOURCE =====
if (upAxis == 1)
{
if (frontAxis == 2)
{
// Y-up, Z-forward → Z-up, Y-forward
// Rotate 180° Y, then 90° X
rot(0, 0) = -1.0f;
rot(1, 1) = 0.0f; rot(2, 1) = 1.0f;
rot(1, 2) = 1.0f; rot(2, 2) = 0.0f;
}
else if (frontAxis == 0)
{
// Y-up, X-forward → Z-up, Y-forward
// Rotate -90° around Z then 90° around X
rot(0, 0) = 0.0f; rot(0, 1) = -1.0f;
rot(1, 0) = 1.0f; rot(1, 1) = 0.0f;
rot(2, 2) = 1.0f;
}
}
// ===== Z-UP SOURCE =====
if (upAxis == 2)
{
if (frontAxis == 1)
{
// Already Z-up, Y-forward → no change
}
else if (frontAxis == 0)
{
// Z-up, X-forward → rotate -90° around Z
rot(0, 0) = 0.0f; rot(0, 1) = -1.0f;
rot(1, 0) = 1.0f; rot(1, 1) = 0.0f;
}
}
// ===== X-UP SOURCE =====
if (upAxis == 0)
{
if (frontAxis == 2)
{
// X-up, Z-forward → Z-up, Y-forward
// Rotate -90° around Y then -90° around Z
rot(0, 0) = 0.0f; rot(0, 1) = 0.0f; rot(0, 2) = -1.0f;
rot(1, 0) = 1.0f; rot(1, 1) = 0.0f; rot(1, 2) = 0.0f;
rot(2, 0) = 0.0f; rot(2, 1) = -1.0f; rot(2, 2) = 0.0f;
}
}
// ===== SIGN FLIP =====
if (upSign == -1)
{
rot(0, 2) = -rot(0, 2);
rot(1, 2) = -rot(1, 2);
rot(2, 2) = -rot(2, 2);
}
if (frontSign == -1)
{
rot(0, 1) = -rot(0, 1);
rot(1, 1) = -rot(1, 1);
rot(2, 1) = -rot(2, 1);
}
ColladaUtils::getOptions().axisCorrectionMat = rot;
}
void AssimpShapeLoader::processAnimations()

1
Engine/source/ts/collada/colladaUtils.h
View file

@ -120,6 +120,7 @@ namespace ColladaUtils
eAnimTimingType animTiming; // How to import timing data as frames, seconds or milliseconds
S32 animFPS; // FPS value to use if timing is set in frames and the animations does not have an fps set
F32 formatScaleFactor; // Scale factor applied to convert the shape format default unit to meters
MatrixF axisCorrectionMat;
ImportOptions()
{