[Java-game-lib-cvs] LWJGL/src/java/org/lwjgl/test/opengl/shaders shaderFSH.fsh,1.1,1.2 shaderFSH.vsh

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/shaders
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26517

Modified Files:
	shaderFSH.fsh shaderFSH.vsh ShadersTest.java shaderVSH.vsh 
Log Message:
Fixed bugs

Index: ShadersTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShadersTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ShadersTest.java	30 Mar 2004 23:25:17 -0000	1.1
+++ ShadersTest.java	31 Mar 2004 17:43:46 -0000	1.2
@@ -206,8 +206,10 @@
 		// Setup lighting for when we have fixed function fragment rendering.
 		GL11.glShadeModel(GL11.GL_SMOOTH);
 
-		GL11.glEnable(GL11.GL_LIGHTING);
-		GL11.glEnable(GL11.GL_LIGHT0);
+		if (shader == null ) {
+			GL11.glEnable(GL11.GL_LIGHTING);
+			GL11.glEnable(GL11.GL_LIGHT0);
+		}
 
 		vectorBuffer.clear();
 		vectorBuffer.put(1.0f).put(1.0f).put(1.0f).put(1.0f);

Index: shaderFSH.fsh
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/shaders/shaderFSH.fsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- shaderFSH.fsh	30 Mar 2004 23:25:17 -0000	1.1
+++ shaderFSH.fsh	31 Mar 2004 17:43:46 -0000	1.2
@@ -5,7 +5,7 @@
 void main(void) {
 	// Offset window-space fragment position.
 	vec3 color2D = vec3(gl_FragCoord + UNIFORMS.zwxx);
-	
+
 	// Normalize position.
 	// Multiply with current sin.
 	color2D.xy = normalize(color2D) * UNIFORMS.x;

Index: shaderFSH.vsh
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/shaders/shaderFSH.vsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- shaderFSH.vsh	30 Mar 2004 23:25:17 -0000	1.1
+++ shaderFSH.vsh	31 Mar 2004 17:43:46 -0000	1.2
@@ -1,3 +1,5 @@
+uniform vec4 UNIFORMS;
+
 varying vec2 dots;
 
 void main(void) {
@@ -6,6 +8,6 @@
 	vec3 normal = gl_NormalMatrix * gl_Normal;
 	
 	// Pass the dot products to the fragment shader.
-	dots.x = max(dot(normal, gl_LightSource[0].position), 0.0);
-	dots.y = max(dot(normal, gl_LightSource[0].halfVector), 0.0);
+	dots.x = max(dot(normal, vec3(gl_LightSource[0].position)), 0.0);
+	dots.y = max(dot(normal, vec3(gl_LightSource[0].halfVector)), 0.0);
 }
\ No newline at end of file

Index: shaderVSH.vsh
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/shaders/shaderVSH.vsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- shaderVSH.vsh	30 Mar 2004 23:25:17 -0000	1.1
+++ shaderVSH.vsh	31 Mar 2004 17:43:46 -0000	1.2
@@ -5,8 +5,8 @@
 	
 	vec3 normal = gl_NormalMatrix * gl_Normal;
 	
-	float diffuseDot = max(dot(normal, gl_LightSource[0].position), 0.0);
-	float specularDot = max(dot(normal, gl_LightSource[0].halfVector), 0.0);
+	float diffuseDot = max(dot(normal, vec3(gl_LightSource[0].position)), 0.0);
+	float specularDot = max(dot(normal, vec3(gl_LightSource[0].halfVector)), 0.0);
 	specularDot = pow(specularDot, UNIFORMS.y);
 	
 	// Normalize position, to get a {-1..1} value for each vertex.
@@ -16,7 +16,7 @@
 	color3D = (color3D * 0.5 + 0.5) * 2.0;
 	
 	// Accumulate color contributions.
-	color3D = diffuseDot * color3D + gl_LightModel.ambient;
-	gl_FrontColor.rgb = specularDot * gl_LightSource[0].specular + color3D;
+	color3D = diffuseDot * color3D + vec3(gl_LightModel.ambient);
+	gl_FrontColor.rgb = specularDot * vec3(gl_LightSource[0].specular) + color3D;
 	gl_FrontColor.a = 1.0;
 }
\ No newline at end of file