From f586f53a42e3ab3c4f10745c0ca2dc9b11298948 Mon Sep 17 00:00:00 2001
From: Jason Hooks <jhooks1@mix.wvu.edu>
Date: Sat, 15 Sep 2012 16:45:50 -0400
Subject: [PATCH] positioning

---
 apps/openmw/mwworld/physicssystem.cpp |  7 +++++--
 apps/openmw/mwworld/worldimp.cpp      |  2 +-
 libs/openengine/bullet/physic.cpp     |  5 ++---
 libs/openengine/bullet/physic.hpp     | 22 +++++++++++++++++++---
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwworld/physicssystem.cpp b/apps/openmw/mwworld/physicssystem.cpp
index 5e58f61a3..d0291b01a 100644
--- a/apps/openmw/mwworld/physicssystem.cpp
+++ b/apps/openmw/mwworld/physicssystem.cpp
@@ -282,8 +282,11 @@ namespace MWWorld
                 tr.setOrigin(btVector3(position.x,position.y,position.z));
                 body->setWorldTransform(tr);
             }
-            else
+            else{
+                //For objects that contain a box shape.  
+                //Do any such objects exist?  Perhaps animated objects?
                 mEngine->boxAdjustExternal(handleToMesh[handle], body, node->getScale().x, position, node->getOrientation());
+            }
         }
         if (OEngine::Physic::PhysicActor* act = mEngine->getCharacter(handle))
         {
@@ -295,7 +298,7 @@ namespace MWWorld
             }
             else
             {
-                act->setPosition(btVector3(position.x,position.y,position.z));
+                act->setPosition(position);
             }
         }
     }
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 55c2f4161..3ad58dc7d 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -637,7 +637,7 @@ namespace MWWorld
         rot.x = Ogre::Degree(x).valueRadians();
         rot.y = Ogre::Degree(y).valueRadians();
         rot.z = Ogre::Degree(z).valueRadians();
-
+        
         if (mRendering->rotateObject(ptr, rot, adjust)) {
             float *objRot = ptr.getRefData().getPosition().rot;
             objRot[0] = rot.x, objRot[1] = rot.y, objRot[2] = rot.z;
diff --git a/libs/openengine/bullet/physic.cpp b/libs/openengine/bullet/physic.cpp
index f3cebfb40..9c387e140 100644
--- a/libs/openengine/bullet/physic.cpp
+++ b/libs/openengine/bullet/physic.cpp
@@ -93,10 +93,9 @@ namespace Physic
         return Ogre::Quaternion(quat.getW(), quat.getX(), quat.getY(), quat.getZ());
     }
 
-    void PhysicActor::setPosition(const btVector3& pos)
+    void PhysicActor::setPosition(const Ogre::Vector3 pos)
     {
-        //internalGhostObject->getWorldTransform().setOrigin(pos+mTranslation);
-        //externalGhostObject->getWorldTransform().setOrigin(pos+mTranslation);
+        mEngine->adjustRigidBody(mBody, pos, getRotation(), mBoxScaledTranslation, mBoxRotation);
     }
 
     void PhysicActor::setScale(float scale){
diff --git a/libs/openengine/bullet/physic.hpp b/libs/openengine/bullet/physic.hpp
index 7ea6a323d..1598d3e87 100644
--- a/libs/openengine/bullet/physic.hpp
+++ b/libs/openengine/bullet/physic.hpp
@@ -51,7 +51,8 @@ namespace Physic
     };
 
     /**
-     * A physic Actor use a modifed KinematicCharacterController taken in the bullet forum.
+     * A physic actor uses a rigid body based on box shapes.
+     * Pmove is used to move the physic actor around the dynamic world.
      */
     class PhysicActor
     {
@@ -82,15 +83,29 @@ namespace Physic
 
         bool getCollisionMode();
 
+        /**
+         * This returns the visual position of the PhysicActor (used to position a scenenode).
+         * Note - this is different from the position of the contained mBody.
+         */
         Ogre::Vector3 getPosition(void);
 
+        /**
+         * Returns the visual orientation of the PhysicActor
+         */
         Ogre::Quaternion getRotation(void);
 
-        void setPosition(const btVector3& pos);
+        /**
+         * Sets the position of mBody from a visual position input.
+         * For most cases this should not be used.  We should instead let pmove move the PhysicActor around for us
+         */
+        void setPosition(const Ogre::Vector3 pos);
 
+        /**
+         * Sets the scale of the PhysicActor
+         */
         void setScale(float scale);
 
-        std::string mName;
+        
 
 
     private:
@@ -101,6 +116,7 @@ namespace Physic
         bool collisionMode;
         std::string mMesh;
         PhysicEngine* mEngine;
+        std::string mName;
     };
 
     /**