mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-25 06:41:33 +00:00
Code Issues Releases Wiki Activity

Remove an unneeded Animation field

Browse source
This commit is contained in:
Chris Robinson 2013-02-09 13:25:39 -08:00
parent f197c67e95
commit 8d6f017f17
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,7 +22,6 @@ Animation::Animation(const MWWorld::Ptr &ptr)
, mAccumRoot(NULL) , mAccumRoot(NULL)
, mNonAccumRoot(NULL) , mNonAccumRoot(NULL)
, mAccumulate(Ogre::Vector3::ZERO) , mAccumulate(Ogre::Vector3::ZERO)
, mStartPosition(0.0f)
, mLastPosition(0.0f) , mLastPosition(0.0f)
, mCurrentKeys(NULL) , mCurrentKeys(NULL)
, mCurrentAnim(NULL) , mCurrentAnim(NULL)
@ -135,9 +134,6 @@ void Animation::createEntityList(Ogre::SceneNode *node, const std::string &model
{ {
mAccumRoot = mInsert; mAccumRoot = mInsert;
mNonAccumRoot = skelinst->getBone(bone->getName()); mNonAccumRoot = skelinst->getBone(bone->getName());
mStartPosition = mNonAccumRoot->getInitialPosition();
mLastPosition = mStartPosition;
} }
} }
} }
@ -243,7 +239,7 @@ void Animation::reset(const std::string &marker)
if(mNonAccumRoot) if(mNonAccumRoot)
{ {
mLastPosition = mNonAccumRoot->getPosition(); mLastPosition = mNonAccumRoot->getPosition();
mAccumRoot->setPosition(mStartPosition*mNonAccumRoot->_getDerivedScale() - mLastPosition); mAccumRoot->setPosition(-mLastPosition * mAccumulate);
} }
} }

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

@ -25,7 +25,6 @@ protected:
Ogre::Node *mAccumRoot; Ogre::Node *mAccumRoot;
Ogre::Bone *mNonAccumRoot; Ogre::Bone *mNonAccumRoot;
Ogre::Vector3 mAccumulate; Ogre::Vector3 mAccumulate;
Ogre::Vector3 mStartPosition;
Ogre::Vector3 mLastPosition; Ogre::Vector3 mLastPosition;
std::vector<Ogre::SkeletonPtr> mSkeletonSources; std::vector<Ogre::SkeletonPtr> mSkeletonSources;