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

Avoid handling animation states

Browse source 
We don't need them anymore
This commit is contained in:
Chris Robinson 2013-01-30 07:34:07 -08:00
parent 360f7bfac8
commit 5c3a7f7d52
2 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,8 +25,10 @@ Animation::Animation(const MWWorld::Ptr &ptr)
, mStartPosition(0.0f) , mStartPosition(0.0f)
, mLastPosition(0.0f) , mLastPosition(0.0f)
, mCurrentKeys(NULL) , mCurrentKeys(NULL)
, mAnimState(NULL) , mCurrentAnim(NULL)
, mCurrentTime(0.0f)
, mPlaying(false) , mPlaying(false)
, mLooping(false)
, mAnimSpeedMult(1.0f) , mAnimSpeedMult(1.0f)
{ {
} }
@ -106,7 +108,7 @@ void Animation::createEntityList(Ogre::SceneNode *node, const std::string &model
bool Animation::hasAnimation(const std::string &anim) bool Animation::hasAnimation(const std::string &anim)
{ {
return mEntityList.mSkelBase && mEntityList.mSkelBase->hasAnimationState(anim); return mEntityList.mSkelBase && mEntityList.mSkelBase->getSkeleton()->hasAnimation(anim);
} }
@ -147,9 +149,11 @@ void Animation::applyAnimation(const Ogre::Animation *anim, float time, Ogre::Sk
Ogre::Vector3 Animation::updatePosition(float time) Ogre::Vector3 Animation::updatePosition(float time)
{ {
Ogre::SkeletonInstance *skel = mEntityList.mSkelBase->getSkeleton(); if(mLooping)
mAnimState->setTimePosition(time); mCurrentTime = std::fmod(std::max(time, 0.0f), mCurrentAnim->getLength());
applyAnimation(skel->getAnimation(mAnimState->getAnimationName()), mAnimState->getTimePosition(), skel); else
mCurrentTime = std::min(mCurrentAnim->getLength(), std::max(time, 0.0f));
applyAnimation(mCurrentAnim, mCurrentTime, mEntityList.mSkelBase->getSkeleton());
Ogre::Vector3 posdiff = Ogre::Vector3::ZERO; Ogre::Vector3 posdiff = Ogre::Vector3::ZERO;
if(mNonAccumRoot) if(mNonAccumRoot)
@ -170,15 +174,14 @@ void Animation::reset(const std::string &marker)
while(mNextKey != mCurrentKeys->end() && mNextKey->second != marker) while(mNextKey != mCurrentKeys->end() && mNextKey->second != marker)
mNextKey++; mNextKey++;
Ogre::SkeletonInstance *skel = mEntityList.mSkelBase->getSkeleton();
if(mNextKey != mCurrentKeys->end()) if(mNextKey != mCurrentKeys->end())
mAnimState->setTimePosition(mNextKey->first); mCurrentTime = mNextKey->first;
else else
{ {
mNextKey = mCurrentKeys->begin(); mNextKey = mCurrentKeys->begin();
mAnimState->setTimePosition(0.0f); mCurrentTime = 0.0f;
} }
applyAnimation(skel->getAnimation(mAnimState->getAnimationName()), mAnimState->getTimePosition(), skel); applyAnimation(mCurrentAnim, mCurrentTime, mEntityList.mSkelBase->getSkeleton());
if(mNonAccumRoot) if(mNonAccumRoot)
{ {
@ -191,12 +194,12 @@ void Animation::reset(const std::string &marker)
void Animation::play(const std::string &groupname, const std::string &start, bool loop) void Animation::play(const std::string &groupname, const std::string &start, bool loop)
{ {
try { try {
mAnimState = mEntityList.mSkelBase->getAnimationState(groupname); mCurrentAnim = mEntityList.mSkelBase->getSkeleton()->getAnimation(groupname);
mAnimState->setLoop(loop);
mCurrentKeys = &mTextKeys[groupname]; mCurrentKeys = &mTextKeys[groupname];
reset(start); reset(start);
mPlaying = true; mPlaying = true;
mLooping = loop;
} }
catch(std::exception &e) { catch(std::exception &e) {
std::cerr<< e.what() <<std::endl; std::cerr<< e.what() <<std::endl;
@ -208,13 +211,13 @@ Ogre::Vector3 Animation::runAnimation(float timepassed)
Ogre::Vector3 movement = Ogre::Vector3::ZERO; Ogre::Vector3 movement = Ogre::Vector3::ZERO;
timepassed *= mAnimSpeedMult; timepassed *= mAnimSpeedMult;
while(mAnimState && mPlaying && timepassed > 0.0f) while(mCurrentAnim && mPlaying && timepassed > 0.0f)
{ {
float targetTime = mAnimState->getTimePosition() + timepassed; float targetTime = mCurrentTime + timepassed;
if(mNextKey == mCurrentKeys->end() || mNextKey->first > targetTime) if(mNextKey == mCurrentKeys->end() || mNextKey->first > targetTime)
{ {
movement += updatePosition(targetTime); movement += updatePosition(targetTime);
mPlaying = (mAnimState->getLoop() || mAnimState->getLength() >= targetTime); mPlaying = (mLooping || mCurrentAnim->getLength() >= targetTime);
break; break;
} }
@ -232,20 +235,20 @@ Ogre::Vector3 Animation::runAnimation(float timepassed)
} }
if(evt == "loop stop") if(evt == "loop stop")
{ {
if(mAnimState->getLoop()) if(mLooping)
{ {
reset("loop start"); reset("loop start");
if(mAnimState->getTimePosition() >= time) if(mCurrentTime >= time)
break; break;
} }
continue; continue;
} }
if(evt == "stop") if(evt == "stop")
{ {
if(mAnimState->getLoop()) if(mLooping)
{ {
reset("loop start"); reset("loop start");
if(mAnimState->getTimePosition() >= time) if(mCurrentTime >= time)
break; break;
} }
else else

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

@ -30,8 +30,10 @@ protected:
NifOgre::TextKeyMap *mCurrentKeys; NifOgre::TextKeyMap *mCurrentKeys;
NifOgre::TextKeyMap::const_iterator mNextKey; NifOgre::TextKeyMap::const_iterator mNextKey;
Ogre::AnimationState *mAnimState; Ogre::Animation *mCurrentAnim;
float mCurrentTime;
bool mPlaying; bool mPlaying;
bool mLooping;
float mAnimSpeedMult; float mAnimSpeedMult;