summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class2/deferred
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2013-07-23 14:28:52 -0700
committerGraham Linden <graham@lindenlab.com>2013-07-23 14:28:52 -0700
commit96869baaefae1f322bff5114429e7fa73b6d4bf9 (patch)
treebfd3684903e12a2dc6f1c7613a1bf73378c91fcc /indra/newview/app_settings/shaders/class2/deferred
parentb411179bd0cffdf02b3109b72c7b79e4f7a5a2e3 (diff)
NORSPEC-285 NORSPEC-298 alpha vs diff color differences
Diffstat (limited to 'indra/newview/app_settings/shaders/class2/deferred')
-rwxr-xr-xindra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl8
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
index 0c71b4f554..233985631b 100755
--- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
@@ -385,8 +385,8 @@ void main()
float da = max(dot(norm.xyz, sun_dir.xyz), 0.0);
- float light_gamma = 1.0/1.3;
- da = pow(da, light_gamma);
+ //float light_gamma = 1.0/1.3;
+ //da = pow(da, light_gamma);
vec4 diffuse = texture2DRect(diffuseRect, tc);
@@ -400,12 +400,10 @@ void main()
vec4 spec = texture2DRect(specularRect, vary_fragcoord.xy);
vec2 scol_ambocc = texture2DRect(lightMap, vary_fragcoord.xy).rg;
- scol_ambocc = pow(scol_ambocc, vec2(light_gamma));
+ //scol_ambocc = pow(scol_ambocc, vec2(light_gamma));
float scol = max(scol_ambocc.r, diffuse.a);
-
-
float ambocc = scol_ambocc.g;
calcAtmospherics(pos.xyz, ambocc);