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

Update animation looping when setting the same state

Browse source
This commit is contained in:
Chris Robinson 2013-02-19 04:01:33 -08:00
parent a510adc572
commit 1399a06c76
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwmechanics/character.cpp
View file

@ -260,7 +260,11 @@ void CharacterController::skipAnim()
void CharacterController::setState(CharacterState state, bool loop)
{
if(mState == state)
{
if(mAnimation)
mAnimation->setLooping(loop);
return;
}
mState = state;
if(!mAnimation)

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

@ -169,6 +169,11 @@ void Animation::setSpeed(float speed)
mAnimSpeedMult = speed / mAnimVelocity;
}
void Animation::setLooping(bool loop)
{
mLooping = loop;
}
void Animation::applyAnimation(const Ogre::Animation *anim, float time, Ogre::SkeletonInstance *skel)
{

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

@ -76,6 +76,8 @@ public:
void setSpeed(float speed);
void setLooping(bool loop);
void play(const std::string &groupname, const std::string &start, bool loop);
virtual Ogre::Vector3 runAnimation(float timepassed);
};