TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 06:34:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

final cleanup

Browse source
This commit is contained in:
marauder2k7 2024-12-12 15:08:01 +00:00
parent 70f546aafe
commit 87de724d31
3 changed files with 0 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -71,8 +71,6 @@ 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);
/*if (!isBounds())
convertMat(mLastTransform);*/
}
// If this node is animated in the active sequence, fetch the animated transform
@ -254,41 +252,6 @@ void AssimpAppNode::assimpToTorqueMat(const aiMatrix4x4& inAssimpMat, MatrixF& o
(F32)inAssimpMat.d3, (F32)inAssimpMat.d4));
}
void AssimpAppNode::convertMat(MatrixF& outMat)
{
MatrixF rot(true);
switch (ColladaUtils::getOptions().upAxis)
{
case UPAXISTYPE_X_UP:
// rotate 90 around Y-axis, then 90 around Z-axis
rot(0, 0) = 0.0f; rot(1, 0) = 1.0f;
rot(1, 1) = 0.0f; rot(2, 1) = 1.0f;
rot(0, 2) = 1.0f; rot(2, 2) = 0.0f;
// pre-multiply the transform by the rotation matrix
outMat.mulL(rot);
break;
case UPAXISTYPE_Y_UP:
// rotate 180 around Y-axis, then 90 around X-axis
rot(0, 0) = 1.0f;
rot(1, 1) = 0.0f;
rot(1, 2) = -1.0f;
rot(2, 1) = 1.0f;
rot(2, 2) = 0.0f;
// pre-multiply the transform by the rotation matrix
outMat.mulL(rot);
break;
case UPAXISTYPE_Z_UP:
default:
// nothing to do
break;
}
}
aiNode* AssimpAppNode::findChildNodeByName(const char* nodeName, aiNode* rootNode)
{
aiNode* retNode = NULL;