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/softenLightF.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/softenLightF.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl index a4543c325e..ec3c0cb68d 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl @@ -56,7 +56,6 @@ uniform mat3 env_mat; uniform mat3 ssao_effect_mat; uniform vec3 sun_dir; -uniform vec3 moon_dir; VARYING vec2 vary_fragcoord; uniform mat4 inv_proj; @@ -107,9 +106,7 @@ void main() float envIntensity = norm.z; norm.xyz = decode_normal(norm.xy); // unpack norm - 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 = max(0.0,da); final_da = min(final_da, 1.0f); @@ -151,9 +148,7 @@ void main() // the old infinite-sky shiny reflection // - float sa_sun = dot(refnormpersp, sun_dir.xyz); - float sa_moon = dot(refnormpersp, moon_dir.xyz); - float sa = max(sa_sun, sa_moon); + float sa = dot(refnormpersp, sun_dir.xyz); vec3 dumbshiny = sunlit*(texture2D(lightFunc, vec2(sa, spec.a)).r); |