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

Make sure the Jump control is always handled by the PhysicsSystem even if game runs faster than the minimum physics timestep

Browse source
This commit is contained in:
scrawl 2014-09-17 02:20:46 +02:00
parent 269c200c8f
commit 6debd21ec6
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -310,7 +310,7 @@ void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterStat
} }
} }
if(mJumpState == JumpState_Falling) if(mJumpState == JumpState_InAir)
{ {
int mode = ((jump == mCurrentJump) ? 2 : 1); int mode = ((jump == mCurrentJump) ? 2 : 1);
@ -1275,7 +1275,6 @@ void CharacterController::update(float duration)
} }
} }
//Ogre::Vector3 vec = cls.getMovementVector(mPtr);
Ogre::Vector3 vec(cls.getMovementSettings(mPtr).mPosition); Ogre::Vector3 vec(cls.getMovementSettings(mPtr).mPosition);
vec.normalise(); vec.normalise();
@ -1371,8 +1370,8 @@ void CharacterController::update(float duration)
cls.getCreatureStats(mPtr).land(); cls.getCreatureStats(mPtr).land();
} }
forcestateupdate = (mJumpState != JumpState_Falling); forcestateupdate = (mJumpState != JumpState_InAir);
mJumpState = JumpState_Falling; mJumpState = JumpState_InAir;
// This is a guess. All that seems to be known is that "While the player is in the // This is a guess. All that seems to be known is that "While the player is in the
// air, fJumpMoveBase and fJumpMoveMult governs air control". What does fJumpMoveMult do? // air, fJumpMoveBase and fJumpMoveMult governs air control". What does fJumpMoveMult do?
@ -1408,7 +1407,7 @@ void CharacterController::update(float duration)
fatigue.setCurrent(fatigue.getCurrent() - fatigueDecrease); fatigue.setCurrent(fatigue.getCurrent() - fatigueDecrease);
cls.getCreatureStats(mPtr).setFatigue(fatigue); cls.getCreatureStats(mPtr).setFatigue(fatigue);
} }
else if(mJumpState == JumpState_Falling) else if(mJumpState == JumpState_InAir)
{ {
forcestateupdate = true; forcestateupdate = true;
mJumpState = JumpState_Landing; mJumpState = JumpState_Landing;
@ -1529,7 +1528,9 @@ void CharacterController::update(float duration)
world->queueMovement(mPtr, Ogre::Vector3(0.0f)); world->queueMovement(mPtr, Ogre::Vector3(0.0f));
movement = vec; movement = vec;
cls.getMovementSettings(mPtr).mPosition[0] = cls.getMovementSettings(mPtr).mPosition[1] = cls.getMovementSettings(mPtr).mPosition[2] = 0; cls.getMovementSettings(mPtr).mPosition[0] = cls.getMovementSettings(mPtr).mPosition[1] = 0;
// Can't reset jump state (mPosition[2]) here; we don't know for sure whether the PhysicSystem will actually handle it in this frame
// due to the fixed minimum timestep used for the physics update. It will be reset in PhysicSystem::move once the jump is handled.
} }
else if(cls.getCreatureStats(mPtr).isDead()) else if(cls.getCreatureStats(mPtr).isDead())
{ {

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

@ -130,7 +130,7 @@ enum UpperBodyCharacterState {
enum JumpingState { enum JumpingState {
JumpState_None, JumpState_None,
JumpState_Falling, JumpState_InAir,
JumpState_Landing JumpState_Landing
}; };

3
apps/openmw/mwworld/physicssystem.cpp
View file

@ -23,6 +23,7 @@
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwmechanics/creaturestats.hpp" #include "../mwmechanics/creaturestats.hpp"
#include "../mwmechanics/movement.hpp"
#include "../mwworld/esmstore.hpp" #include "../mwworld/esmstore.hpp"
#include "../mwworld/cellstore.hpp" #include "../mwworld/cellstore.hpp"
@ -296,6 +297,7 @@ namespace MWWorld
else else
{ {
velocity = Ogre::Quaternion(Ogre::Radian(refpos.rot[2]), Ogre::Vector3::NEGATIVE_UNIT_Z) * movement; velocity = Ogre::Quaternion(Ogre::Radian(refpos.rot[2]), Ogre::Vector3::NEGATIVE_UNIT_Z) * movement;
// not in water nor can fly, so need to deal with gravity // not in water nor can fly, so need to deal with gravity
if(!physicActor->getOnGround()) // if current OnGround status is false, must be falling or jumping if(!physicActor->getOnGround()) // if current OnGround status is false, must be falling or jumping
{ {
@ -333,6 +335,7 @@ namespace MWWorld
} }
} }
} }
ptr.getClass().getMovementSettings(ptr).mPosition[2] = 0;
// Now that we have the effective movement vector, apply wind forces to it // Now that we have the effective movement vector, apply wind forces to it
if (MWBase::Environment::get().getWorld()->isInStorm()) if (MWBase::Environment::get().getWorld()->isInStorm())