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

animation playback cleanups

Browse source 
courtessy of marauder
This commit is contained in:
AzaezelX 2025-12-17 15:42:13 -06:00
parent 9d4bfec4d1
commit 5b0f559c9f
1 changed files with 18 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

55
Engine/source/ts/assimp/assimpAppSequence.cpp
View file

@ -48,52 +48,33 @@ AssimpAppSequence::~AssimpAppSequence()
void AssimpAppSequence::determineTimeMultiplier(aiAnimation* a) void AssimpAppSequence::determineTimeMultiplier(aiAnimation* a)
{ {
// Set fps from the file or use default // Assimp convention: if mTicksPerSecond == 0, assume 25 Hz
fps = (a->mTicksPerSecond > 0) ? a->mTicksPerSecond : 30.0f; const float ticksPerSecond =
(a->mTicksPerSecond > 0.0)
if (fps >= 1000.0f) { // Indicates milliseconds (GLTF or similar formats) ? (float)a->mTicksPerSecond
mTimeMultiplier = 1.0f / 1000.0f; // Convert milliseconds to seconds : 25.0f;
Con::printf("[Assimp] Detected milliseconds timing (FPS >= 1000). Time Multiplier: %f", mTimeMultiplier);
}
else if (fps > 0.0f) { // Standard FPS
fps = mClamp(fps, 5 /*TSShapeLoader::MinFrameRate*/, TSShapeLoader::MaxFrameRate);
mTimeMultiplier = 1.0f / fps;
Con::printf("[Assimp] Standard FPS detected. Time Multiplier: %f", mTimeMultiplier);
}
else {
// Fall back to 30 FPS as default
mTimeMultiplier = 1.0f / 30.0f;
Con::printf("[Assimp] FPS not specified. Using default 30 FPS. Time Multiplier: %f", mTimeMultiplier);
}
mTimeMultiplier = 1.0f / ticksPerSecond;
Con::printf(
"[Assimp] TicksPerSecond: %f, Time Multiplier: %f",
ticksPerSecond,
mTimeMultiplier
);
} }
void AssimpAppSequence::calculateSequenceEnd(aiAnimation* a) void AssimpAppSequence::calculateSequenceEnd(aiAnimation* a)
{ {
for (U32 i = 0; i < a->mNumChannels; ++i) { // mDuration is in ticks
aiNodeAnim* nodeAnim = a->mChannels[i]; seqEnd = (F32)a->mDuration * mTimeMultiplier;
F32 maxKeyTime = 0.0f;
// Calculate the maximum time across all keyframes for this channel Con::printf(
for (U32 k = 0; k < nodeAnim->mNumPositionKeys; ++k) { "[Assimp] Sequence End Time: %f seconds (Duration ticks: %f)",
maxKeyTime = getMax(maxKeyTime, (F32)nodeAnim->mPositionKeys[k].mTime); seqEnd,
} (F32)a->mDuration
for (U32 k = 0; k < nodeAnim->mNumRotationKeys; ++k) { );
maxKeyTime = getMax(maxKeyTime, (F32)nodeAnim->mRotationKeys[k].mTime);
}
for (U32 k = 0; k < nodeAnim->mNumScalingKeys; ++k) {
maxKeyTime = getMax(maxKeyTime, (F32)nodeAnim->mScalingKeys[k].mTime);
}
// Use the multiplier to convert to real sequence time
seqEnd = mTimeMultiplier * getMax(seqEnd, maxKeyTime);
}
Con::printf("[Assimp] Sequence End Time: %f seconds", seqEnd);
} }
void AssimpAppSequence::setActive(bool active) void AssimpAppSequence::setActive(bool active)
{ {
if (active) if (active)