From 6521febb2417265add485e70659ad9c96e56647c Mon Sep 17 00:00:00 2001
From: Ptolemy <ptolemy@lindenlab.com>
Date: Thu, 5 Nov 2020 20:06:46 -0800
Subject: [PATCH] SL-14275: Cleanup non descript name for water reflection mode
---
indra/newview/pipeline.cpp | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 95345aa990d..36037415e7e 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -133,6 +133,18 @@
//
#define MATERIALS_IN_REFLECTIONS 0
+// NOTE: Keep in sync with indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+enum EWaterReflectionMode
+{
+ WATER_REFLECT_NONE_WATER_OPAQUE = -2,
+ WATER_REFLECT_NONE_WATER_TRANSPARENT = -1,
+ WATER_REFLECT_MINIMAL = 0,
+ WATER_REFLECT_TERRAIN = 1,
+ WATER_REFLECT_STATIC_OBJECTS = 2,
+ WATER_REFLECT_AVATARS = 3,
+ WATER_REFLECT_EVERYTHING = 4
+};
+
bool gShiftFrame = false;
//cached settings
@@ -9257,7 +9269,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
glh::matrix4f saved_projection = get_current_projection();
glh::matrix4f mat;
- S32 detail = RenderReflectionDetail;
+ S32 reflection_detail = RenderReflectionDetail;
F32 water_height = gAgent.getRegion()->getWaterHeight();
F32 camera_height = camera_in.getOrigin().mV[VZ];
@@ -9354,15 +9366,15 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
LLPipeline::RENDER_TYPE_CLOUDS,
LLPipeline::END_RENDER_TYPES);
- if (detail > 0)
+ if (reflection_detail > WATER_REFLECT_MINIMAL)
{ //mask out selected geometry based on reflection detail
- if (detail < 4)
+ if (reflection_detail < WATER_REFLECT_EVERYTHING)
{
clearRenderTypeMask(LLPipeline::RENDER_TYPE_PARTICLES, END_RENDER_TYPES);
- if (detail < 3)
+ if (reflection_detail < WATER_REFLECT_AVATARS)
{
clearRenderTypeMask(LLPipeline::RENDER_TYPE_AVATAR, LLPipeline::RENDER_TYPE_CONTROL_AV, END_RENDER_TYPES);
- if (detail < 2)
+ if (reflection_detail < WATER_REFLECT_STATIC_OBJECTS)
{
clearRenderTypeMask(LLPipeline::RENDER_TYPE_VOLUME, END_RENDER_TYPES);
}
--
GitLab