diff options
| author | graham linden <graham@lindenlab.com> | 2013-04-16 08:28:38 -0700 |
|---|---|---|
| committer | graham linden <graham@lindenlab.com> | 2013-04-16 08:28:38 -0700 |
| commit | a054dff522ea874691cd859a8909a29d45cc8bd8 (patch) | |
| tree | dfe34ed98d1d02d68084d1951fbc8f27f4360e9e /indra/newview/app_settings/shaders/class2 | |
| parent | c4413f493e65d1c12f382a9fe4363e90c6a1b8c3 (diff) | |
| parent | d1f713f30bd4d42fe4696e25c01ab4532ef3b69b (diff) | |
Merged lindenlab/viewer-development-materials into default
Diffstat (limited to 'indra/newview/app_settings/shaders/class2')
| -rw-r--r-- | indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl | 4 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl index b3ab8fd510..90b6856c5c 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl @@ -213,9 +213,7 @@ void main() vec3 lcol = color.rgb * plcol.rgb * plcol.a; - lit = da * dist_atten * noise; - - lit = pow(lit, 0.7); + lit = pow(da,0.7) * dist_atten * noise; col = lcol*lit*diff_tex*shadow; amb_da += (da*0.5)*(1.0-shadow)*proj_ambiance; diff --git a/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl index 43fc5dbc5e..5fd6f0afb7 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl @@ -214,9 +214,7 @@ void main() vec3 lcol = color.rgb * plcol.rgb * plcol.a; - lit = da * dist_atten * noise; - - lit = pow(lit, 0.7); + lit = pow(da, 0.7) * dist_atten * noise; col = lcol*lit*diff_tex*shadow; amb_da += (da*0.5)*(1.0-shadow)*proj_ambiance; |