mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 03:40:14 +00:00
Code Issues Projects Releases Wiki Activity

Remove the unneeded PhysicActor field from MovementSolver

Browse Source
This commit is contained in:
Chris Robinson 2013-02-05 09:37:02 -08:00
parent a782a9109b
commit d50832081c
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
apps/openmw/mwmechanics/movementsolver.cpp
View File

@ -13,6 +13,8 @@
namespace MWMechanics namespace MWMechanics
{ {
static const float sMaxSlope = 45.0f;
MovementSolver::MovementSolver() MovementSolver::MovementSolver()
: mEngine(MWBase::Environment::get().getWorld()->getPhysicEngine()) : mEngine(MWBase::Environment::get().getWorld()->getPhysicEngine())
{ {
@ -49,17 +51,16 @@ void MovementSolver::projectVelocity(Ogre::Vector3& velocity, const Ogre::Vector
bool MovementSolver::stepMove(Ogre::Vector3& position, const Ogre::Vector3 &velocity, float remainingTime, float verticalRotation, const Ogre::Vector3 &halfExtents, bool isInterior) bool MovementSolver::stepMove(Ogre::Vector3& position, const Ogre::Vector3 &velocity, float remainingTime, float verticalRotation, const Ogre::Vector3 &halfExtents, bool isInterior)
{ {
static const float maxslope = 45.0f;
traceResults trace; // no initialization needed traceResults trace; // no initialization needed
newtrace(&trace, position+Ogre::Vector3(0.0f,0.0f,STEPSIZE), newtrace(&trace, position+Ogre::Vector3(0.0f,0.0f,STEPSIZE),
position+Ogre::Vector3(0.0f,0.0f,STEPSIZE)+velocity*remainingTime, position+Ogre::Vector3(0.0f,0.0f,STEPSIZE)+velocity*remainingTime,
halfExtents, verticalRotation, isInterior, mEngine); halfExtents, verticalRotation, isInterior, mEngine);
if(trace.fraction == 0.0f || (trace.fraction != 1.0f && getSlope(trace.planenormal) > maxslope)) if(trace.fraction == 0.0f || (trace.fraction != 1.0f && getSlope(trace.planenormal) > sMaxSlope))
return false; return false;
newtrace(&trace, trace.endpos, trace.endpos-Ogre::Vector3(0,0,STEPSIZE), halfExtents, verticalRotation, isInterior, mEngine); newtrace(&trace, trace.endpos, trace.endpos-Ogre::Vector3(0,0,STEPSIZE), halfExtents, verticalRotation, isInterior, mEngine);
if(getSlope(trace.planenormal) < maxslope) if(getSlope(trace.planenormal) < sMaxSlope)
{ {
// only step down onto semi-horizontal surfaces. don't step down onto the side of a house or a wall. // only step down onto semi-horizontal surfaces. don't step down onto the side of a house or a wall.
position = trace.endpos; position = trace.endpos;
@ -80,23 +81,22 @@ Ogre::Vector3 MovementSolver::move(const MWWorld::Ptr &ptr, const Ogre::Vector3
Ogre::Vector3 position(ptr.getRefData().getPosition().pos); Ogre::Vector3 position(ptr.getRefData().getPosition().pos);
/* Anything to collide with? */ /* Anything to collide with? */
mPhysicActor = mEngine->getCharacter(ptr.getRefData().getHandle()); OEngine::Physic::PhysicActor *physicActor = mEngine->getCharacter(ptr.getRefData().getHandle());
if(!mPhysicActor || !mPhysicActor->getCollisionMode()) if(!physicActor || !physicActor->getCollisionMode())
return position + movement; return position + movement;
traceResults trace; //no initialization needed traceResults trace; //no initialization needed
int iterations=0, maxIterations=50; //arbitrary number. To prevent infinite loops. They shouldn't happen but it's good to be prepared. int iterations=0, maxIterations=50; //arbitrary number. To prevent infinite loops. They shouldn't happen but it's good to be prepared.
float maxslope=45;
float verticalVelocity = mPhysicActor->getVerticalForce(); float verticalVelocity = physicActor->getVerticalForce();
Ogre::Vector3 horizontalVelocity = movement/time; Ogre::Vector3 horizontalVelocity = movement/time;
Ogre::Vector3 velocity(horizontalVelocity.x, horizontalVelocity.y, verticalVelocity); // we need a copy of the velocity before we start clipping it for steps Ogre::Vector3 velocity(horizontalVelocity.x, horizontalVelocity.y, verticalVelocity); // we need a copy of the velocity before we start clipping it for steps
Ogre::Vector3 clippedVelocity(horizontalVelocity.x, horizontalVelocity.y, verticalVelocity); Ogre::Vector3 clippedVelocity(horizontalVelocity.x, horizontalVelocity.y, verticalVelocity);
float remainingTime = time; float remainingTime = time;
bool isInterior = !ptr.getCell()->isExterior(); bool isInterior = !ptr.getCell()->isExterior();
float verticalRotation = mPhysicActor->getRotation().getYaw().valueDegrees(); float verticalRotation = physicActor->getRotation().getYaw().valueDegrees();
Ogre::Vector3 halfExtents = mPhysicActor->getHalfExtents(); Ogre::Vector3 halfExtents = physicActor->getHalfExtents();
Ogre::Vector3 lastNormal(0.0f); Ogre::Vector3 lastNormal(0.0f);
Ogre::Vector3 currentNormal(0.0f); Ogre::Vector3 currentNormal(0.0f);
@ -106,7 +106,7 @@ Ogre::Vector3 MovementSolver::move(const MWWorld::Ptr &ptr, const Ogre::Vector3
newtrace(&trace, position, position+Ogre::Vector3(0,0,-10), halfExtents, verticalRotation, isInterior, mEngine); newtrace(&trace, position, position+Ogre::Vector3(0,0,-10), halfExtents, verticalRotation, isInterior, mEngine);
if(trace.fraction < 1.0f) if(trace.fraction < 1.0f)
{ {
if(getSlope(trace.planenormal) > maxslope) if(getSlope(trace.planenormal) > sMaxSlope)
{ {
// if we're on a really steep slope, don't listen to user input // if we're on a really steep slope, don't listen to user input
clippedVelocity.x = clippedVelocity.y = 0.0f; clippedVelocity.x = clippedVelocity.y = 0.0f;
@ -129,7 +129,7 @@ Ogre::Vector3 MovementSolver::move(const MWWorld::Ptr &ptr, const Ogre::Vector3
if(trace.fraction != 1.0f) if(trace.fraction != 1.0f)
{ {
//std::cout<<"angle: "<<getSlope(trace.planenormal)<<"\n"; //std::cout<<"angle: "<<getSlope(trace.planenormal)<<"\n";
if(getSlope(currentNormal) > maxslope || currentNormal == lastNormal) if(getSlope(currentNormal) > sMaxSlope || currentNormal == lastNormal)
{ {
if(stepMove(newPosition, velocity, remainingTime, verticalRotation, halfExtents, mEngine)) if(stepMove(newPosition, velocity, remainingTime, verticalRotation, halfExtents, mEngine))
std::cout<< "stepped" <<std::endl; std::cout<< "stepped" <<std::endl;
@ -156,7 +156,7 @@ Ogre::Vector3 MovementSolver::move(const MWWorld::Ptr &ptr, const Ogre::Vector3
verticalVelocity = clippedVelocity.z; verticalVelocity = clippedVelocity.z;
verticalVelocity -= time*400; verticalVelocity -= time*400;
mPhysicActor->setVerticalForce(verticalVelocity); physicActor->setVerticalForce(verticalVelocity);
return newPosition; return newPosition;
} }

2
apps/openmw/mwmechanics/movementsolver.hpp
View File

@ -13,7 +13,6 @@ namespace OEngine
namespace Physic namespace Physic
{ {
class PhysicEngine; class PhysicEngine;
class PhysicActor;
} }
} }
@ -36,7 +35,6 @@ namespace MWMechanics
float getSlope(const Ogre::Vector3 &normal); float getSlope(const Ogre::Vector3 &normal);
OEngine::Physic::PhysicEngine *mEngine; OEngine::Physic::PhysicEngine *mEngine;
OEngine::Physic::PhysicActor *mPhysicActor;
}; };
} }