diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-02-22 22:58:49 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-02-22 22:58:49 +0000 |
| commit | 8bebb385fe1f7df22c7fd040eceaaf1b3bcbef75 (patch) | |
| tree | 131af8acc2dcb8c127ffcf13442e8fd3c95e880d /indra/newview/pipeline.cpp | |
| parent | d60925e3b4c49f6203be01a56b584c70da8eb506 (diff) | |
| parent | 4aad62006259c20bcdda1495138f7313b8f35e8d (diff) | |
Merged in graham_linden/viewer-eep-fixes (pull request #282)
SL-10415, SL-10612, SL-10569
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 490738d304..b6e35fb6ea 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -8497,8 +8497,12 @@ void LLPipeline::bindDeferredShader(LLGLSLShader& shader, LLRenderTarget* light_ shader.uniform1f(LLShaderMgr::DEFERRED_DEPTH_CUTOFF, RenderEdgeDepthCutoff); shader.uniform1f(LLShaderMgr::DEFERRED_NORM_CUTOFF, RenderEdgeNormCutoff); + shader.uniform4fv(LLShaderMgr::SUNLIGHT_COLOR, 1, mSunDiffuse.mV); + shader.uniform4fv(LLShaderMgr::MOONLIGHT_COLOR, 1, mMoonDiffuse.mV); + LLEnvironment& environment = LLEnvironment::instance(); shader.uniform1i(LLShaderMgr::SUN_UP_FACTOR, environment.getIsSunUp() ? 1 : 0); + shader.uniform1f(LLShaderMgr::SUN_MOON_GLOW_FACTOR, environment.getCurrentSky()->getSunMoonGlowFactor()); if (shader.getUniformLocation(LLShaderMgr::DEFERRED_NORM_MATRIX) >= 0) { @@ -8591,6 +8595,7 @@ void LLPipeline::renderDeferredLighting(LLRenderTarget* screen_target) mTransformedSunDir.set(tc.v); glh::vec4f tc_moon(mMoonDir.mV); + mat.mult_matrix_vec(tc_moon); mTransformedMoonDir.set(tc_moon.v); gGL.pushMatrix(); |