From 1b52749ae1930e5322e19066a2513d8b9dccfece Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 9 Nov 2015 17:30:11 +0100
Subject: [PATCH] Adjust third person camera height based on character height

---
 apps/openmw/mwrender/camera.cpp           | 13 ++++++++++---
 apps/openmw/mwrender/camera.hpp           |  3 +++
 apps/openmw/mwrender/renderingmanager.cpp |  3 +++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwrender/camera.cpp b/apps/openmw/mwrender/camera.cpp
index fb6573d65f..ea8c60bf32 100644
--- a/apps/openmw/mwrender/camera.cpp
+++ b/apps/openmw/mwrender/camera.cpp
@@ -42,7 +42,8 @@ namespace MWRender
 {
 
     Camera::Camera (osg::Camera* camera)
-    : mCamera(camera),
+    : mHeightScale(1.f),
+      mCamera(camera),
       mAnimation(NULL),
       mFirstPersonView(true),
       mPreviewMode(false),
@@ -93,7 +94,7 @@ namespace MWRender
 
         osg::Vec3d position = worldMat.getTrans();
         if (!isFirstPerson())
-            position.z() += mHeight;
+            position.z() += mHeight * mHeightScale;
         return position;
     }
 
@@ -372,11 +373,17 @@ namespace MWRender
             mTrackingNode = mAnimation->getNode("Camera");
             if (!mTrackingNode)
                 mTrackingNode = mAnimation->getNode("Head");
+            mHeightScale = 1.f;
         }
         else
         {
             mAnimation->setViewMode(NpcAnimation::VM_Normal);
-            mTrackingNode = mTrackingPtr.getRefData().getBaseNode();
+            osg::PositionAttitudeTransform* transform = mTrackingPtr.getRefData().getBaseNode();
+            mTrackingNode = transform;
+            if (transform)
+                mHeightScale = mTrackingPtr.getRefData().getBaseNode()->getScale().z();
+            else
+                mHeightScale = 1.f;
         }
         rotateCamera(getPitch(), getYaw(), false);
     }
diff --git a/apps/openmw/mwrender/camera.hpp b/apps/openmw/mwrender/camera.hpp
index a655e1c1f8..899fc94471 100644
--- a/apps/openmw/mwrender/camera.hpp
+++ b/apps/openmw/mwrender/camera.hpp
@@ -29,6 +29,7 @@ namespace MWRender
 
         MWWorld::Ptr mTrackingPtr;
         osg::ref_ptr<const osg::Node> mTrackingNode;
+        float mHeightScale;
 
         osg::ref_ptr<osg::Camera> mCamera;
 
@@ -97,6 +98,8 @@ namespace MWRender
         bool isFirstPerson() const
         { return !(mVanity.enabled || mPreviewMode || !mFirstPersonView); }
 
+        void updateScale();
+
         void processViewChange();
 
         void update(float duration, bool paused=false);
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 45c04ceecd..27ea7ebed4 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -439,6 +439,9 @@ namespace MWRender
     void RenderingManager::scaleObject(const MWWorld::Ptr &ptr, const osg::Vec3f &scale)
     {
         ptr.getRefData().getBaseNode()->setScale(scale);
+
+        if (ptr == mCamera->getTrackingPtr()) // update height of camera
+            mCamera->processViewChange();
     }
 
     void RenderingManager::removeObject(const MWWorld::Ptr &ptr)