AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-28 07:32:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve handling of reaching the stop animation text key

Browse Source
This commit is contained in:
Chris Robinson 2013-04-23 05:34:08 -07:00
parent c4806f01f8
commit 8c9e2e0ee9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/openmw/mwrender/animation.cpp
View File

@ -449,6 +449,7 @@ void Animation::doLoop(size_t layeridx)
mLayer[layeridx].mTime = mLayer[layeridx].mLoopStartKey->first; mLayer[layeridx].mTime = mLayer[layeridx].mLoopStartKey->first;
mLayer[layeridx].mNextKey = mLayer[layeridx].mLoopStartKey; mLayer[layeridx].mNextKey = mLayer[layeridx].mLoopStartKey;
mLayer[layeridx].mNextKey++; mLayer[layeridx].mNextKey++;
mLayer[layeridx].mPlaying = true;
if(layeridx == 0 && mNonAccumCtrl) if(layeridx == 0 && mNonAccumCtrl)
mLastPosition = mNonAccumCtrl->getTranslation(mLayer[layeridx].mTime) * mAccumulate; mLastPosition = mNonAccumCtrl->getTranslation(mLayer[layeridx].mTime) * mAccumulate;
} }
@ -608,7 +609,7 @@ Ogre::Vector3 Animation::runAnimation(float duration)
if(layeridx == 0 && mNonAccumRoot) if(layeridx == 0 && mNonAccumRoot)
movement += updatePosition(); movement += updatePosition();
mLayer[layeridx].mPlaying = (mLayer[layeridx].mLooping || mLayer[layeridx].mStopKey->first > mLayer[layeridx].mTime); mLayer[layeridx].mPlaying = (key != mLayer[layeridx].mStopKey);
timepassed = targetTime - mLayer[layeridx].mTime; timepassed = targetTime - mLayer[layeridx].mTime;
if(!handleTextKey(layeridx, key)) if(!handleTextKey(layeridx, key))