From d12bac2d9e79d1ee5c34f5eda078b357878ee904 Mon Sep 17 00:00:00 2001 From: Kolzi Date: Sat, 20 Jul 2013 16:55:35 +0200 Subject: [PATCH] Third person zoom - fixed code review issues. --- apps/openmw/mwrender/renderingmanager.cpp | 10 ++++++++-- apps/openmw/mwrender/renderingmanager.hpp | 8 +------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp index 61463b449c..b881c0c9e3 100644 --- a/apps/openmw/mwrender/renderingmanager.cpp +++ b/apps/openmw/mwrender/renderingmanager.cpp @@ -319,8 +319,6 @@ void RenderingManager::update (float duration, bool paused) Ogre::Vector3 playerPos(_playerPos[0], _playerPos[1], _playerPos[2]); Ogre::Vector3 orig, dest; - //Why is this line here? - // mCamera->setCameraDistance(); if(!mCamera->getPosition(orig, dest)) { orig.z += mCamera->getHeight() * mRootNode->getScale().z; @@ -895,6 +893,14 @@ bool RenderingManager::vanityRotateCamera(const float *rot) return true; } +void RenderingManager::setCameraDistance(float dist, bool adjust, bool override) +{ + if(!mCamera->isVanityOrPreviewModeEnabled() && !mCamera->isFirstPerson()) + { + mCamera->setCameraDistance(-dist / 120.f * 10, adjust, override); + } +} + 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 4c65ac6cee..604558f525 100644 --- a/apps/openmw/mwrender/renderingmanager.hpp +++ b/apps/openmw/mwrender/renderingmanager.hpp @@ -86,13 +86,7 @@ public: void resetCamera(); bool vanityRotateCamera(const float *rot); - void setCameraDistance(float dist, bool adjust = false, bool override = true) - { - if(!mCamera->isVanityOrPreviewModeEnabled() && !mCamera->isFirstPerson()) - { - mCamera->setCameraDistance(-dist/120.f*10, adjust, override); - } - } + void setCameraDistance(float dist, bool adjust = false, bool override = true); void setupPlayer(const MWWorld::Ptr &ptr); void renderPlayer(const MWWorld::Ptr &ptr);