Second Life viewer sources 1.19.1.0

15 files changed, 160 insertions, 97 deletions

diff --git a/linden/indra/newview/app_settings/shaders/class1/objects/alphaF.glsl b/linden/indra/newview/app_settings/shaders/class1/objects/alphaF.glsl
deleted file mode 100644
index 0d98f36..0000000
--- a/linden/indra/newview/app_settings/shaders/class1/objects/alphaF.glsl
+++ /dev/null
@@ -1,6 +0,0 @@
-void alpha_lighting();
-
-void main() 
-{
-        alpha_lighting();
-}
diff --git a/linden/indra/newview/app_settings/shaders/class1/objects/alphaV.glsl b/linden/indra/newview/app_settings/shaders/class1/objects/alphaV.glsl
deleted file mode 100644
index 91821f7..0000000
--- a/linden/indra/newview/app_settings/shaders/class1/objects/alphaV.glsl
+++ /dev/null
@@ -1,21 +0,0 @@
-vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);
-void default_scatter(vec3 viewVec, vec3 lightDir);
-
-attribute vec4 materialColor;
-
-void main()
-{
-        //transform vertex
-        gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-        gl_TexCoord[0] = gl_MultiTexCoord0;
-        
-        vec3 pos = (gl_ModelViewMatrix * gl_Vertex).xyz;
-        vec3 norm = normalize(gl_NormalMatrix * gl_Normal);
-        
-        default_scatter(pos, gl_LightSource[0].position.xyz);
-
-        vec4 color = calcLighting(pos, norm, materialColor, gl_Color);
-        color.a = materialColor.a;
-                
-        gl_FrontColor = color;
-}
diff --git a/linden/indra/newview/app_settings/shaders/class1/objects/bumpshinyF.glsl b/linden/indra/newview/app_settings/shaders/class1/objects/bumpshinyF.glsl
deleted file mode 100644
index 8509c62..0000000
--- a/linden/indra/newview/app_settings/shaders/class1/objects/bumpshinyF.glsl
+++ /dev/null
@@ -1,18 +0,0 @@
-vec4 getLightColor();
-void applyScatter(inout vec3 col);
-
-uniform samplerCube environmentMap;
-uniform sampler2D diffuseMap;
-
-void main() 
-{
-        vec4 diff = texture2D(diffuseMap, gl_TexCoord[0].xy);
-        vec3 ref = textureCube(environmentMap, gl_TexCoord[1].xyz).rgb;
-        vec4 specular = gl_TexCoord[2];
-        vec3 col = mix(getLightColor().rgb * diff.rgb, ref, specular.a)+specular.rgb*diff.rgb;
-                        
-        applyScatter(col);
-                
-        gl_FragColor.rgb = col;
-        gl_FragColor.a = diff.a*gl_Color.a;
-}
diff --git a/linden/indra/newview/app_settings/shaders/class1/objects/bumpshinyV.glsl b/linden/indra/newview/app_settings/shaders/class1/objects/bumpshinyV.glsl
deleted file mode 100644
index 9a189a2..0000000
--- a/linden/indra/newview/app_settings/shaders/class1/objects/bumpshinyV.glsl
+++ /dev/null
@@ -1,25 +0,0 @@
-vec4 calcLightingSpecular(vec3 pos, vec3 norm, vec4 color, inout vec4 specularColor, vec4 baseCol);
-void default_scatter(vec3 viewVec, vec3 lightDir);
-
-attribute vec4 materialColor;
-attribute vec4 specularColor;
-
-void main()
-{
-        //transform vertex
-        gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
-        gl_TexCoord[0] = gl_MultiTexCoord0;
-        
-        vec3 pos = (gl_ModelViewMatrix * gl_Vertex).xyz;
-        vec3 norm = normalize(gl_NormalMatrix * gl_Normal);
-        
-        vec4 spec = specularColor;
-        gl_FrontColor.rgb = calcLightingSpecular(pos, norm, materialColor, spec, gl_Color).rgb; 
-        gl_FrontColor.a = materialColor.a;
-        gl_TexCoord[2] = spec;
-        vec3 ref = reflect(pos,norm);
-        gl_TexCoord[1] = gl_TextureMatrix[1]*vec4(ref,1.0);
-        
-        default_scatter(pos.xyz, gl_LightSource[0].position.xyz);
-}
-
diff --git a/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightF.glsl b/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightF.glsl
new file mode 100755
index 0000000..1b0ffb9
--- /dev/null
+++ b/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightF.glsl
@@ -0,0 +1,13 @@
+/** 
+ * @file fullbrightF.glsl
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
+void fullbright_lighting();
+
+void main() 
+{
+        fullbright_lighting();
+}
diff --git a/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightShinyF.glsl b/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightShinyF.glsl
new file mode 100644
index 0000000..936c228
--- /dev/null
+++ b/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightShinyF.glsl
@@ -0,0 +1,13 @@
+/** 
+ * @file fullbrightShinyF.glsl
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
+void fullbright_shiny_lighting();
+
+void main() 
+{
+        fullbright_shiny_lighting();
+}
diff --git a/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightShinyV.glsl b/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightShinyV.glsl
new file mode 100755
index 0000000..ba2aa02
--- /dev/null
+++ b/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightShinyV.glsl
@@ -0,0 +1,29 @@
+/**
+ * @file fullbrightShinyV.glsl
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
+void calcAtmospherics(vec3 inPositionEye);
+
+uniform vec4 origin;
+
+void main()
+{
+        //transform vertex
+        gl_Position = ftransform();
+        
+        vec4 pos = (gl_ModelViewMatrix * gl_Vertex);
+        vec3 norm = normalize(gl_NormalMatrix * gl_Normal);
+        vec3 ref = reflect(pos.xyz, -norm);
+
+        gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
+        gl_TexCoord[1] = gl_TextureMatrix[1]*vec4(ref,1.0);
+
+        calcAtmospherics(pos.xyz);
+
+        gl_FrontColor = gl_Color;
+
+        gl_FogFragCoord = pos.z;
+}
diff --git a/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightV.glsl b/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightV.glsl
new file mode 100755
index 0000000..e64ccb8
--- /dev/null
+++ b/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightV.glsl
@@ -0,0 +1,23 @@
+/**
+ * @file fullbrightV.glsl
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
+void calcAtmospherics(vec3 inPositionEye);
+
+void main()
+{
+        //transform vertex
+        gl_Position = ftransform();
+        gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
+        
+        vec4 pos = (gl_ModelViewMatrix * gl_Vertex);
+
+        calcAtmospherics(pos.xyz);
+
+        gl_FrontColor = gl_Color;
+
+        gl_FogFragCoord = pos.z;
+}
diff --git a/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightWaterF.glsl b/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightWaterF.glsl
new file mode 100755
index 0000000..fd855aa
--- /dev/null
+++ b/linden/indra/newview/app_settings/shaders/class1/objects/fullbrightWaterF.glsl
@@ -0,0 +1,13 @@
+/** 
+ * @file fullbrightWaterF.glsl
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
+void fullbright_lighting_water();
+
+void main() 
+{
+        fullbright_lighting_water();
+}
diff --git a/linden/indra/newview/app_settings/shaders/class1/objects/shinyF.glsl b/linden/indra/newview/app_settings/shaders/class1/objects/shinyF.glsl
index 6942132..bdb0b05 100644
--- a/linden/indra/newview/app_settings/shaders/class1/objects/shinyF.glsl
+++ b/linden/indra/newview/app_settings/shaders/class1/objects/shinyF.glsl
@@ -1,13 +1,13 @@
-void applyScatter(inout vec3 col);
+/** 
+ * @file shinyF.glsl
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
 
-uniform samplerCube environmentMap;
+void shiny_lighting();
 
 void main() 
 {
-        vec3 ref = textureCube(environmentMap, gl_TexCoord[0].xyz).rgb;
-                        
-        applyScatter(ref);
-                
-        gl_FragColor.rgb = ref;
-        gl_FragColor.a = gl_Color.a;
+        shiny_lighting();
 }
diff --git a/linden/indra/newview/app_settings/shaders/class1/objects/shinyV.glsl b/linden/indra/newview/app_settings/shaders/class1/objects/shinyV.glsl
index 16fba01..c2e1ddf 100644
--- a/linden/indra/newview/app_settings/shaders/class1/objects/shinyV.glsl
+++ b/linden/indra/newview/app_settings/shaders/class1/objects/shinyV.glsl
@@ -1,27 +1,30 @@
-void default_scatter(vec3 viewVec, vec3 lightDir);
+/** 
+ * @file shinyV.glsl
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
+void calcAtmospherics(vec3 inPositionEye);
 
 uniform vec4 origin;
 
 void main()
 {
         //transform vertex
-        gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+        gl_Position = ftransform(); //gl_ModelViewProjectionMatrix * gl_Vertex;
         
-        vec3 pos = (gl_ModelViewMatrix * gl_Vertex).xyz;
+        vec4 pos = (gl_ModelViewMatrix * gl_Vertex);
         vec3 norm = normalize(gl_NormalMatrix * gl_Normal);
+
+        calcAtmospherics(pos.xyz);
         
         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;
+        vec3 ref = reflect(pos.xyz, -norm);
         
         gl_TexCoord[0] = gl_TextureMatrix[0]*vec4(ref,1.0);
         
-        default_scatter(pos.xyz, gl_LightSource[0].position.xyz);
+        gl_FogFragCoord = pos.z;
 }
 
diff --git a/linden/indra/newview/app_settings/shaders/class1/objects/shinyWaterF.glsl b/linden/indra/newview/app_settings/shaders/class1/objects/shinyWaterF.glsl
new file mode 100755
index 0000000..0a2a5f6
--- /dev/null
+++ b/linden/indra/newview/app_settings/shaders/class1/objects/shinyWaterF.glsl
@@ -0,0 +1,13 @@
+/** 
+ * @file shinyWaterF.glsl
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
+void shiny_lighting_water();
+
+void main() 
+{
+        shiny_lighting_water();
+}
diff --git a/linden/indra/newview/app_settings/shaders/class1/objects/simpleF.glsl b/linden/indra/newview/app_settings/shaders/class1/objects/simpleF.glsl
index ce5ab12..7dacca4 100644
--- a/linden/indra/newview/app_settings/shaders/class1/objects/simpleF.glsl
+++ b/linden/indra/newview/app_settings/shaders/class1/objects/simpleF.glsl
@@ -1,3 +1,10 @@
+/** 
+ * @file simpleF.glsl
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
 void default_lighting();
 
 void main() 
diff --git a/linden/indra/newview/app_settings/shaders/class1/objects/simpleV.glsl b/linden/indra/newview/app_settings/shaders/class1/objects/simpleV.glsl
index 2aa3521..0df89c8 100644
--- a/linden/indra/newview/app_settings/shaders/class1/objects/simpleV.glsl
+++ b/linden/indra/newview/app_settings/shaders/class1/objects/simpleV.glsl
@@ -1,20 +1,26 @@
-vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);
-void default_scatter(vec3 viewVec, vec3 lightDir);
+/** 
+ * @file simpleV.glsl
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
 
-attribute vec4 materialColor;
+vec4 calcLighting(vec3 pos, vec3 norm, vec4 color, vec4 baseCol);
+void calcAtmospherics(vec3 inPositionEye);
 
 void main()
 {
         //transform vertex
-        gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+        gl_Position = ftransform(); //gl_ModelViewProjectionMatrix * gl_Vertex;
         gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
         
-        vec3 pos = (gl_ModelViewMatrix * gl_Vertex).xyz;
-        vec3 norm = normalize(gl_NormalMatrix * gl_Normal);
+        vec4 pos = (gl_ModelViewMatrix * gl_Vertex);
         
-        default_scatter(pos, gl_LightSource[0].position.xyz);
+        vec3 norm = normalize(gl_NormalMatrix * gl_Normal);
+
+        calcAtmospherics(pos.xyz);
 
-        vec4 color = calcLighting(pos, norm, materialColor, gl_Color);
+        vec4 color = calcLighting(pos.xyz, norm, gl_Color, vec4(0.));
         gl_FrontColor = color;
 
         gl_FogFragCoord = pos.z;
diff --git a/linden/indra/newview/app_settings/shaders/class1/objects/simpleWaterF.glsl b/linden/indra/newview/app_settings/shaders/class1/objects/simpleWaterF.glsl
new file mode 100755
index 0000000..e066b3d
--- /dev/null
+++ b/linden/indra/newview/app_settings/shaders/class1/objects/simpleWaterF.glsl
@@ -0,0 +1,13 @@
+/** 
+ * @file simpleWaterF.glsl
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
+void default_lighting_water();
+
+void main() 
+{
+        default_lighting_water();
+}