diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-03-20 13:07:21 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-03-20 13:07:21 -0700 |
| commit | edf8ba6e5ff0fc2b5ef55219c82af7b0f20437d9 (patch) | |
| tree | b84b4b41e4232ab6839a6ea1db6ac694583ef88c /indra/newview/app_settings/shaders/class3/deferred | |
| parent | cdad939bbd6fbed4cfc863469d5c37e17bbcf698 (diff) | |
SL-10449
Fix name of attenuation setter used.
Fix flipped light vec.
Make class3 lights use shadows on projector ambiance too.
Diffstat (limited to 'indra/newview/app_settings/shaders/class3/deferred')
| -rw-r--r-- | indra/newview/app_settings/shaders/class3/deferred/multiSpotLightF.glsl | 2 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class3/deferred/spotLightF.glsl | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/app_settings/shaders/class3/deferred/multiSpotLightF.glsl b/indra/newview/app_settings/shaders/class3/deferred/multiSpotLightF.glsl index 72bccc5627..0c113282b5 100644 --- a/indra/newview/app_settings/shaders/class3/deferred/multiSpotLightF.glsl +++ b/indra/newview/app_settings/shaders/class3/deferred/multiSpotLightF.glsl @@ -228,7 +228,7 @@ void main() //float diff = clamp((proj_range-proj_focus)/proj_range, 0.0, 1.0); vec4 amb_plcol = texture2DLodAmbient(projectionMap, proj_tc.xy, proj_lod); - amb_da += (da*da*0.5+0.5)*proj_ambiance; + amb_da += (da*da*0.5+0.5)*(1.0-shadow)*proj_ambiance; amb_da *= dist_atten * noise; diff --git a/indra/newview/app_settings/shaders/class3/deferred/spotLightF.glsl b/indra/newview/app_settings/shaders/class3/deferred/spotLightF.glsl index 3b2b0d5718..00b276f585 100644 --- a/indra/newview/app_settings/shaders/class3/deferred/spotLightF.glsl +++ b/indra/newview/app_settings/shaders/class3/deferred/spotLightF.glsl @@ -227,7 +227,7 @@ void main() //float diff = clamp((proj_range-proj_focus)/proj_range, 0.0, 1.0); vec4 amb_plcol = texture2DLodAmbient(projectionMap, proj_tc.xy, proj_lod); - amb_da += (da*da*0.5+0.5)*proj_ambiance; + amb_da += (da*da*0.5+0.5)*(1.0-shadow)*proj_ambiance; amb_da *= dist_atten * noise; @@ -261,9 +261,6 @@ void main() } } - - - if (envIntensity > 0.0) { |