diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-02-27 17:07:31 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-02-27 17:07:31 -0800 |
| commit | d7ad30a2d4dfd83f93b0150464214f2df776eb9c (patch) | |
| tree | 9157c33753ac067b33ac41c16c93ff30b3eebb7e /indra/llmath | |
| parent | ef573511489e08bd89323c17e57e2d9bda578abd (diff) | |
SL-10566 part the fourth
Fix water rendering causing distortion map update very frame.
Reduce binds in alpha draw pool for HUD atmo suppression (may regress HUD lighting weirdness).
Add ability to retrieve current user clip plane so it can be saved/restored around water map gen.
Leave render type masks as is after reflection map render to get detail filtering applied to distortion map again.
Re-enable occlusion in distortion map rendering.
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/llcamera.cpp | 5 | ||||
| -rw-r--r-- | indra/llmath/llcamera.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/indra/llmath/llcamera.cpp b/indra/llmath/llcamera.cpp index ff90532f75..9034182072 100644 --- a/indra/llmath/llcamera.cpp +++ b/indra/llmath/llcamera.cpp @@ -93,6 +93,11 @@ F32 LLCamera::getMaxView() const : MAX_FIELD_OF_VIEW; // narrow views } +LLPlane LLCamera::getUserClipPlane() +{ + return mAgentPlanes[AGENT_PLANE_USER_CLIP]; +} + // ---------------- LLCamera::setFoo() member functions ---------------- void LLCamera::setUserClipPlane(LLPlane& plane) diff --git a/indra/llmath/llcamera.h b/indra/llmath/llcamera.h index 321b8ddcc4..d0afa0e88f 100644 --- a/indra/llmath/llcamera.h +++ b/indra/llmath/llcamera.h @@ -154,6 +154,7 @@ public: bool isChanged(); //check if mAgentPlanes changed since last frame. + LLPlane getUserClipPlane(); void setUserClipPlane(LLPlane& plane); void disableUserClipPlane(); virtual void setView(F32 vertical_fov_rads); |