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

FIRE-7758: Just store object UUID and only restore view if camera position would still be within draw distance

Ansariel 2012-09-28 17:20:51 +02:00
parent 6e0ab0553f
commit 31c7e42a66
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
indra/newview/llagentcamera.cpp
View File

@ -181,7 +181,7 @@ LLAgentCamera::LLAgentCamera() :
// <FS:Ansariel> FIRE-7758: Save/load camera position
mStoredCameraPos(),
mStoredCameraFocus(),
mStoredCameraFocusObject(NULL),
mStoredCameraFocusObjectId(),
mHasStoredCameraPos(false),
// </FS:Ansariel>
@ -2881,29 +2881,32 @@ S32 LLAgentCamera::directionToKey(S32 direction)
return 0;
}
// <FS:Ansariel> FIRE-7758: Save/load camera position
// <FS:Ansariel> FIRE-7758: Save/load camera position feature
// Copyright (C) 2012, Ansariel Hiller @ Second Life for Phoenix Firestorm Viewer
// This code is licensed unter the GNU Lesser General Public License version 2.1
void LLAgentCamera::storeCameraPosition()
{
mStoredCameraPos = getCameraPositionGlobal();
mStoredCameraFocus = getFocusTargetGlobal();
mStoredCameraFocusObject = getFocusObject();
mStoredCameraFocusObjectId = LLUUID::null;
if (mFocusObject)
{
mStoredCameraFocusObjectId = mFocusObject->getID();
}
mHasStoredCameraPos = true;
}
void LLAgentCamera::loadCameraPosition()
{
if (mHasStoredCameraPos)
F32 renderFarClip = gSavedSettings.getF32("RenderFarClip");
F32 far_clip_squared = renderFarClip * renderFarClip;
if (mHasStoredCameraPos && dist_vec_squared(gAgent.getPositionGlobal(), mStoredCameraPos) <= far_clip_squared)
{
unlockView();
LLUUID focus_object_id;
if (mStoredCameraFocusObject)
{
focus_object_id = mStoredCameraFocusObject->getID();
}
setCameraPosAndFocusGlobal(mStoredCameraPos, mStoredCameraFocus, focus_object_id);
setCameraPosAndFocusGlobal(mStoredCameraPos, mStoredCameraFocus, mStoredCameraFocusObjectId);
}
}
// </FS:Ansariel
// </FS:Ansariel> FIRE-7758: Save/load camera position feature
// EOF

8
indra/newview/llagentcamera.h
View File

@ -389,7 +389,9 @@ private:
** **
*******************************************************************************/
// <FS:Ansariel> FIRE-7758: Save/load camera position
// <FS:Ansariel> FIRE-7758: Save/load camera position feature
// Copyright (C) 2012, Ansariel Hiller @ Second Life for Phoenix Firestorm Viewer
// This code is licensed unter the GNU Lesser General Public License version 2.1
public:
void storeCameraPosition();
void loadCameraPosition();
@ -397,9 +399,9 @@ public:
private:
LLVector3d mStoredCameraPos;
LLVector3d mStoredCameraFocus;
LLPointer<LLViewerObject> mStoredCameraFocusObject;
LLUUID mStoredCameraFocusObjectId;
bool mHasStoredCameraPos;
// </FS:Ansariel>
// </FS:Ansariel> FIRE-7758: Save/load camera position feature
};
extern LLAgentCamera gAgentCamera;