mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-01 03:45:32 +00:00
Code Issues Releases Wiki Activity

Store the current animation group

Browse source
This commit is contained in:
Chris Robinson 2013-04-21 18:32:34 -07:00
parent 835ff8eb1e
commit d7c9df16f8
2 changed files with 3 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

@ -441,9 +441,10 @@ void Animation::play(const std::string &groupname, const std::string &start, con
Ogre::SkeletonInstance *skel = iter->mSkelBase->getSkeleton(); Ogre::SkeletonInstance *skel = iter->mSkelBase->getSkeleton();
mCurrentAnim = skel->getAnimation(groupname); mCurrentAnim = skel->getAnimation(groupname);
mCurrentKeys = &mTextKeys[groupname]; mCurrentKeys = &mTextKeys[groupname];
mCurrentGroup = groupname;
mCurrentControllers = &iter->mControllers; mCurrentControllers = &iter->mControllers;
mAnimVelocity = 0.0f;
mAnimVelocity = 0.0f;
if(mNonAccumRoot) if(mNonAccumRoot)
calcAnimVelocity(); calcAnimVelocity();

1
apps/openmw/mwrender/animation.hpp
View file

@ -53,6 +53,7 @@ protected:
Ogre::Vector3 mLastPosition; Ogre::Vector3 mLastPosition;
Ogre::Animation *mCurrentAnim; Ogre::Animation *mCurrentAnim;
std::string mCurrentGroup;
std::vector<Ogre::Controller<Ogre::Real> > *mCurrentControllers; std::vector<Ogre::Controller<Ogre::Real> > *mCurrentControllers;
NifOgre::TextKeyMap *mCurrentKeys; NifOgre::TextKeyMap *mCurrentKeys;
NifOgre::TextKeyMap::const_iterator mStartKey; NifOgre::TextKeyMap::const_iterator mStartKey;