v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-Bugfix: Anim interpolation does not produce invalid floats anymore on one-frame animation tracks 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@221 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
ulfjorensen 2008-11-02 20:49:27 +00:00
parent 0f56c48aca
commit 42123de268
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/assimp_view/AnimEvaluator.cpp
View File

@ -96,8 +96,15 @@ void AnimEvaluator::Evaluate( double pTime)
double diffTime = nextKey.mTime - key.mTime; double diffTime = nextKey.mTime - key.mTime;
if( diffTime < 0.0) if( diffTime < 0.0)
diffTime += mAnim->mDuration; diffTime += mAnim->mDuration;
float factor = (time - key.mTime) / diffTime; if( diffTime > 0)
presentPosition = key.mValue + (nextKey.mValue - key.mValue) * factor; {
float factor = float( (time - key.mTime) / diffTime);
presentPosition = key.mValue + (nextKey.mValue - key.mValue) * factor;
} else
{
presentPosition = key.mValue;
}
mLastPositions[a].get<0>() = frame; mLastPositions[a].get<0>() = frame;
} }
@ -120,9 +127,15 @@ void AnimEvaluator::Evaluate( double pTime)
double diffTime = nextKey.mTime - key.mTime; double diffTime = nextKey.mTime - key.mTime;
if( diffTime < 0.0) if( diffTime < 0.0)
diffTime += mAnim->mDuration; diffTime += mAnim->mDuration;
float factor = (time - key.mTime) / diffTime; if( diffTime > 0)
{
float factor = float( (time - key.mTime) / diffTime);
aiQuaternion::Interpolate( presentRotation, key.mValue, nextKey.mValue, factor);
} else
{
presentRotation = key.mValue;
}
aiQuaternion::Interpolate( presentRotation, key.mValue, nextKey.mValue, factor);
mLastPositions[a].get<1>() = frame; mLastPositions[a].get<1>() = frame;
} }