mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-05 06:45:34 +00:00
Code Issues Releases Wiki Activity

Fix the completion amount for 0-length anims

Browse source
This commit is contained in:
Chris Robinson 2013-07-23 05:30:37 -07:00
parent d5d832846e
commit fecb8c1cc4
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/openmw/mwrender/animation.cpp
View file

@ -670,8 +670,14 @@ bool Animation::getInfo(const std::string &groupname, float *complete, float *sp
return false;
}
if(complete) *complete = (iter->second.mTime - iter->second.mStartKey->first) /
if(complete)
{
if(iter->second.mStopKey->first > iter->second.mStartKey->first)
*complete = (iter->second.mTime - iter->second.mStartKey->first) /
(iter->second.mStopKey->first - iter->second.mStartKey->first);
else
*complete = (iter->second.mPlaying ? 0.0f : 1.0f);
}
if(speedmult) *speedmult = iter->second.mSpeedMult;
if(start) *start = iter->second.mStartKey->second.substr(groupname.size()+2);
if(stop) *stop = iter->second.mStopKey->second.substr(groupname.size()+2);