TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-22 16:13:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

further assimp fixes

Browse source 
AppMesh position was being scaled twice since the node is now being scaled
Try and resolve fps from file instead of default 30
maxKeyTime should be outside the loop
This commit is contained in:
marauder2k7 2025-11-25 08:32:34 +00:00
parent a5ed09fa57
commit f817d7d903
4 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -279,7 +279,6 @@ void AssimpShapeLoader::enumerateScene()
detectDetails();
aiNode* root = mScene->mRootNode;
for (S32 iNode = 0; iNode < root->mNumChildren; iNode++)
{
aiNode* child = root->mChildren[iNode];
@ -352,6 +351,10 @@ void AssimpShapeLoader::configureImportUnits() {
{
opts.unit = (F32)unit;
}
F32 fps;
getMetaFloat("CustomFrameRate", fps);
opts.animFPS = fps;
}
}
@ -388,21 +391,18 @@ void AssimpShapeLoader::processAnimations()
Vector<aiNodeAnim*> ambientChannels;
F32 duration = 0.0f;
F32 ticks = 0.0f;
F32 maxKeyTime = 0.0f;
if (mScene->mNumAnimations > 0)
{
for (U32 i = 0; i < mScene->mNumAnimations; ++i)
{
aiAnimation* anim = mScene->mAnimations[i];
ticks = anim->mTicksPerSecond;
duration = 0.0f;
for (U32 j = 0; j < anim->mNumChannels; j++)
{
aiNodeAnim* nodeAnim = anim->mChannels[j];
// Determine the maximum keyframe time for this animation
F32 maxKeyTime = 0.0f;
for (U32 k = 0; k < nodeAnim->mNumPositionKeys; k++) {
maxKeyTime = getMax(maxKeyTime, (F32)nodeAnim->mPositionKeys[k].mTime);
}
@ -422,7 +422,7 @@ void AssimpShapeLoader::processAnimations()
ambientSeq->mNumChannels = ambientChannels.size();
ambientSeq->mChannels = ambientChannels.address();
ambientSeq->mDuration = duration;
ambientSeq->mTicksPerSecond = ticks;
ambientSeq->mTicksPerSecond = ColladaUtils::getOptions().animFPS;
AssimpAppSequence* defaultAssimpSeq = new AssimpAppSequence(ambientSeq);
appSequences.push_back(defaultAssimpSeq);