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

Work out the state in the character controller update method

Browse source
This commit is contained in:
Chris Robinson 2013-02-03 07:15:34 -08:00
parent 23acf4b130
commit 51d5efeeb2
3 changed files with 17 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw/mwmechanics/actors.cpp
View file

@ -246,7 +246,6 @@ namespace MWMechanics
if(iter->second.getState() >= CharState_Death1) if(iter->second.getState() >= CharState_Death1)
continue; continue;
iter->second.setMovementVector(Ogre::Vector3::ZERO);
iter->second.setState(CharState_Death1, false); iter->second.setState(CharState_Death1, false);
++mDeathCount[MWWorld::Class::get(iter->first).getId(iter->first)]; ++mDeathCount[MWWorld::Class::get(iter->first).getId(iter->first)];
@ -259,15 +258,6 @@ namespace MWMechanics
if(!paused) if(!paused)
{ {
for(PtrControllerMap::iterator iter(mActors.begin());iter != mActors.end();++iter)
{
if(iter->second.getState() >= CharState_Death1)
continue;
Ogre::Vector3 movement = MWWorld::Class::get(iter->first).getMovementVector(iter->first);
iter->second.setMovementVector(movement);
}
std::vector<std::pair<std::string, Ogre::Vector3> > movement; std::vector<std::pair<std::string, Ogre::Vector3> > movement;
for(PtrControllerMap::iterator iter(mActors.begin());iter != mActors.end();++iter) for(PtrControllerMap::iterator iter(mActors.begin());iter != mActors.end();++iter)
{ {

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

@ -139,36 +139,35 @@ void CharacterController::markerEvent(float time, const std::string &evt)
} }
void CharacterController::setMovementVector(const Ogre::Vector3 &vec) Ogre::Vector3 CharacterController::update(float duration)
{ {
const MWWorld::Class &cls = MWWorld::Class::get(mPtr);
const Ogre::Vector3 &vec = cls.getMovementVector(mPtr);
// HACK: The length we get is too large. // HACK: The length we get is too large.
float speed = std::max(1.0f, vec.length() / 32.0f); float speed = std::max(1.0f, vec.length() / 32.0f);
if(vec.length() >= 0.1f) if(std::abs(vec.x/2.0f) > std::abs(vec.y))
{ {
if(std::abs(vec.x/2.0f) > std::abs(vec.y)) if(vec.x > 0.0f)
{ setState(CharState_WalkRight, true);
if(vec.x > 0.0f) else if(vec.x < 0.0f)
setState(CharState_WalkRight, true); setState(CharState_WalkLeft, true);
else if(vec.x < 0.0f)
setState(CharState_WalkLeft, true);
}
else if(vec.y < 0.0f)
setState(CharState_WalkBack, true);
else
setState(CharState_WalkForward, true);
} }
else if(vec.y > 0.0f)
setState(CharState_WalkForward, true);
else if(vec.y < 0.0f)
setState(CharState_WalkBack, true);
else else
setState(CharState_Idle, true); {
if(!(getState() >= CharState_Death1))
setState(CharState_Idle, true);
}
if(mAnimation) if(mAnimation)
mAnimation->setSpeedMult(speed); mAnimation->setSpeedMult(speed);
mDirection = vec.normalisedCopy(); mDirection = vec.normalisedCopy();
}
Ogre::Vector3 CharacterController::update(float duration)
{
Ogre::Vector3 movement = Ogre::Vector3::ZERO; Ogre::Vector3 movement = Ogre::Vector3::ZERO;
if(mAnimation && !mSkipAnim) if(mAnimation && !mSkipAnim)
movement += mAnimation->runAnimation(duration); movement += mAnimation->runAnimation(duration);

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

@ -66,8 +66,6 @@ public:
void playGroup(const std::string &groupname, int mode, int count); void playGroup(const std::string &groupname, int mode, int count);
void skipAnim(); void skipAnim();
void setMovementVector(const Ogre::Vector3 &vec);
void setState(CharacterState state, bool loop); void setState(CharacterState state, bool loop);
CharacterState getState() const CharacterState getState() const
{ return mState; } { return mState; }