From 36d26e0681260005843ae7bdd63c366157aef310 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 30 May 2012 15:52:39 +0200
Subject: [PATCH] set the camera orientation after using teleport doors

---
 apps/openmw/mwrender/player.cpp | 18 ++++++++++++++++++
 apps/openmw/mwrender/player.hpp |  3 +++
 apps/openmw/mwworld/player.cpp  |  5 +++++
 apps/openmw/mwworld/player.hpp  |  3 +++
 apps/openmw/mwworld/scene.cpp   |  5 ++++-
 5 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/player.cpp b/apps/openmw/mwrender/player.cpp
index 7ed921218b..d6baac4b5a 100644
--- a/apps/openmw/mwrender/player.cpp
+++ b/apps/openmw/mwrender/player.cpp
@@ -6,4 +6,22 @@ namespace MWRender
     Player::Player (Ogre::Camera *camera, Ogre::SceneNode* node)
     : mCamera (camera), mNode (node)
     {}
+
+    void Player::setRot(float x, float y, float z)
+    {
+            Ogre::SceneNode *sceneNode = mNode;
+            Ogre::Node* yawNode = sceneNode->getChildIterator().getNext();
+            Ogre::Node* pitchNode = yawNode->getChildIterator().getNext();
+
+            // we are only interested in X and Y rotation
+
+            // Rotate around X axis
+            Ogre::Quaternion xr(Ogre::Radian(x), Ogre::Vector3::UNIT_X);
+
+            // Rotate around Y axis
+            Ogre::Quaternion yr(Ogre::Radian(-z), Ogre::Vector3::UNIT_Y);
+
+            pitchNode->setOrientation(xr);
+            yawNode->setOrientation(yr);
+    }
 }
diff --git a/apps/openmw/mwrender/player.hpp b/apps/openmw/mwrender/player.hpp
index 4306b8a95e..406bedb0aa 100644
--- a/apps/openmw/mwrender/player.hpp
+++ b/apps/openmw/mwrender/player.hpp
@@ -23,6 +23,9 @@ namespace MWRender
 
                 Ogre::Camera *getCamera() { return mCamera; }
 
+                /// Set where the player is looking at. Uses Morrowind (euler) angles
+                void setRot(float x, float y, float z);
+
                 std::string getHandle() const { return mNode->getName(); }
                 Ogre::SceneNode* getNode() {return mNode;}
     };
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index 0b1483ff8f..91b030d1c8 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -40,6 +40,11 @@ namespace MWWorld
         mWorld.moveObject (getPlayer(), x, y, z);
     }
 
+    void Player::setRot(float x, float y, float z)
+    {
+        mRenderer->setRot(x, y, z);
+    }
+
     void Player::setClass (const ESM::Class& class_)
     {
         ESM::Class *new_class = new ESM::Class (class_);
diff --git a/apps/openmw/mwworld/player.hpp b/apps/openmw/mwworld/player.hpp
index e199f17e98..166d4cfee0 100644
--- a/apps/openmw/mwworld/player.hpp
+++ b/apps/openmw/mwworld/player.hpp
@@ -42,6 +42,9 @@ namespace MWWorld
         /// Set the player position. Uses Morrowind coordinates.
         void setPos(float x, float y, float z);
 
+        /// Set where the player is looking at. Uses Morrowind (euler) angles
+        void setRot(float x, float y, float z);
+
         void setCell (MWWorld::Ptr::CellStore *cellStore)
         {
             mCellStore = cellStore;
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 47238ee719..a47137d257 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -145,10 +145,13 @@ namespace MWWorld
         bool hasWater = cell->cell->data.flags & cell->cell->HasWater;
         mPhysics->setCurrentWater(hasWater, cell->cell->water);
         if (adjustPlayerPos)
+        {
             mWorld->getPlayer().setPos (position.pos[0], position.pos[1], position.pos[2]);
+            mWorld->getPlayer().setRot (position.rot[0], position.rot[1], position.rot[2]);
+        }
 
         mWorld->getPlayer().setCell (cell);
-        // TODO orientation
+
         MWBase::Environment::get().getMechanicsManager()->addActor (mWorld->getPlayer().getPlayer());
         MWBase::Environment::get().getMechanicsManager()->watchActor (mWorld->getPlayer().getPlayer());