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

SL-12618 FIXED The camera zoom position is incorrect after selecting the preset in some cases

master
maxim_productengine 2020-01-30 17:51:41 +02:00
parent e865c94513
commit 2c7a8a2485
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/camera/Front.xml
View File

@ -72,7 +72,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.9</real>
<real>0.90322577953338623</real>
</map>
<key>EditCameraMovement</key>
<map>

2
indra/newview/app_settings/camera/Rear.xml
View File

@ -72,7 +72,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.9</real>
<real>0.90322577953338623</real>
</map>
<key>EditCameraMovement</key>
<map>

2
indra/newview/app_settings/camera/Side.xml
View File

@ -72,7 +72,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.9</real>
<real>0.90322577953338623</real>
</map>
<key>EditCameraMovement</key>
<map>

4
indra/newview/llagentcamera.cpp
View File

@ -717,7 +717,7 @@ BOOL LLAgentCamera::calcCameraMinDistance(F32 &obj_min_distance)
return TRUE;
}
F32 LLAgentCamera::getCameraZoomFraction()
F32 LLAgentCamera::getCameraZoomFraction(bool get_third_person)
{
// 0.f -> camera zoomed all the way out
// 1.f -> camera zoomed all the way in
@ -727,7 +727,7 @@ F32 LLAgentCamera::getCameraZoomFraction()
// already [0,1]
return mHUDTargetZoom;
}
else if (mFocusOnAvatar && cameraThirdPerson())
else if (get_third_person || (mFocusOnAvatar && cameraThirdPerson()))
{
return clamp_rescale(mCameraZoomFraction, MIN_ZOOM_FRACTION, MAX_ZOOM_FRACTION, 1.f, 0.f);
}

8
indra/newview/llagentcamera.h
View File

@ -272,10 +272,10 @@ public:
// Zoom
//--------------------------------------------------------------------
public:
void handleScrollWheel(S32 clicks); // Mousewheel driven zoom
void cameraZoomIn(const F32 factor); // Zoom in by fraction of current distance
F32 getCameraZoomFraction(); // Get camera zoom as fraction of minimum and maximum zoom
void setCameraZoomFraction(F32 fraction); // Set camera zoom as fraction of minimum and maximum zoom
void handleScrollWheel(S32 clicks); // Mousewheel driven zoom
void cameraZoomIn(const F32 factor); // Zoom in by fraction of current distance
F32 getCameraZoomFraction(bool get_third_person = false); // Get camera zoom as fraction of minimum and maximum zoom
void setCameraZoomFraction(F32 fraction); // Set camera zoom as fraction of minimum and maximum zoom
F32 calcCameraFOVZoomFactor();
F32 getAgentHUDTargetZoom();

2
indra/newview/llpresetsmanager.cpp
View File

@ -288,7 +288,7 @@ bool LLPresetsManager::savePreset(const std::string& subdirectory, std::string n
getControlNames(name_list);
name_list.push_back("PresetCameraActive");
gSavedSettings.setF32("CameraZoomFraction", gAgentCamera.getCameraZoomFraction());
gSavedSettings.setF32("CameraZoomFraction", gAgentCamera.getCameraZoomFraction(true));
name_list.push_back("CameraZoomFraction");
}
else