summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-03-07 09:40:11 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-03-07 09:40:11 +0000
commit3af97238f315b421bea057c02353b858d7e02f12 (patch)
tree8e5c57e51157a0c8a4445202b98a77a7cc8eb13f /indra/newview
parentc66e2b16fe0463f5b0df265e9d8c3471a3b590b1 (diff)
Remove the class2/class3 water shaders, which aren't materially different from class1 except for some minor const tweaks (I've migrated class3's tweaks into class1 on the assumption that this was what davep sees all the time)
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/waterF.glsl6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
index d21575119d..5cb8bbba0f 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
@@ -131,11 +131,11 @@ void main()
//color.rgb = scaleSoftClip(color.rgb);
//color.a = spec * sunAngle2;
- //wavef.z = -0.25f;
+ //wavef.z *= 0.1f;
wavef = normalize(wavef);
wavef = (norm_mat*vec4(wavef, 1.0)).xyz;
- gl_FragData[0] = vec4(color.rgb, 0.75);
- gl_FragData[1] = vec4(1,1,1, 0.8);
+ gl_FragData[0] = vec4(color.rgb, 0.5);
+ gl_FragData[1] = vec4(0.5,0.5,0.5, 0.95);
gl_FragData[2] = vec4(wavef*0.5+0.5, 0.0);
}