From 26d6c9453c3d1d80936189cce56a7eb38a148946 Mon Sep 17 00:00:00 2001
From: gugus <gus_512@hotmail.com>
Date: Tue, 29 May 2012 10:15:29 +0200
Subject: [PATCH] more work on rotation

---
 apps/openmw/mwworld/world.cpp | 44 ++++++++++++++++++++++++++++++++---
 apps/openmw/mwworld/world.hpp |  4 +++-
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwworld/world.cpp b/apps/openmw/mwworld/world.cpp
index 2a3332593..116710a1e 100644
--- a/apps/openmw/mwworld/world.cpp
+++ b/apps/openmw/mwworld/world.cpp
@@ -621,17 +621,55 @@ namespace MWWorld
         mPhysics->scaleObject( Class::get(ptr).getId(ptr), scale );
     }
 
-    void World::rotateObject (Ptr ptr,float x,float y,float z)
+    void World::rotateObject (Ptr ptr,float x,float y,float z,bool WorldAxis)
     {
         MWWorld::Class::get(ptr).adjustRotation(ptr,x,y,z);
 
-        ptr.getRefData().getPosition().rot[0] = x;
+        /*ptr.getRefData().getPosition().rot[0] = x;
         ptr.getRefData().getPosition().rot[0] = y;
-        ptr.getRefData().getPosition().rot[0] = z;
+        ptr.getRefData().getPosition().rot[0] = z;*/
+        if(WorldAxis)
+        {
+            ptr.getRefData().getBaseNode()->rotate(Ogre::Vector3::UNIT_X,Ogre::Degree(x));
+            ptr.getRefData().getBaseNode()->rotate(Ogre::Vector3::UNIT_X,Ogre::Degree(y));
+            ptr.getRefData().getBaseNode()->rotate(Ogre::Vector3::UNIT_X,Ogre::Degree(z));
+        }
+        else
+        {
+            Ogre::Matrix3 axis = ptr.getRefData().getBaseNode()->getLocalAxes();
+            Ogre::Vector3 xAxis = axis.GetColumn(0);
+            Ogre::Vector3 yAxis = axis.GetColumn(1);
+            Ogre::Vector3 zAxis = axis.GetColumn(2);
+            ptr.getRefData().getBaseNode()->rotate(xAxis,Ogre::Degree(x));
+            ptr.getRefData().getBaseNode()->rotate(yAxis,Ogre::Degree(y));
+            ptr.getRefData().getBaseNode()->rotate(zAxis,Ogre::Degree(z));
+        }
+        Ogre::Matrix3 rot;
+        ptr.getRefData().getBaseNode()->getOrientation().ToRotationMatrix(rot);
+        Ogre::Radian rx,ry,rz;
+        rot.ToEulerAnglesXYZ(rx,ry,rz);
+
+        ptr.getRefData().getPosition().rot[0] = rx.valueRadians();
+        ptr.getRefData().getPosition().rot[0] = ry.valueRadians();
+        ptr.getRefData().getPosition().rot[0] = rz.valueRadians();
         //ptr.getRefData().getBaseNode()->rotate(ptr.getRefData().getBaseNode()->get
         //mPhysics->scaleObject( Class::get(ptr).getId(ptr), scale );
     }
 
+    void setObjectRotation (Ptr ptr,float x,float y,float z)
+    {
+        MWWorld::Class::get(ptr).adjustRotation(ptr,x,y,z);
+
+        ptr.getRefData().getPosition().rot[0] = Ogre::Degree(x).valueRadians();
+        ptr.getRefData().getPosition().rot[0] = Ogre::Degree(y).valueRadians();
+        ptr.getRefData().getPosition().rot[0] = Ogre::Degree(z).valueRadians();
+
+        Ogre::Quaternion rotx(Ogre::Degree(x),Ogre::Vector3::UNIT_X);
+        Ogre::Quaternion roty(Ogre::Degree(y),Ogre::Vector3::UNIT_Y);
+        Ogre::Quaternion rotz(Ogre::Degree(z),Ogre::Vector3::UNIT_Z);
+        ptr.getRefData().getBaseNode()->setOrientation(rotx*roty*rotz);
+    }
+
     void World::indexToPosition (int cellX, int cellY, float &x, float &y, bool centre) const
     {
         const int cellSize = 8192;
diff --git a/apps/openmw/mwworld/world.hpp b/apps/openmw/mwworld/world.hpp
index e684ca39e..6f810e976 100644
--- a/apps/openmw/mwworld/world.hpp
+++ b/apps/openmw/mwworld/world.hpp
@@ -224,7 +224,9 @@ namespace MWWorld
 
             void scaleObject (Ptr ptr, float scale);
 
-            void rotateObject (Ptr ptr,float x,float y,float z);
+            void rotateObject (Ptr ptr,float x,float y,float z,bool WorldAxis);
+
+            void setObjectRotation (Ptr ptr,float x,float y,float z);
 
             void indexToPosition (int cellX, int cellY, float &x, float &y, bool centre = false) const;
             ///< Convert cell numbers to position.