diff options
author | Rider Linden <rider@lindenlab.com> | 2018-08-09 23:48:32 +0000 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2018-08-09 23:48:32 +0000 |
commit | 44e1d3f7dcac3fafbaaf1281538e92f87a8cc8d1 (patch) | |
tree | d48eb92eb42bf7e32a9568141ea170d1820a56e9 /indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl | |
parent | 3dfd3be98e19c239949eb7d59ef3fb84274322d1 (diff) | |
parent | 3a3d0cbc79cd7371446af38e6d1c6b9cff1da0c3 (diff) |
Merged in graham_linden/viewer-eep-graham (pull request #44)
MAINT-8951
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl index 8dda96984e..7f2c5add16 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl @@ -43,7 +43,6 @@ uniform mat3 env_mat; uniform mat3 ssao_effect_mat; uniform vec3 sun_dir; -uniform vec3 moon_dir; #if HAS_SHADOW uniform sampler2DShadow shadowMap0; @@ -286,12 +285,9 @@ void main() calcFragAtmospherics(pos.xyz, 1.0, sunlit, amblit, additive, atten); vec2 abnormal = encode_normal(norm.xyz); - norm.xyz = decode_normal(abnormal.xy); + norm.xyz = decode_normal(abnormal.xy); - float da_sun = dot(norm.xyz, sun_dir.xyz); - float da_moon = dot(norm.xyz, moon_dir.xyz); - - float da = max(da_sun, da_moon); + float da = dot(norm.xyz, sun_dir.xyz); float final_da = da; final_da = min(final_da, shadow); |