Second Life viewer sources 1.14.0.0

10 files changed, 188 insertions, 67 deletions

diff --git a/linden/indra/newview/app_settings/shaders/class1/lighting/lightF.glsl b/linden/indra/newview/app_settings/shaders/class1/lighting/lightF.glsl
index b2a6d67..c169fce 100644
--- a/linden/indra/newview/app_settings/shaders/class1/lighting/lightF.glsl
+++ b/linden/indra/newview/app_settings/shaders/class1/lighting/lightF.glsl
@@ -5,7 +5,7 @@ uniform sampler2D diffuseMap;
 void default_lighting() 
 {
         vec4 color = gl_Color * texture2D(diffuseMap, gl_TexCoord[0].xy);
-        applyScatter(color.rgb);
+        //applyScatter(color.rgb);
         gl_FragColor = color;
 }
 
diff --git a/linden/indra/newview/app_settings/shaders/class1/objects/shinyF.glsl b/linden/indra/newview/app_settings/shaders/class1/objects/shinyF.glsl
new file mode 100644
index 0000000..12c99a6
--- /dev/null
+++ b/linden/indra/newview/app_settings/shaders/class1/objects/shinyF.glsl
@@ -0,0 +1,13 @@
+void applyScatter(inout vec3 col);

+

+uniform samplerCube environmentMap;

+

+void main() 

+{

+        vec3 ref = textureCube(environmentMap, gl_TexCoord[0].xyz).rgb;

+                        

+        applyScatter(ref);

+                

+        gl_FragColor.rgb = ref;

+        gl_FragColor.a = gl_Color.a;

+}

diff --git a/linden/indra/newview/app_settings/shaders/class1/objects/shinyV.glsl b/linden/indra/newview/app_settings/shaders/class1/objects/shinyV.glsl
new file mode 100644
index 0000000..621ff6b
--- /dev/null
+++ b/linden/indra/newview/app_settings/shaders/class1/objects/shinyV.glsl
@@ -0,0 +1,27 @@
+void default_scatter(vec3 viewVec, vec3 lightDir);

+

+uniform vec4 origin;

+

+void main()

+{

+        //transform vertex

+        gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;

+        

+        vec3 pos = (gl_ModelViewMatrix * gl_Vertex).xyz;

+        vec3 norm = normalize(gl_NormalMatrix * gl_Normal);

+        

+        gl_FrontColor = gl_Color;

+        

+        vec3 ref = reflect(pos, norm);

+        

+        vec3 d = pos - origin.xyz;

+        float dist = dot(normalize(d), ref);

+        vec3 e = d + (ref * max(origin.w-dist, 0.0));

+        

+        ref = e - origin.xyz;

+        

+        gl_TexCoord[0] = gl_TextureMatrix[0]*vec4(ref,1.0);

+        

+        default_scatter(pos.xyz, gl_LightSource[0].position.xyz);

+}

+

diff --git a/linden/indra/newview/app_settings/shaders/class2/environment/waterV.glsl b/linden/indra/newview/app_settings/shaders/class2/environment/waterV.glsl
index 5f06aeb..25309fa 100644
--- a/linden/indra/newview/app_settings/shaders/class2/environment/waterV.glsl
+++ b/linden/indra/newview/app_settings/shaders/class2/environment/waterV.glsl
@@ -47,7 +47,7 @@ void main()
    gl_TexCoord[0].zw = littleWave1;
    gl_TexCoord[1].xy = littleWave2;
    gl_TexCoord[1].zw = bigWave;
-   gl_TexCoord[2] = oEyeVec;
+   gl_TexCoord[2].xyz = oEyeVec.xyz;
    gl_TexCoord[3].xyz = oRefCoord;
    gl_FrontColor = col;
 }
diff --git a/linden/indra/newview/app_settings/shaders/class2/lighting/lightF.glsl b/linden/indra/newview/app_settings/shaders/class2/lighting/lightF.glsl
index 0ef1129..6f732ed 100644
--- a/linden/indra/newview/app_settings/shaders/class2/lighting/lightF.glsl
+++ b/linden/indra/newview/app_settings/shaders/class2/lighting/lightF.glsl
@@ -5,7 +5,7 @@ uniform sampler2D diffuseMap;
 void default_lighting() 
 {
         vec4 color = gl_Color * texture2D(diffuseMap, gl_TexCoord[0].xy);
-        applyScatter(color.rgb);
+        //applyScatter(color.rgb);
         gl_FragColor = color;
 }
 
diff --git a/linden/indra/newview/app_settings/shaders/class3/environment/groundF.glsl b/linden/indra/newview/app_settings/shaders/class3/environment/groundF.glsl
deleted file mode 100644
index 8618dad..0000000
--- a/linden/indra/newview/app_settings/shaders/class3/environment/groundF.glsl
+++ /dev/null
@@ -1,12 +0,0 @@
-vec4 getScatter(vec3 viewVec, vec3 lightDir);
-
-varying vec3 lightd;
-varying vec3 viewVec;
-
-void main() 
-{
-   vec4 color = gl_Color;
-   vec4 haze = getScatter(viewVec, lightd) * vec4(gl_Fog.color.rgb, 1.0);
-   color.rgb = haze.rgb + haze.a * color.rgb;
-   gl_FragColor = color;
-}
diff --git a/linden/indra/newview/app_settings/shaders/class3/environment/groundV.glsl b/linden/indra/newview/app_settings/shaders/class3/environment/groundV.glsl
deleted file mode 100644
index a6f5270..0000000
--- a/linden/indra/newview/app_settings/shaders/class3/environment/groundV.glsl
+++ /dev/null
@@ -1,11 +0,0 @@
-varying vec3 lightd;
-varying vec3 viewVec;
-
-void main()
-{
-        gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-        lightd = gl_LightSource[0].position.xyz;
-        viewVec = (gl_ModelViewMatrix * gl_Vertex).xyz;
-        
-        gl_FrontColor = gl_Color;
-}
diff --git a/linden/indra/newview/app_settings/shaders/class3/environment/scatterF.glsl b/linden/indra/newview/app_settings/shaders/class3/environment/scatterF.glsl
deleted file mode 100644
index 7a9245f..0000000
--- a/linden/indra/newview/app_settings/shaders/class3/environment/scatterF.glsl
+++ /dev/null
@@ -1,25 +0,0 @@
-uniform sampler2D scatterMap;
-
-//for per-pixel scatter
-vec4 getScatter(vec3 viewVec, vec3 lightDir)
-{
-   vec2 scatterCoord;
-   scatterCoord.x = length(viewVec);
-   vec3 normVec = viewVec / scatterCoord.x;
-   scatterCoord.y = dot(normVec, lightDir)*0.5 + 0.5;   
-   scatterCoord.x = scatterCoord.x / gl_Fog.end;
-   scatterCoord.x *= scatterCoord.x; // HACK!! Remove this when we can push the view distance farther out
-   return texture2D(scatterMap, scatterCoord) * vec4(gl_Fog.color.rgb, 1.0);
-}
-
-void applyScatter(inout vec3 color, vec4 haze)
-{
-        color.rgb = haze.rgb + haze.a * color.rgb;   
-}
-
-//for per-vertex scatter
-void applyScatter(inout vec3 color)
-{
-        vec4 haze = texture2D(scatterMap, gl_TexCoord[5].xy) * vec4(gl_Fog.color.rgb, 1.0);
-        color.rgb = haze.rgb + haze.a * color.rgb;
-}
diff --git a/linden/indra/newview/app_settings/shaders/class3/environment/scatterV.glsl b/linden/indra/newview/app_settings/shaders/class3/environment/scatterV.glsl
deleted file mode 100644
index c9ebd9e..0000000
--- a/linden/indra/newview/app_settings/shaders/class3/environment/scatterV.glsl
+++ /dev/null
@@ -1,16 +0,0 @@
-
-vec2 getScatterCoord(vec3 viewVec, vec3 lightDir)
-{
-   vec2 scatterCoord;
-   scatterCoord.x = length(viewVec);
-   vec3 normVec = normalize(viewVec);
-   scatterCoord.y = dot(normVec, lightDir)*0.5 + 0.5;   
-   scatterCoord.x = scatterCoord.x / gl_Fog.end;
-   scatterCoord.x *= scatterCoord.x; // HACK!! Remove this when we can push the view distance farther out
-   return scatterCoord;
-}
-
-void default_scatter(vec3 viewVec, vec3 lightDir)
-{
-        gl_TexCoord[5].xy = getScatterCoord(viewVec, lightDir);
-}
diff --git a/linden/indra/newview/app_settings/shaders/class3/environment/waterF.glsl b/linden/indra/newview/app_settings/shaders/class3/environment/waterF.glsl
new file mode 100644
index 0000000..3a117c5
--- /dev/null
+++ b/linden/indra/newview/app_settings/shaders/class3/environment/waterF.glsl
@@ -0,0 +1,145 @@
+void applyScatter(inout vec3 color);

+

+uniform sampler2D diffuseMap;

+uniform sampler2D bumpMap;   

+uniform samplerCube environmentMap; //: TEXUNIT4,   // Environment map texture

+uniform sampler2D screenTex;   //   : TEXUNIT5

+

+uniform vec3 lightDir;

+uniform vec3 specular;

+uniform float lightExp;

+uniform vec2 fbScale;

+uniform float refScale;

+

+float msin(float x) {

+   float k = sin(x)+1.0;

+   k *= 0.5;

+   k *= k;

+   return 2.0 * k;

+}

+

+float mcos(float x) {

+   float k = cos(x)+1.0;

+   k *= 0.5;

+   k *= k;

+   return 2.0 * k;

+}

+

+float waveS(vec2 v, float t, float a, float f, vec2 d, float s, sampler1D sinMap) 

+{

+   return texture1D(sinMap, (dot(d, v)*f + t*s)*f).r*a;

+}

+

+float waveC(vec2 v, float t, float a, float f, vec2 d, float s, sampler1D sinMap) 

+{

+   return texture1D(sinMap, (dot(d, v)*f + t*s)*f).g*a*2.0-1.0;

+}

+

+float magnitude(vec3 vec) {

+   return sqrt(dot(vec,vec));

+}

+

+vec3 mreflect(vec3 i, vec3 n) {

+   return i + n * 2.0 * abs(dot(n,i))+vec3(0.0,0.0,0.5);

+}

+

+void main() 

+{

+   vec2 texCoord = gl_TexCoord[0].xy;   // Texture coordinates

+   vec2 littleWave1 = gl_TexCoord[0].zw;

+   vec2 littleWave2 = gl_TexCoord[1].xy;

+   vec2 bigWave = gl_TexCoord[1].zw;

+   vec3 viewVec = gl_TexCoord[2].xyz;

+   vec4 refCoord = gl_TexCoord[3];

+   vec4 col = gl_Color;

+   vec4 color;

+   

+   //get color from alpha map (alpha denotes water depth), rgb denotes water color

+   vec4 wcol = texture2D(diffuseMap, texCoord.xy);

+      

+   float dist = length(viewVec);

+   

+   //store texture alpha

+   float da = wcol.a;

+         

+   //modulate by incoming water color

+   //wcol.a *= refCoord.w;

+   

+   //scale wcol.a (water depth) for steep transition

+   wcol.a *= wcol.a;

+   

+   //normalize view vector

+   viewVec = normalize(viewVec);

+   

+   //get bigwave normal

+   vec3 wavef = texture2D(bumpMap, bigWave).xyz*2.0;

+      

+   vec3 view = vec3(viewVec.x, viewVec.y, viewVec.z);

+   

+   float dx = 1.0-(dot(wavef*2.0-vec3(1.0), view))*da;

+   dx *= 0.274;

+      

+   //get detail normals

+   vec3 dcol = texture2D(bumpMap, littleWave1+dx*view.xy).rgb*0.75;

+   dcol += texture2D(bumpMap, littleWave2+view.xy*dx*0.1).rgb*1.25;

+      

+   //interpolate between big waves and little waves (big waves in deep water)

+   wavef = wavef*wcol.a + dcol*(1.0-wcol.a);

+   

+   //crunch normal to range [-1,1]

+   wavef -= vec3(1,1,1);

+   wavef = normalize(wavef);

+   //wavef = vec3(0.0, 0.0, 1.0);

+   

+   //get base fresnel component

+   float df = dot(viewVec,wavef);

+   //translate and flip fresnel

+   df = 1.0-clamp(-df,0.0,1.0);

+   

+   //set output alpha based on fresnel

+   color.a = clamp((1.0-df+da)*0.5,0.0,1.0);

+         

+   //calculate reflection vector

+   vec3 refnorm = vec3(wavef.x*0.5, wavef.y*0.5, wavef.z*2.0);

+   

+   //ramp normal towards eye for far view stuff

+   float ramp = dist/256.0;

+   refnorm -= viewVec * ramp;

+   vec3 ref = reflect(viewVec.xyz, normalize(refnorm));

+   ref.z /= sqrt(dist);

+   

+   //get diffuse component

+   float diff = clamp(dot(ref, wavef),0.0,1.0)*0.9;

+      

+   //fudge diffuse for extra contrast and ambience

+   diff *= diff;

+   diff += 0.4;

+      

+   vec3 fog = gl_TexCoord[5].rgb*0.5;

+   

+   //read from reflection map

+   vec3 refcol = textureCube(environmentMap, ref).rgb;

+   //tint reflection by fresnal, bias by z component of view vec

+   color.rgb = refcol*(df*df*dcol.x*dcol.y);

+   

+   //add diffuse contribution (fake blue water, yay!)

+   vec3 blue = vec3(0.1, 0.3, 0.6);

+   color.rgb += (diff/(max(ramp, 1.0)))*vec3(fog.r*blue.r, fog.g*blue.g, fog.b*blue.b);

+      

+   //figure out distortion vector (ripply)   

+   vec2 distort = clamp(((refCoord.xy/refCoord.z) * 0.5 + 0.5 + wavef.xy*refScale),0.0,0.99);

+   

+   //read from framebuffer (offset)

+   vec4 fb = texture2D(screenTex, distort*fbScale);

+   

+   //tint by framebuffer

+   color.rgb = da*color.rgb + (1.0-da)*fb.rgb;

+   

+   //render as solid (previous pixel color already present)

+   color.a = 1.0;

+   

+   //apply fog

+   applyScatter(color.rgb);

+   

+   gl_FragColor = color;

+}