Commit f9125dca authored by Rye Mutt's avatar Rye Mutt 🍞
Browse files

Add water reflection quality option

parent 51435319
......@@ -1494,6 +1494,8 @@ void LLFloaterPreferenceGraphicsAdvanced::refreshEnabledState()
{
LLComboBox* ctrl_reflections = getChild<LLComboBox>("Reflections");
LLTextBox* reflections_text = getChild<LLTextBox>("ReflectionsText");
LLComboBox* ctrl_reflections_quality = getChild<LLComboBox>("ReflectionsQuality");
LLTextBox* reflections_quality_text = getChild<LLTextBox>("ReflectionsQualityText");
// [RLVa:KB] - Checked: 2013-05-11 (RLVa-1.4.9)
if (RlvActions::isRlvEnabled())
......@@ -1571,6 +1573,10 @@ void LLFloaterPreferenceGraphicsAdvanced::refreshEnabledState()
ctrl_deferred->setEnabled(enabled);
// Reflection Detail
ctrl_reflections_quality->setEnabled(ctrl_deferred->get() && reflections);
reflections_quality_text->setEnabled(ctrl_deferred->get() && reflections);
LLCheckBoxCtrl* ctrl_ssao = getChild<LLCheckBoxCtrl>("UseSSAO");
LLCheckBoxCtrl* ctrl_dof = getChild<LLCheckBoxCtrl>("UseDoF");
LLComboBox* ctrl_shadow = getChild<LLComboBox>("ShadowDetail");
......@@ -1665,6 +1671,8 @@ void LLFloaterPreferenceGraphicsAdvanced::disableUnavailableSettings()
{
LLComboBox* ctrl_reflections = getChild<LLComboBox>("Reflections");
LLTextBox* reflections_text = getChild<LLTextBox>("ReflectionsText");
LLComboBox* ctrl_reflections_quality = getChild<LLComboBox>("ReflectionsQuality");
LLTextBox* reflections_quality_text = getChild<LLTextBox>("ReflectionsQualityText");
LLCheckBoxCtrl* ctrl_avatar_vp = getChild<LLCheckBoxCtrl>("AvatarVertexProgram");
LLCheckBoxCtrl* ctrl_avatar_cloth = getChild<LLCheckBoxCtrl>("AvatarCloth");
LLCheckBoxCtrl* ctrl_wind_light = getChild<LLCheckBoxCtrl>("WindLightUseAtmosShaders");
......@@ -1716,6 +1724,10 @@ void LLFloaterPreferenceGraphicsAdvanced::disableUnavailableSettings()
ctrl_deferred->setEnabled(FALSE);
ctrl_deferred->setValue(FALSE);
ctrl_reflections_quality->setEnabled(FALSE);
ctrl_reflections_quality->setValue(FALSE);
reflections_quality_text->setEnabled(FALSE);
}
// disabled deferred SSAO
......@@ -1739,6 +1751,10 @@ void LLFloaterPreferenceGraphicsAdvanced::disableUnavailableSettings()
ctrl_reflections->setEnabled(FALSE);
ctrl_reflections->setValue(FALSE);
reflections_text->setEnabled(FALSE);
ctrl_reflections_quality->setEnabled(FALSE);
ctrl_reflections_quality->setValue(FALSE);
reflections_quality_text->setEnabled(FALSE);
}
// disabled av
......
......@@ -703,6 +703,7 @@ void settings_setup_listeners()
// [SL:KB] - Patch: Settings-RenderResolutionMultiplier | Checked: Catznip-5.4
gSavedSettings.getControl("RenderResolutionMultiplier")->getSignal()->connect(boost::bind(&handleRenderResolutionDivisorChanged, _2));
// [/SL:KB]
gSavedSettings.getControl("RenderWaterRefResolution")->getSignal()->connect(boost::bind(&handleReleaseGLBufferChanged, _2));
gSavedSettings.getControl("RenderDeferred")->getSignal()->connect(boost::bind(&handleRenderDeferredChanged, _2));
gSavedSettings.getControl("RenderShadowDetail")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
gSavedSettings.getControl("RenderDeferredSSAO")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
......
......@@ -694,7 +694,7 @@
layout="topleft"
name="ReflectionsText"
text_readonly_color="LabelDisabledColor"
top_delta="16"
top_delta="18"
left="440"
width="128">
Water Reflections:
......@@ -737,6 +737,45 @@
value="4"/>
</combo_box>
<text
type="string"
length="1"
follows="left|top"
height="16"
layout="topleft"
name="ReflectionsQualityText"
text_readonly_color="LabelDisabledColor"
top_delta="20"
left="440"
width="128">
Water Reflection Quality:
</text>
<combo_box
control_name="RenderWaterRefResolution"
height="18"
layout="topleft"
left_delta="170"
top_delta="0"
name="ReflectionsQuality"
width="150">
<combo_box.item
label="Low"
name="0"
value="512"/>
<combo_box.item
label="Medium"
name="1"
value="1024"/>
<combo_box.item
label="High"
name="2"
value="2048"/>
<combo_box.item
label="Ultra"
name="3"
value="4096"/>
</combo_box>
<check_box
control_name="WindLightUseAtmosShaders"
height="16"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment