summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class1/environment
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-07-08 10:48:34 -0700
committerGraham Linden <graham@lindenlab.com>2019-07-08 10:48:34 -0700
commitc1b6d91c32ae4ab0bd9a19d92dc95110d937d940 (patch)
treee21535c4fa24d3ea0f1ccb485b378e4f4613eb3c /indra/newview/app_settings/shaders/class1/environment
parent1d86dcd846ed5ea7734df507d15adf057cb2ebd0 (diff)
SL-11540
Make class1/environment and class1/deferred water match.
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/environment')
-rw-r--r--indra/newview/app_settings/shaders/class1/environment/waterF.glsl4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/app_settings/shaders/class1/environment/waterF.glsl b/indra/newview/app_settings/shaders/class1/environment/waterF.glsl
index 05fd4461c1..750de7100f 100644
--- a/indra/newview/app_settings/shaders/class1/environment/waterF.glsl
+++ b/indra/newview/app_settings/shaders/class1/environment/waterF.glsl
@@ -121,6 +121,7 @@ void main()
vec4 refcol = refcol1 + refcol2 + refcol3;
float df1 = df.x + df.y + df.z;
+ df1 *= 0.666666f;
refcol *= df1;
vec3 wavef = (wave1 + wave2 * 0.4 + wave3 * 0.6) * 0.5;
@@ -155,6 +156,9 @@ void main()
color.a = spec * sunAngle2;
+ //color.rgb = atmosTransport(color.rgb);
+ color.rgb = scaleSoftClip(color.rgb);
+
#if defined(WATER_EDGE)
gl_FragDepth = 0.9999847f;
#endif