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

Merge DRTVWR-460

master
Ansariel 2020-01-28 23:06:49 +01:00
parent c766e2a021 e865c94513
commit a9c2d26fa9
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llagentcamera.cpp
View File

@ -2148,6 +2148,22 @@ bool LLAgentCamera::clampCameraPosition(LLVector3d& posCamGlobal, const LLVector
}
// [/RLVa:KB]
LLVector3 LLAgentCamera::getCurrentCameraOffset()
{
LLVector3 camera_offset = (LLViewerCamera::getInstance()->getOrigin() - gAgentAvatarp->mRoot->getWorldPosition() - mThirdPersonHeadOffset) * ~gAgent.getFrameAgent().getQuaternion();
return camera_offset / mCameraZoomFraction / gSavedSettings.getF32("CameraOffsetScale");
}
LLVector3d LLAgentCamera::getCurrentFocusOffset()
{
return (mFocusTargetGlobal - gAgent.getPositionGlobal()) * ~gAgent.getFrameAgent().getQuaternion();
}
bool LLAgentCamera::isJoystickCameraUsed()
{
return ((mOrbitAroundRadians != 0) || (mOrbitOverAngle != 0) || !mPanFocusDiff.isNull());
}
LLVector3 LLAgentCamera::getCameraOffsetInitial()
{
return convert_from_llsd<LLVector3>(mCameraOffsetInitial->get(), TYPE_VEC3, "");

4
indra/newview/llagentcamera.h
View File

@ -122,6 +122,10 @@ public:
/** Determines default focus offset depending on the current camera preset */
LLVector3d getFocusOffsetInitial();
LLVector3 getCurrentCameraOffset();
LLVector3d getCurrentFocusOffset();
bool isJoystickCameraUsed();
private:
/** Determines maximum camera distance from target for mouselook, opposite to LAND_MIN_ZOOM */
// <FS:Ansariel> FIRE-23470: Fix camera controls zoom glitch

6
indra/newview/llfloatersavecamerapreset.cpp
View File

@ -28,6 +28,7 @@
#include "llfloatersavecamerapreset.h"
#include "llagentcamera.h"
#include "llbutton.h"
#include "llcombobox.h"
#include "llfloaterpreference.h"
@ -101,6 +102,11 @@ void LLFloaterSaveCameraPreset::onBtnSave()
}
else
{
if (gAgentCamera.isJoystickCameraUsed())
{
gSavedSettings.setVector3("CameraOffsetRearView", gAgentCamera.getCurrentCameraOffset());
gSavedSettings.setVector3d("FocusOffsetRearView", gAgentCamera.getCurrentFocusOffset());
}
if (is_saving_new)
{
std::list<std::string> preset_names;