krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Avoid applying the animation when resetting it

Browse source
This commit is contained in:
Chris Robinson 2013-02-19 06:04:25 -08:00
parent f8349a04bf
commit 8196694c08
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -228,8 +228,8 @@ Ogre::Vector3 Animation::updatePosition(float time)
posdiff = (mNonAccumRoot->getPosition() - mLastPosition) * mAccumulate; posdiff = (mNonAccumRoot->getPosition() - mLastPosition) * mAccumulate;
/* Translate the accumulation root back to compensate for the move. */ /* Translate the accumulation root back to compensate for the move. */
mAccumRoot->translate(-posdiff);
mLastPosition += posdiff; mLastPosition += posdiff;
mAccumRoot->setPosition(-mLastPosition);
} }
return posdiff; return posdiff;
} }
@ -247,12 +247,24 @@ void Animation::reset(const std::string &marker)
mNextKey = mCurrentKeys->begin(); mNextKey = mCurrentKeys->begin();
mCurrentTime = 0.0f; mCurrentTime = 0.0f;
} }
applyAnimation(mCurrentAnim, mCurrentTime, mEntityList.mSkelBase->getSkeleton());
if(mNonAccumRoot) if(mNonAccumRoot)
{ {
mLastPosition = mNonAccumRoot->getPosition() * mAccumulate; const Ogre::NodeAnimationTrack *track = 0;
mAccumRoot->setPosition(-mLastPosition); Ogre::Animation::NodeTrackIterator trackiter = mCurrentAnim->getNodeTrackIterator();
while(!track && trackiter.hasMoreElements())
{
const Ogre::NodeAnimationTrack *cur = trackiter.getNext();
if(cur->getAssociatedNode()->getName() == mNonAccumRoot->getName())
track = cur;
}
if(track)
{
Ogre::TransformKeyFrame kf(0, mCurrentTime);
track->getInterpolatedKeyFrame(mCurrentAnim->_getTimeIndex(mCurrentTime), &kf);
mLastPosition = kf.getTranslate() * mAccumulate;
}
} }
} }