1 files changed, 84 insertions, 12 deletions

diff --git a/linden/indra/newview/app_settings/shaders/class1/environment/waterF.glsl b/linden/indra/newview/app_settings/shaders/class1/environment/waterF.glsl
index f8b8031..1c14381 100644
--- a/linden/indra/newview/app_settings/shaders/class1/environment/waterF.glsl
+++ b/linden/indra/newview/app_settings/shaders/class1/environment/waterF.glsl
@@ -1,22 +1,94 @@
-void water_lighting(inout vec3 diff);
+/** 
+ * @file waterF.glsl
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
+vec3 scaleSoftClip(vec3 inColor);
+vec3 atmosTransport(vec3 inColor);
 
-uniform samplerCube environmentMap;
 uniform sampler2D diffuseMap;
-uniform sampler2D bumpMap;
+uniform sampler2D bumpMap;   
+uniform sampler2D screenTex;
+uniform sampler2D refTex;
+
+uniform float sunAngle;
+uniform float sunAngle2;
+uniform float scaledAngle;
+uniform vec3 lightDir;
+uniform vec3 specular;
+uniform float lightExp;
+uniform float refScale;
+uniform float kd;
+uniform vec2 screenRes;
+uniform vec3 normScale;
+uniform float fresnelScale;
+uniform float fresnelOffset;
+uniform float blurMultiplier;
+uniform vec4 fogCol;
 
-varying vec4 specular;
+//bigWave is (refCoord.w, view.w);
+varying vec4 refCoord;
+varying vec4 littleWave;
+varying vec4 view;
 
 void main() 
 {
-        vec4 depth = texture2D(diffuseMap, gl_TexCoord[0].xy);
-        vec4 diff = texture2D(bumpMap, gl_TexCoord[1].xy);
-        vec3 ref = textureCube(environmentMap, gl_TexCoord[2].xyz).rgb;
+        vec3 viewVec = view.xyz;
+        vec4 color;
+        
+        float dist = length(viewVec.xy);
+        
+        //normalize view vector
+        viewVec = normalize(viewVec);
+        
+        //get wave normals
+        vec3 wavef = texture2D(bumpMap, vec2(refCoord.w, view.w)).xyz*2.0;
+
+        //get detail normals
+        vec3 dcol = texture2D(bumpMap, littleWave.xy).rgb*0.75;
+        dcol += texture2D(bumpMap, littleWave.zw).rgb*1.25;
+
+        //interpolate between big waves and little waves (big waves in deep water)
+        wavef = (wavef + dcol) * 0.5;
+        
+        //crunch normal to range [-1,1]
+        wavef -= vec3(1,1,1);
+        wavef = normalize(wavef);
+   
+        //get base fresnel components   
         
-        diff.rgb *= depth.rgb;
+        float df = dot(viewVec,wavef) * fresnelScale + fresnelOffset;
+                    
+        vec2 distort = (refCoord.xy/refCoord.z) * 0.5 + 0.5;
+        
+        float dist2 = dist;
+        dist = max(dist, 5.0);
+        
+        //get reflected color
+        vec2 refdistort = wavef.xy*dot(normScale, vec3(0.333));
+        vec2 refvec = distort+refdistort/dist;
+        vec4 refcol = texture2D(refTex, refvec);
+
+        //get specular component
+        float spec = clamp(dot(lightDir, (reflect(viewVec,wavef))),0.0,1.0);
+        
+        //harden specular
+        spec = pow(spec, lightExp);
+
+        //figure out distortion vector (ripply)   
+        vec2 distort2 = distort+wavef.xy*refScale/max(dist*df, 1.0);
                 
-        vec3 col = mix(diff.rgb, ref, specular.a)+specular.rgb*diff.rgb;
+        vec4 fb = texture2D(screenTex, distort2);
+        
+        //mix with reflection
+        color.rgb = mix(mix(fogCol.rgb, fb.rgb, fogCol.a), refcol.rgb, df);
+        color.rgb += spec * specular;
         
-        water_lighting(col.rgb); 
-        gl_FragColor.rgb = col.rgb;
-        gl_FragColor.a = (gl_Color.a+depth.a)*0.5;      
+        color.rgb = atmosTransport(color.rgb);
+        color.rgb = scaleSoftClip(color.rgb);
+        color.a = spec * sunAngle2;
+
+        gl_FragColor = color;
 }