From a782a9109b131c04da01a0052afcbf8d7c208d97 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Tue, 5 Feb 2013 09:24:22 -0800
Subject: [PATCH] Store the vertical velocity in the physic actor

---
 apps/openmw/mwmechanics/movementsolver.cpp |  3 ++-
 apps/openmw/mwmechanics/movementsolver.hpp |  2 --
 libs/openengine/bullet/physic.cpp          | 13 ++++++++++++-
 libs/openengine/bullet/physic.hpp          | 11 +++++++++++
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwmechanics/movementsolver.cpp b/apps/openmw/mwmechanics/movementsolver.cpp
index f17671a61b..3fddb28fe0 100644
--- a/apps/openmw/mwmechanics/movementsolver.cpp
+++ b/apps/openmw/mwmechanics/movementsolver.cpp
@@ -15,7 +15,6 @@ namespace MWMechanics
 
 MovementSolver::MovementSolver()
   : mEngine(MWBase::Environment::get().getWorld()->getPhysicEngine())
-  , verticalVelocity(0.0f)
 {
 }
 
@@ -89,6 +88,7 @@ Ogre::Vector3 MovementSolver::move(const MWWorld::Ptr &ptr, const Ogre::Vector3
     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();
     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 clippedVelocity(horizontalVelocity.x, horizontalVelocity.y, verticalVelocity);
@@ -156,6 +156,7 @@ Ogre::Vector3 MovementSolver::move(const MWWorld::Ptr &ptr, const Ogre::Vector3
 
     verticalVelocity = clippedVelocity.z;
     verticalVelocity -= time*400;
+    mPhysicActor->setVerticalForce(verticalVelocity);
 
     return newPosition;
 }
diff --git a/apps/openmw/mwmechanics/movementsolver.hpp b/apps/openmw/mwmechanics/movementsolver.hpp
index a8b9bf1442..6a965b56ac 100644
--- a/apps/openmw/mwmechanics/movementsolver.hpp
+++ b/apps/openmw/mwmechanics/movementsolver.hpp
@@ -37,8 +37,6 @@ namespace MWMechanics
 
             OEngine::Physic::PhysicEngine *mEngine;
             OEngine::Physic::PhysicActor *mPhysicActor;
-
-            float verticalVelocity;
     };
 }
 
diff --git a/libs/openengine/bullet/physic.cpp b/libs/openengine/bullet/physic.cpp
index 7f0f6e2f90..1ae916f81c 100644
--- a/libs/openengine/bullet/physic.cpp
+++ b/libs/openengine/bullet/physic.cpp
@@ -28,7 +28,7 @@ namespace Physic
     };
 
     PhysicActor::PhysicActor(std::string name, std::string mesh, PhysicEngine* engine, Ogre::Vector3 position, Ogre::Quaternion rotation, float scale): 
-        mName(name), mEngine(engine), mMesh(mesh), mBoxScaledTranslation(0,0,0), mBoxRotationInverse(0,0,0,0), mBody(0), collisionMode(false), mBoxRotation(0,0,0,0)
+        mName(name), mEngine(engine), mMesh(mesh), mBoxScaledTranslation(0,0,0), mBoxRotationInverse(0,0,0,0), mBody(0), collisionMode(false), mBoxRotation(0,0,0,0), verticalForce(0.0f)
     {
         mBody = mEngine->createAndAdjustRigidBody(mMesh, mName, scale, position, rotation, &mBoxScaledTranslation, &mBoxRotation);
         Ogre::Quaternion inverse = mBoxRotation.Inverse();
@@ -170,6 +170,17 @@ namespace Physic
         return Ogre::Vector3(0.0f);
     }
 
+    void PhysicActor::setVerticalForce(float force)
+    {
+        verticalForce = force;
+    }
+
+    float PhysicActor::getVerticalForce() const
+    {
+        return verticalForce;
+    }
+
+
     void PhysicActor::runPmove(){
         Pmove(pmove);
         Ogre::Vector3 newpos = pmove->ps.origin;
diff --git a/libs/openengine/bullet/physic.hpp b/libs/openengine/bullet/physic.hpp
index d98625c0ae..daf1c09f2b 100644
--- a/libs/openengine/bullet/physic.hpp
+++ b/libs/openengine/bullet/physic.hpp
@@ -122,6 +122,16 @@ namespace Physic
          */
         Ogre::Vector3 getHalfExtents() const;
 
+        /**
+         * Sets the current amount of vertical force (gravity) affecting this physic actor
+         */
+        void setVerticalForce(float force);
+
+        /**
+         * Gets the current amount of vertical force (gravity) affecting this physic actor
+         */
+        float getVerticalForce() const;
+
         /**
          * Runs pmove for this PhysicActor
          */
@@ -141,6 +151,7 @@ namespace Physic
         Ogre::Vector3 mBoxScaledTranslation;
         btQuaternion mBoxRotationInverse;
         Ogre::Quaternion mBoxRotation;
+        float verticalForce;
         bool collisionMode;
         std::string mMesh;
         PhysicEngine* mEngine;