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

Do not use/assign the camera distance in first person mode (Fixes #3421)

Browse source
This commit is contained in:
scrawl 2016-06-10 01:05:43 +02:00
parent 24f43f6272
commit ce91637cf9
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,6 +69,8 @@ namespace MWRender
mMainCam.yaw = 0.f; mMainCam.yaw = 0.f;
mMainCam.offset = 400.f; mMainCam.offset = 400.f;
mCameraDistance = mMaxCameraDistance;
mUpdateCallback = new UpdateRenderCameraCallback(this); mUpdateCallback = new UpdateRenderCameraCallback(this);
mCamera->addUpdateCallback(mUpdateCallback); mCamera->addUpdateCallback(mUpdateCallback);
} }
@ -108,7 +110,7 @@ namespace MWRender
osg::Quat orient = osg::Quat(getPitch(), osg::Vec3d(1,0,0)) * osg::Quat(getYaw(), osg::Vec3d(0,0,1)); osg::Quat orient = osg::Quat(getPitch(), osg::Vec3d(1,0,0)) * osg::Quat(getYaw(), osg::Vec3d(0,0,1));
osg::Vec3d offset = orient * osg::Vec3d(0, -mCameraDistance, 0); osg::Vec3d offset = orient * osg::Vec3d(0, isFirstPerson() ? 0 : -mCameraDistance, 0);
position += offset; position += offset;
osg::Vec3d forward = orient * osg::Vec3d(0,1,0); osg::Vec3d forward = orient * osg::Vec3d(0,1,0);
@ -187,12 +189,6 @@ namespace MWRender
mFirstPersonView = !mFirstPersonView; mFirstPersonView = !mFirstPersonView;
processViewChange(); processViewChange();
if (mFirstPersonView) {
mCameraDistance = 0.f;
} else {
mCameraDistance = mMaxCameraDistance;
}
} }
void Camera::allowVanityMode(bool allow) void Camera::allowVanityMode(bool allow)
@ -313,6 +309,8 @@ namespace MWRender
float Camera::getCameraDistance() const float Camera::getCameraDistance() const
{ {
if (isFirstPerson())
return 0.f;
return mCameraDistance; return mCameraDistance;
} }
@ -395,7 +393,7 @@ namespace MWRender
osg::Quat orient = osg::Quat(getPitch(), osg::Vec3d(1,0,0)) * osg::Quat(getYaw(), osg::Vec3d(0,0,1)); osg::Quat orient = osg::Quat(getPitch(), osg::Vec3d(1,0,0)) * osg::Quat(getYaw(), osg::Vec3d(0,0,1));
osg::Vec3d offset = orient * osg::Vec3d(0, -mCameraDistance, 0); osg::Vec3d offset = orient * osg::Vec3d(0, isFirstPerson() ? 0 : -mCameraDistance, 0);
camera = focal + offset; camera = focal + offset;
} }