livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-31719 - Fix storing camera position and focus while in flycam mode

meow-7.2.2
Zi Ree 2022-06-08 14:08:26 +02:00
parent f3245b8158
commit f95037e929
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llagentcamera.cpp
View File

@ -3266,7 +3266,13 @@ S32 LLAgentCamera::directionToKey(S32 direction)
void LLAgentCamera::storeCameraPosition()
{
gSavedPerAccountSettings.setVector3d("FSStoredCameraPos", getCameraPositionGlobal());
gSavedPerAccountSettings.setVector3d("FSStoredCameraFocus", getFocusTargetGlobal());
// get a vector pointing forward from the camera view manually, getFocusTargetGlobal() will
// not return useful values if the camera is in flycam mode or was just switched out of
// flycam mode and not repositioned after
LLVector3d forward = LLVector3d(1.0, 0.0, 0.0) * LLViewerCamera::getInstance()->getQuaternion() + getCameraPositionGlobal();
gSavedPerAccountSettings.setVector3d("FSStoredCameraFocus", forward);
LLUUID stored_camera_focus_object_id = LLUUID::null;
if (mFocusObject)
{
@ -3296,6 +3302,15 @@ void LLAgentCamera::loadCameraPosition()
return;
}
// switch off flycam mode if needed
if (LLViewerJoystick::getInstance()->getOverrideCamera())
{
handle_toggle_flycam();
// exiting from flycam usually keeps the camera where it is but here we want it to actually move
LLViewerJoystick::getInstance()->setCameraNeedsUpdate(true);
}
unlockView();
setCameraPosAndFocusGlobal(stored_camera_pos, stored_camera_focus, stored_camera_focus_object_id);
}