diff options
| author | Michael Pohoreski <ptolemy@lindenlab.com> | 2020-09-12 04:11:11 +0000 |
|---|---|---|
| committer | Michael Pohoreski <ptolemy@lindenlab.com> | 2020-09-12 04:11:11 +0000 |
| commit | 92f5d5428e83e0469041ea367ea5a8637194523c (patch) | |
| tree | 7d7bba8cd7d4328d7ba4817a435de99b8da45314 /indra | |
| parent | dd875c76668a7818f8b584752418dc5296339d7b (diff) | |
| parent | d26f17efd565b189e4ed79ede674a493f4abd97a (diff) | |
Merged in SL-13768_remove_moon_glow (pull request #297)
SL-13768 Remove glow from moon when sun is down due to it using the sun glow setting
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/lldrawpoolwlsky.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolwlsky.cpp b/indra/newview/lldrawpoolwlsky.cpp index d4e7f1600e..4d077379cb 100644 --- a/indra/newview/lldrawpoolwlsky.cpp +++ b/indra/newview/lldrawpoolwlsky.cpp @@ -184,6 +184,7 @@ void LLDrawPoolWLSky::renderSkyHazeDeferred(const LLVector3& camPosLocal, F32 ca ((LLSettingsVOSky*)psky.get())->updateShader(sky_shader); + bool is_sun_up = psky->getIsSunUp(); F32 moisture_level = (float)psky->getSkyMoistureLevel(); F32 droplet_radius = (float)psky->getSkyDropletRadius(); F32 ice_level = (float)psky->getSkyIceLevel(); @@ -199,9 +200,9 @@ void LLDrawPoolWLSky::renderSkyHazeDeferred(const LLVector3& camPosLocal, F32 ca sky_shader->uniform1f(LLShaderMgr::DROPLET_RADIUS, droplet_radius); sky_shader->uniform1f(LLShaderMgr::ICE_LEVEL, ice_level); - sky_shader->uniform1f(LLShaderMgr::SUN_MOON_GLOW_FACTOR, psky->getSunMoonGlowFactor()); + sky_shader->uniform1f(LLShaderMgr::SUN_MOON_GLOW_FACTOR, is_sun_up ? psky->getSunMoonGlowFactor() : 0.0f ); // SL-13768 - sky_shader->uniform1i(LLShaderMgr::SUN_UP_FACTOR, psky->getIsSunUp() ? 1 : 0); + sky_shader->uniform1i(LLShaderMgr::SUN_UP_FACTOR, is_sun_up ? 1 : 0); /// Render the skydome renderDome(origin, camHeightLocal, sky_shader); |