4 files changed, 102 insertions, 0 deletions

diff --git a/linden/indra/newview/app_settings/shaders/class2/objects/alphaF.glsl b/linden/indra/newview/app_settings/shaders/class2/objects/alphaF.glsl
new file mode 100644
index 0000000..97feb55
--- /dev/null
+++ b/linden/indra/newview/app_settings/shaders/class2/objects/alphaF.glsl
@@ -0,0 +1,18 @@
+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.rgb;
+        gl_FragColor.a = diff.a*gl_Color.a;     
+}
diff --git a/linden/indra/newview/app_settings/shaders/class2/objects/alphaV.glsl b/linden/indra/newview/app_settings/shaders/class2/objects/alphaV.glsl
new file mode 100644
index 0000000..baf5323
--- /dev/null
+++ b/linden/indra/newview/app_settings/shaders/class2/objects/alphaV.glsl
@@ -0,0 +1,24 @@
+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);
+                
+        default_scatter(pos.xyz, gl_LightSource[0].position.xyz);
+}
+
diff --git a/linden/indra/newview/app_settings/shaders/class2/objects/bumpshinyF.glsl b/linden/indra/newview/app_settings/shaders/class2/objects/bumpshinyF.glsl
new file mode 100644
index 0000000..7462bb1
--- /dev/null
+++ b/linden/indra/newview/app_settings/shaders/class2/objects/bumpshinyF.glsl
@@ -0,0 +1,29 @@
+vec4 getLightColor();
+void applyScatter(inout vec3 col);
+
+uniform samplerCube environmentMap;
+uniform sampler2D diffuseMap;
+uniform sampler2D bumpMap;
+
+
+void main() 
+{
+        vec4 diff = texture2D(diffuseMap, gl_TexCoord[0].xy);
+        vec3 ref = textureCube(environmentMap, gl_TexCoord[1].xyz).rgb;
+        
+        vec4 specular = gl_TexCoord[3];
+                
+        float b = texture2D(bumpMap, gl_TexCoord[0].xy).a;
+        b -= texture2D(bumpMap, gl_TexCoord[2].xy).a;
+        
+        vec3 col = mix(getLightColor().rgb * diff.rgb, ref, specular.a)+specular.rgb*diff.rgb;
+        col += col * b;
+        float m = (col.r + col.g + col.b);
+        m *= 1.0/3.0;
+        col = mix(col, vec3(m), -specular.a*specular.a);
+        
+        applyScatter(col);
+                        
+        gl_FragColor.rgb = col;
+        gl_FragColor.a = diff.a;
+}
diff --git a/linden/indra/newview/app_settings/shaders/class2/objects/bumpshinyV.glsl b/linden/indra/newview/app_settings/shaders/class2/objects/bumpshinyV.glsl
new file mode 100644
index 0000000..037b282
--- /dev/null
+++ b/linden/indra/newview/app_settings/shaders/class2/objects/bumpshinyV.glsl
@@ -0,0 +1,31 @@
+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;
+attribute vec4 binormal;
+
+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);
+        vec3 binorm = normalize(gl_NormalMatrix * binormal.xyz);
+        vec3 tangent = cross(binorm, norm);
+        binorm.xy = vec2(dot(tangent, gl_LightSource[0].position.xyz),
+                                        dot(binorm, gl_LightSource[0].position.xyz))*1.0/128.0;
+        
+        vec4 spec = specularColor;
+        gl_FrontColor.rgb = calcLightingSpecular(pos, norm, materialColor, spec, gl_Color).rgb;                 
+        gl_TexCoord[3] = spec;
+        gl_FrontColor.a = materialColor.a;
+        vec3 ref = reflect(pos,norm);
+        gl_TexCoord[1].xyz = (gl_TextureMatrix[1]*vec4(ref,1.0)).xyz;
+        gl_TexCoord[2].xy = binorm.xy + gl_MultiTexCoord0.xy;
+        
+        default_scatter(pos.xyz, gl_LightSource[0].position.xyz);
+}
+