Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent camera from freaking (shaking violently and eventually displaying pinkscreen) out if zoomed in unreasonably close.

Browse Source
This commit is contained in:
Shyotl
2018-11-19 00:40:41 -06:00
parent bf5e7b794e
commit 1b9ce0b511
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llagentcamera.cpp
View File

@@ -914,7 +914,8 @@ void LLAgentCamera::cameraZoomIn(const F32 fraction)
LLVector3d camera_offset_unit(mCameraFocusOffsetTarget); LLVector3d camera_offset_unit(mCameraFocusOffsetTarget);
F32 min_zoom = 0.f;//LAND_MIN_ZOOM; // Still limit min zoom to something sane, otherwise the camera normal starts flaking out.
F32 min_zoom = 0.02f;//LAND_MIN_ZOOM;
F32 current_distance = (F32)camera_offset_unit.normalize(); F32 current_distance = (F32)camera_offset_unit.normalize();
F32 new_distance = current_distance * fraction; F32 new_distance = current_distance * fraction;
@@ -935,9 +936,8 @@ void LLAgentCamera::cameraZoomIn(const F32 fraction)
min_zoom = OBJECT_MIN_ZOOM; min_zoom = OBJECT_MIN_ZOOM;
} }
} }
new_distance = llmax(new_distance, min_zoom);
} }
new_distance = llmax(new_distance, min_zoom);
// Don't zoom too far back // Don't zoom too far back
const F32 DIST_FUDGE = 16.f; // meters const F32 DIST_FUDGE = 16.f; // meters