From c96a00f12f868b9260f517a6a8552bce0b564099 Mon Sep 17 00:00:00 2001 From: RunitaiLinden Date: Mon, 12 Jun 2023 10:08:27 -0500 Subject: SL-19856 Adjust water fog density range. Incidental decruft. --- indra/llinventory/llsettingswater.cpp | 2 +- indra/newview/llsettingsvo.cpp | 7 ------- indra/newview/skins/default/xui/en/panel_settings_water.xml | 4 ++-- 3 files changed, 3 insertions(+), 10 deletions(-) (limited to 'indra') diff --git a/indra/llinventory/llsettingswater.cpp b/indra/llinventory/llsettingswater.cpp index d732032a6c..348848b29a 100644 --- a/indra/llinventory/llsettingswater.cpp +++ b/indra/llinventory/llsettingswater.cpp @@ -230,7 +230,7 @@ LLSettingsWater::validation_list_t LLSettingsWater::validationList() llsd::array(0.0f, 0.0f, 0.0f, 1.0f), llsd::array(1.0f, 1.0f, 1.0f, 1.0f)))); validation.push_back(Validator(SETTING_FOG_DENSITY, true, LLSD::TypeReal, - boost::bind(&Validator::verifyFloatRange, _1, _2, llsd::array(-10.0f, 10.0f)))); + boost::bind(&Validator::verifyFloatRange, _1, _2, llsd::array(0.001f, 100.0f)))); validation.push_back(Validator(SETTING_FOG_MOD, true, LLSD::TypeReal, boost::bind(&Validator::verifyFloatRange, _1, _2, llsd::array(0.0f, 20.0f)))); validation.push_back(Validator(SETTING_FRESNEL_OFFSET, true, LLSD::TypeReal, diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index 6321dbc085..258cc1c7b2 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -1023,13 +1023,6 @@ LLSettingsWater::parammapping_t LLSettingsVOWater::getParameterMap() const { static parammapping_t param_map; - if (param_map.empty()) - { - //LLSD water_defaults = LLSettingsWater::defaults(); - //param_map[SETTING_FOG_COLOR] = DefaultParam(LLShaderMgr::WATER_FOGCOLOR, water_defaults[SETTING_FOG_COLOR]); - // let this get set by LLSettingsVOWater::applySpecial so that it can properly reflect the underwater modifier - //param_map[SETTING_FOG_DENSITY] = DefaultParam(LLShaderMgr::WATER_FOGDENSITY, water_defaults[SETTING_FOG_DENSITY]); - } return param_map; } diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml index 1aa42af3a8..f19629df26 100644 --- a/indra/newview/skins/default/xui/en/panel_settings_water.xml +++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml @@ -72,8 +72,8 @@ initial_value="0" layout="top" left_delta="15" - min_val="-10" - max_val="10" + min_val="0.001" + max_val="100" name="water_fog_density" top_delta="5" width="150" -- cgit v1.2.3 From 0cb15b08b481de7b9d8d5967098ff76b8da3efdb Mon Sep 17 00:00:00 2001 From: RunitaiLinden Date: Tue, 13 Jun 2023 13:19:41 -0500 Subject: SL-19842 Nudge dynamic exposure coefficient to brighten things up a bit. --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index f27444ca27..ecd63f4b21 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10621,7 +10621,7 @@ Type F32 Value - 0.3 + 0.4 RenderShaderLODThreshold -- cgit v1.2.3 From ad956699c08620903150b9adfc2e8c34ccf5c390 Mon Sep 17 00:00:00 2001 From: RunitaiLinden Date: Tue, 13 Jun 2023 14:45:12 -0500 Subject: SL-19811 Update fallback probe every 2 seconds to smooth out water cloud updates. --- indra/newview/app_settings/settings.xml | 2 +- indra/newview/llreflectionmapmanager.cpp | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'indra') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index ecd63f4b21..ee14bb2b2f 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10533,7 +10533,7 @@ Type F32 Value - 20.0 + 2.0 RenderReflectionProbeLevel diff --git a/indra/newview/llreflectionmapmanager.cpp b/indra/newview/llreflectionmapmanager.cpp index 15d41c4161..e30aba3df7 100644 --- a/indra/newview/llreflectionmapmanager.cpp +++ b/indra/newview/llreflectionmapmanager.cpp @@ -323,11 +323,17 @@ void LLReflectionMapManager::update() mRadiancePass = radiance_pass; } - static LLCachedControl sUpdatePeriod(gSavedSettings, "RenderDefaultProbeUpdatePeriod", 20.f); - if (sLevel == 0 && - gFrameTimeSeconds - mDefaultProbe->mLastUpdateTime < sUpdatePeriod) - { // when probes are disabled don't update the default probe more often than once every 20 seconds - oldestProbe = nullptr; + static LLCachedControl sUpdatePeriod(gSavedSettings, "RenderDefaultProbeUpdatePeriod", 2.f); + if ((gFrameTimeSeconds - mDefaultProbe->mLastUpdateTime) < sUpdatePeriod) + { + if (sLevel == 0) + { // when probes are disabled don't update the default probe more often than the prescribed update period + oldestProbe = nullptr; + } + } + else if (sLevel > 0) + { // when probes are enabled don't update the default probe less often than the prescribed update period + oldestProbe = mDefaultProbe; } // switch to updating the next oldest probe -- cgit v1.2.3 From b81aadae1b5026195103a5ae20404daf858ded0c Mon Sep 17 00:00:00 2001 From: RunitaiLinden Date: Tue, 13 Jun 2023 15:36:51 -0500 Subject: SL-19835 Fix for inaccurate water fog on transparent objects when camera is above water. --- indra/newview/lldrawpoolalpha.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index 6aa2316589..060129d275 100644 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -243,11 +243,13 @@ void LLDrawPoolAlpha::forwardRender(bool rigged) //enable writing to alpha for emissive effects gGL.setColorMask(true, true); - bool write_depth = rigged || + bool write_depth = rigged || LLDrawPoolWater::sSkipScreenCopy // we want depth written so that rendered alpha will // contribute to the alpha mask used for impostors - || LLPipeline::sImpostorRenderAlphaDepthPass; + || LLPipeline::sImpostorRenderAlphaDepthPass + || getType() == LLDrawPoolAlpha::POOL_ALPHA_PRE_WATER; // needed for accurate water fog + LLGLDepthTest depth(GL_TRUE, write_depth ? GL_TRUE : GL_FALSE); -- cgit v1.2.3