summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
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
commit665567e2f97f8ec4de2810fb63d6b845e67833e2 (patch)
treefe6d591a7dbc0c57c68f0322381e264ce3cf25ef /indra/newview/app_settings
parent809a280a51bc8645de7a02c2a3dbe32bc230b93c (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/app_settings')
-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);
}