Wire up SSR option in Preferences -> Graphics -> Rendering

Ansariel 2013-03-24 14:00:45 +01:00
parent 31955780d3
commit 3ce418babe
3 changed files with 41 additions and 2 deletions

View File

@ -1537,6 +1537,9 @@ void LLFloaterPreference::refreshEnabledState()
(ctrl_wind_light->get()) ? TRUE : FALSE;
ctrl_deferred->setEnabled(enabled);
// <FS:Ansariel> Tofu's SSR
getChild<LLCheckBoxCtrl>("FSRenderSSR")->setEnabled(enabled && (ctrl_deferred->get() ? TRUE : FALSE) && gSavedSettings.getS32("RenderShadowDetail") > 0);
LLCheckBoxCtrl* ctrl_ssao = getChild<LLCheckBoxCtrl>("UseSSAO");
LLCheckBoxCtrl* ctrl_dof = getChild<LLCheckBoxCtrl>("UseDoF");
@ -1570,6 +1573,8 @@ void LLFloaterPreference::disableUnavailableSettings()
LLComboBox* ctrl_shadows = getChild<LLComboBox>("ShadowDetail");
LLCheckBoxCtrl* ctrl_ssao = getChild<LLCheckBoxCtrl>("UseSSAO");
LLCheckBoxCtrl* ctrl_dof = getChild<LLCheckBoxCtrl>("UseDoF");
// <FS:Ansariel> Tofu's SSR
LLCheckBoxCtrl* ctrl_ssr = getChild<LLCheckBoxCtrl>("FSRenderSSR");
// if vertex shaders off, disable all shader related products
if (!LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable"))
@ -1600,6 +1605,10 @@ void LLFloaterPreference::disableUnavailableSettings()
ctrl_deferred->setEnabled(FALSE);
ctrl_deferred->setValue(FALSE);
// <FS:Ansariel> Tofu's SSR
ctrl_ssr->setEnabled(FALSE);
ctrl_ssr->setValue(FALSE);
}
// disabled windlight
@ -1620,6 +1629,10 @@ void LLFloaterPreference::disableUnavailableSettings()
ctrl_deferred->setEnabled(FALSE);
ctrl_deferred->setValue(FALSE);
// <FS:Ansariel> Tofu's SSR
ctrl_ssr->setEnabled(FALSE);
ctrl_ssr->setValue(FALSE);
}
// disabled deferred
@ -1637,6 +1650,10 @@ void LLFloaterPreference::disableUnavailableSettings()
ctrl_deferred->setEnabled(FALSE);
ctrl_deferred->setValue(FALSE);
// <FS:Ansariel> Tofu's SSR
ctrl_ssr->setEnabled(FALSE);
ctrl_ssr->setValue(FALSE);
}
// disabled deferred SSAO
@ -1651,6 +1668,10 @@ void LLFloaterPreference::disableUnavailableSettings()
{
ctrl_shadows->setEnabled(FALSE);
ctrl_shadows->setValue(0);
// <FS:Ansariel> Tofu's SSR
ctrl_ssr->setEnabled(FALSE);
ctrl_ssr->setValue(FALSE);
}
// disabled reflections
@ -1681,6 +1702,10 @@ void LLFloaterPreference::disableUnavailableSettings()
ctrl_deferred->setEnabled(FALSE);
ctrl_deferred->setValue(FALSE);
// <FS:Ansariel> Tofu's SSR
ctrl_ssr->setEnabled(FALSE);
ctrl_ssr->setValue(FALSE);
}
// disabled cloth

View File

@ -150,6 +150,7 @@
<text name="Miscellaneous Rendering">
Sonstige Darstellungsoptionen:
</text>
<check_box label="Screen Space Reflections aktivieren" tool_tip="Aktiviert Screen Space Reflections, wenn das erweiterte Beleuchtungsmodell aktiviert wird. Benötigt Atmosphären-Shader, Hardware-Hautberechnung und aktivierte Schatten." name="FSRenderSSR"/>
<check_box label="Leuchten anzeigen" tool_tip="Stellt Leuchteffekte dar. Stärke muss auf 0 gesetzt werden, um Leuchteffekte zu deaktiveren, falls Schatten aktiviert sind." name="RenderGlow"/>
<slider label="Stärke:" tool_tip="Leuchtstärke. Größer = Breitere und weichere Darstellung (Standardwert: 2)" name="glow_strength"/>
<check_box label="Avatare anzeigen, die nicht vollständig geladen sind" name="RenderUnloadedAvatars"/>

View File

@ -328,6 +328,8 @@
top_pad="3"
name="ShadowDetail"
width="150">
<combo_box.commit_callback
function="Pref.VertexShaderEnable" />
<combo_box.item
label="None"
name="0"
@ -1073,6 +1075,17 @@
Miscellaneous Rendering:
</text>
<check_box
control_name="FSRenderSSR"
height="16"
initial_value="false"
label="Enable rendering of screen space reflections"
layout="topleft"
left_delta="10"
name="FSRenderSSR"
tool_tip="Enables the rendering of screen space reflections when Advanced Lighting Model is enabled. Requires atmmospheric shaders, avatar hardware skinning and enabled shadows."
top_pad="10"
width="256"/>
<check_box
control_name="RenderGlow"
height="16"
@ -1080,9 +1093,9 @@
label="Render glow"
tool_tip="Render glow. Note that strength needs to be set to zero to disable glow when shadows are enabled."
layout="topleft"
left_delta="10"
left_delta="0"
name="RenderGlow"
top_pad="12"
top_pad="4"
width="256"/>
<slider
control_name="RenderGlowIterations"