mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 09:23:53 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1003 from MiroslavR/camera-distance

Browse source 
Fix camera distance not getting reset to max value (Fixes #3473)
This commit is contained in:
scrawl 2016-07-17 20:24:49 +02:00 committed by GitHub
commit 9e3ed45320
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwrender/camera.cpp
View file

@ -54,7 +54,6 @@ namespace MWRender
mIsNearest(false),
mHeight(124.f),
mMaxCameraDistance(192.f),
mDistanceAdjusted(false),
mVanityToggleQueued(false),
mVanityToggleQueuedValue(false),
mViewModeToggleQueued(false),
@ -342,22 +341,17 @@ namespace MWRender
} else if (!mFirstPersonView) {
mMaxCameraDistance = mCameraDistance;
}
} else {
mDistanceAdjusted = true;
}
}
void Camera::setCameraDistance()
{
if (mDistanceAdjusted) {
if (mVanity.enabled || mPreviewMode) {
mCameraDistance = mPreviewCam.offset;
} else if (!mFirstPersonView) {
mCameraDistance = mMaxCameraDistance;
}
}
mDistanceAdjusted = false;
}
void Camera::setAnimation(NpcAnimation *anim)
{

2
apps/openmw/mwrender/camera.hpp
View file

@ -49,8 +49,6 @@ namespace MWRender
float mHeight, mMaxCameraDistance;
CamData mMainCam, mPreviewCam;
bool mDistanceAdjusted;
bool mVanityToggleQueued;
bool mVanityToggleQueuedValue;
bool mViewModeToggleQueued;