java-game-lib-cvs Mailing List for Lightweight Java Game Library

Update of /cvsroot/java-game-lib/LWJGL
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23844

Modified Files:
	build.xml 
Log Message:
added missing shaders to lwjgl_test.jar
added changelog target

Index: build.xml
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/build.xml,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- build.xml	29 May 2005 21:53:48 -0000	1.81
+++ build.xml	5 Jun 2005 12:12:34 -0000	1.82
@@ -36,6 +36,18 @@
 		<include name="org/lwjgl/test/**" />
 		<include name="org/lwjgl/examples/**" />
 	</fileset>
+  
+  <!-- More files to include in the lwjgl_test.jar file -->
+	<fileset id="lwjgl_test_extra.fileset" dir="${lwjgl.src}/java">
+		<exclude name="**.*" />
+		<include name="org/lwjgl/test/opengl/shaders/shaderFP.fp" />
+    <include name="org/lwjgl/test/opengl/shaders/shaderFP.vp" />
+    <include name="org/lwjgl/test/opengl/shaders/shaderFSH.fsh" />
+    <include name="org/lwjgl/test/opengl/shaders/shaderFSH.vsh" />
+    <include name="org/lwjgl/test/opengl/shaders/shaderVP.vp" />
+    <include name="org/lwjgl/test/opengl/shaders/shaderVSH.vsh" />
+	</fileset>
+  
 
 	<!-- Files to include in the lwjgl_util.jar file -->
 	<fileset id="lwjgl_util.fileset" dir="${lwjgl.bin}">
@@ -228,6 +240,7 @@
 		<!-- Create lwjgl_test.jar -->
 		<jar destfile="${lwjgl.temp}/jar/lwjgl_test.jar" taskname="lwjgl_test.jar">
 			<fileset refid="lwjgl_test.fileset" />
+      <fileset refid="lwjgl_test_extra.fileset" />
 		</jar>
 
 		<!-- Create lwjgl_util.jar -->
@@ -717,4 +730,13 @@
 		<signjar jar="${lwjgl.temp}/jnlp/native_macosx.jar" alias="matzon" storepass="${store.pwd}"/>
 		<signjar jar="${lwjgl.temp}/jnlp/native_win32.jar" 	alias="matzon" storepass="${store.pwd}"/>
 	</target>
+	
+	<target name="changelog">
+		<cvschangelog destfile="changelog.xml"/>
+		<style in="changelog.xml" out="changelog.html" style="${ant.home}/etc/changelog.xsl">
+			<param name="title" expression="LWJGL ChangeLog"/>
+			<param name="module" expression="LWJGL"/>
+			<param name="cvsweb" expression="http://cvs.sourceforge.net/viewcvs.py/java-game-lib/"/>
+		</style>         
+	</target> 	
 </project>

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

Modified Files:
	ShadersTest.java 
Log Message:
set displaymode when it isn't null!

Index: ShadersTest.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/test/opengl/shaders/ShadersTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ShadersTest.java	22 May 2005 12:12:10 -0000	1.10
+++ ShadersTest.java	5 Jun 2005 11:50:32 -0000	1.11
@@ -139,12 +139,11 @@
 			System.out.println("Setting display mode to: " + displayMode);
 			Display.setDisplayMode(displayMode);
 			Display.create(new PixelFormat(8, 24, 0));
+			ShadersTest.displayMode = displayMode;
 		} catch (LWJGLException e) {
 			kill(e.getMessage());
 		}
 
-		ShadersTest.displayMode = displayMode;
-
 		if ( "NONE".equalsIgnoreCase(args[0]) ) {
 			shader = null;
 		} else if ( "VP".equalsIgnoreCase(args[0]) ) {