From 6ca2b1af743b659e44b9601f99c985a92a66e99a Mon Sep 17 00:00:00 2001
From: Tom Mason <wheybags@wheybags.com>
Date: Tue, 9 Apr 2013 19:24:41 +0100
Subject: [PATCH] fix for turning animations playing when in vanity mode

---
 apps/openmw/mwbase/world.hpp              |  1 +
 apps/openmw/mwinput/inputmanagerimp.cpp   | 13 +++++++++++--
 apps/openmw/mwrender/renderingmanager.cpp | 10 ++++++++++
 apps/openmw/mwrender/renderingmanager.hpp |  2 ++
 apps/openmw/mwworld/worldimp.cpp          |  5 +++++
 apps/openmw/mwworld/worldimp.hpp          |  2 ++
 6 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 040dc703c0..39e985890a 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -319,6 +319,7 @@ namespace MWBase
             virtual void allowVanityMode(bool allow) = 0;
             virtual void togglePlayerLooking(bool enable) = 0;
             virtual void changeVanityModeScale(float factor) = 0;
+            virtual bool vanityRotateCamera(float * rot) = 0;
 
             virtual void renderPlayer() = 0;
 
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index c23106be1a..6a34161e08 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -533,8 +533,17 @@ namespace MWInput
             float scale = MWBase::Environment::get().getFrameDuration();
             if(scale <= 0.0f) scale = 1.0f;
 
-            mPlayer.setYaw(x/scale);
-            mPlayer.setPitch(-y/scale);
+            float rot[3];
+            rot[0] = -y;
+            rot[1] = 0.0f;
+            rot[2] = x;
+            
+            // Only actually turn player when we're not in vanity mode 
+            if(!MWBase::Environment::get().getWorld()->vanityRotateCamera(rot))
+            {
+                mPlayer.setYaw(x/scale);
+                mPlayer.setPitch(-y/scale);
+            }
 
             if (arg.state.Z.rel)
                 MWBase::Environment::get().getWorld()->changeVanityModeScale(arg.state.Z.rel);
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index cd5ab19b9d..029cf394b4 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -891,6 +891,16 @@ void RenderingManager::getPlayerData(Ogre::Vector3 &eyepos, float &pitch, float
     mPlayer->getSightAngles(pitch, yaw);
 }
 
+bool RenderingManager::vanityRotateCamera(float* rot)
+{
+    if(!mPlayer->isVanityOrPreviewModeEnabled())
+        return false;
+
+    Ogre::Vector3 vRot(rot);
+    mPlayer->rotateCamera(vRot, true);
+    return true;
+}
+
 void RenderingManager::getInteriorMapPosition (Ogre::Vector2 position, float& nX, float& nY, int &x, int& y)
 {
     return mLocalMap->getInteriorMapPosition (position, nX, nY, x, y);
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index b343a60bdb..cece7a95f0 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -88,6 +88,8 @@ class RenderingManager: private RenderingInterface, public Ogre::WindowEventList
         mPlayer->setCameraDistance(-factor/120.f*10, true, true);
     }
 
+    bool vanityRotateCamera(float* rot);
+
     void getPlayerData(Ogre::Vector3 &eyepos, float &pitch, float &yaw);
 
     void attachCameraTo(const MWWorld::Ptr &ptr);
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index ae9b7a06b7..11ccd8f2fc 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1364,6 +1364,11 @@ namespace MWWorld
         return physactor && physactor->getOnGround();
     }
 
+    bool World::vanityRotateCamera(float * rot)
+    {
+        return mRendering->vanityRotateCamera(rot);
+    }
+
     void World::renderPlayer()
     {
         mRendering->renderPlayer(mPlayer->getPlayer());
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 5ae87a1ff7..7b12babee9 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -361,6 +361,8 @@ namespace MWWorld
                 mRendering->changeVanityModeScale(factor);
             }
 
+            virtual bool vanityRotateCamera(float * rot);
+
             virtual void renderPlayer();
 
             virtual void setupExternalRendering (MWRender::ExternalRendering& rendering);