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

Move getStateInfo into the character controller

Browse source
This commit is contained in:
Chris Robinson 2013-04-30 19:26:41 -07:00
parent 05060e57ec
commit 4b15da076b
3 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -89,17 +89,21 @@ static const struct {
};
static const size_t sStateListSize = sizeof(sStateList)/sizeof(sStateList[0]);
static void getStateInfo(CharacterState state, std::string *group)
void CharacterController::getCurrentGroup(std::string &group) const
{
for(size_t i = 0;i < sStateListSize;i++)
{
if(sStateList[i].state == state)
if(sStateList[i].state == mCharState)
{
*group = sStateList[i].groupname;
return;
group = sStateList[i].groupname;
break;
}
}
throw std::runtime_error("Failed to find character state "+Ogre::StringConverter::toString(state));
if(group.empty())
throw std::runtime_error("Failed to find character state "+Ogre::StringConverter::toString(mCharState));
if(!mAnimation->hasAnimation(group))
group = std::string();
}
@ -116,8 +120,6 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
if(!mAnimation)
return;
std::string group;
getStateInfo(mCharState, &group);
if(MWWorld::Class::get(mPtr).isActor())
{
/* Accumulate along X/Y only for now, until we can figure out how we should
@ -129,8 +131,10 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
/* Don't accumulate with non-actors. */
mAnimation->setAccumulation(Ogre::Vector3(0.0f));
}
if(mAnimation->hasAnimation(group))
mMovingAnim = mAnimation->play(group, "start", "stop", 1.0f, loop ? (~(size_t)0) : 0);
std::string group;
getCurrentGroup(group);
mMovingAnim = mAnimation->play(group, "start", "stop", 1.0f, loop ? (~(size_t)0) : 0);
}
CharacterController::~CharacterController()
@ -149,7 +153,7 @@ void CharacterController::update(float duration, Movement &movement)
float speed = 0.0f;
if(!(getState() >= CharState_Death1))
{
const MWBase::World *world = MWBase::Environment::get().getWorld();
MWBase::World *world = MWBase::Environment::get().getWorld();
const MWWorld::Class &cls = MWWorld::Class::get(mPtr);
bool onground = world->isOnGround(mPtr);
@ -161,23 +165,23 @@ void CharacterController::update(float duration, Movement &movement)
speed = cls.getSpeed(mPtr);
// advance athletics
if (vec.squaredLength() > 0 && mPtr == MWBase::Environment::get().getWorld()->getPlayer().getPlayer())
if (vec.squaredLength() > 0 && mPtr == world->getPlayer().getPlayer())
{
if (inwater)
{
mSecondsOfSwimming += duration;
while (mSecondsOfSwimming > 1)
while(mSecondsOfSwimming > 1)
{
MWWorld::Class::get(mPtr).skillUsageSucceeded(mPtr, ESM::Skill::Athletics, 1);
cls.skillUsageSucceeded(mPtr, ESM::Skill::Athletics, 1);
mSecondsOfSwimming -= 1;
}
}
else if (isrunning)
{
mSecondsOfRunning += duration;
while (mSecondsOfRunning > 1)
while(mSecondsOfRunning > 1)
{
MWWorld::Class::get(mPtr).skillUsageSucceeded(mPtr, ESM::Skill::Athletics, 0);
cls.skillUsageSucceeded(mPtr, ESM::Skill::Athletics, 0);
mSecondsOfRunning -= 1;
}
}
@ -314,10 +318,9 @@ void CharacterController::forceStateUpdate()
return;
mAnimQueue.clear();
std::string anim;
getStateInfo(mCharState, &anim);
if((mMovingAnim=mAnimation->hasAnimation(anim)) != false)
mMovingAnim = mAnimation->play(anim, "start", "stop", 0.0f, mLooping ? (~(size_t)0) : 0);
std::string group;
getCurrentGroup(group);
mMovingAnim = mAnimation->play(group, "start", "stop", 0.0f, mLooping ? (~(size_t)0) : 0);
}
}

3
apps/openmw/mwmechanics/character.hpp
View file

@ -100,6 +100,9 @@ class CharacterController
bool mMovingAnim;
// Gets an animation group name from the current character state.
void getCurrentGroup(std::string &group) const;
public:
CharacterController(const MWWorld::Ptr &ptr, MWRender::Animation *anim, CharacterState state, bool loop);
virtual ~CharacterController();

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

@ -572,6 +572,9 @@ bool Animation::play(const std::string &groupname, const std::string &start, con
mLayer[layeridx].mLoopCount = 0;
mLayer[layeridx].mPlaying = false;
if(groupname.empty())
return false;
bool movinganim = false;
bool foundanim = false;