mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 08:23:53 +00:00
Code Issues Releases Wiki Activity

Don't restrict animations to the keyframe time limits

Browse source
This commit is contained in:
Chris Robinson 2013-04-07 10:03:13 -07:00
parent ab5980ae18
commit 399394ff10
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
components/nifogre/ogrenifloader.cpp
View file

@ -384,10 +384,8 @@ static void buildAnimation(Ogre::Skeleton *skel, const std::string &name, const
lasttrans = curtrans = traniter->mValue;
if(scaleiter != scalekeys.mKeys.end())
lastscale = curscale = Ogre::Vector3(scaleiter->mValue);
float begTime = std::max(kfc->timeStart, startTime);
float endTime = std::min(kfc->timeStop, stopTime);
bool didlast = false;
bool didlast = false;
while(!didlast)
{
float curtime = std::numeric_limits<float>::max();
@ -400,11 +398,11 @@ static void buildAnimation(Ogre::Skeleton *skel, const std::string &name, const
if(scaleiter != scalekeys.mKeys.end())
curtime = std::min(curtime, scaleiter->mTime);
curtime = std::max(curtime, begTime);
if(curtime >= endTime)
curtime = std::max(curtime, startTime);
if(curtime >= stopTime)
{
didlast = true;
curtime = endTime;
curtime = stopTime;
}
// Get the latest quaternions, translations, and scales for the