diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-08-12 14:25:35 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-08-12 14:25:35 -0700 |
| commit | 5937a4222473131d0cec4238fc234646e9aba91e (patch) | |
| tree | 8abbf7f5c47ed744da42fad293dd09234538e7c2 /indra/newview/lldrawpoolwater.cpp | |
| parent | 41c7523e08aab7f2bf4a040ac1c1c8a1d24babed (diff) | |
SL-10566, SL-10677
Make sky updates only occur if the input atmospherics values have actually changed (perf optimization).
Make water rendering use specular color for coloring spec.
Diffstat (limited to 'indra/newview/lldrawpoolwater.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolwater.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp index 1b5c154378..13420fc001 100644 --- a/indra/newview/lldrawpoolwater.cpp +++ b/indra/newview/lldrawpoolwater.cpp @@ -500,6 +500,9 @@ void LLDrawPoolWater::shade2(bool edge, LLGLSLShader* shader, const LLColor3& li } } + LLColor4 specular(psky->getIsSunUp() ? psky->getSunlightColor() : psky->getMoonlightColor()); + shader->uniform4fv(LLShaderMgr::SPECULAR_COLOR, 1, specular.mV); + sTime = (F32)LLFrameTimer::getElapsedSeconds() * 0.5f; S32 reftex = shader->enableTexture(LLShaderMgr::WATER_REFTEX); |