teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Third person zoom - fixed code review issues.

Browse source
This commit is contained in:
Kolzi 2013-07-20 16:55:35 +02:00
parent 1b7966ca27
commit d12bac2d9e
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/openmw/mwrender/renderingmanager.cpp
View file

@ -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);

8
apps/openmw/mwrender/renderingmanager.hpp
View file

@ -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);