java-game-lib-cvs Mailing List for Lightweight Java Game Library (Page 2)

Revision: 3312
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3312&view=rev
Author:   spasi
Date:     2010-04-07 11:59:33 +0000 (Wed, 07 Apr 2010)

Log Message:
-----------
More glGetActive changes.

Modified Paths:
--------------
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback.java

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java	2010-04-07 10:28:05 UTC (rev 3311)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_shader_objects.java	2010-04-07 11:59:33 UTC (rev 3312)
@@ -219,40 +219,39 @@
 	                           @OutParameter @GLenum @Check("1") IntBuffer type,
 	                           @OutParameter @GLcharARB ByteBuffer name);
 
+	/** Overloads glGetActiveUniformARB. This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
 	@Alternate("glGetActiveUniformARB")
 	@GLreturn(value = "name", maxLength = "maxLength")
 	void glGetActiveUniformARB2(@GLhandleARB int programObj, @GLuint int index, @GLsizei int maxLength,
 	                            @OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
-	                            @OutParameter @Check("1") IntBuffer size,
-	                            @OutParameter @GLenum @Check("1") IntBuffer type,
-	                            @OutParameter @GLcharARB ByteBuffer name);
-
-	/** This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
-	@Alternate("glGetActiveUniformARB")
-	@GLreturn(value = "name", maxLength = "maxLength")
-	void glGetActiveUniformARB3(@GLhandleARB int programObj, @GLuint int index, @GLsizei int maxLength,
-	                            @OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
 	                            @OutParameter @Check("2") IntBuffer sizeType,
 	                            @OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type,
 	                            @OutParameter @GLcharARB ByteBuffer name);
 
-	/** This version returns only the uniform size. */
+	/** Overloads glGetActiveUniformARB. This version returns only the uniform name. */
 	@Alternate(value = "glGetActiveUniformARB", javaAlt = true)
+	@GLreturn(value = "name", maxLength = "maxLength")
+	void glGetActiveUniformARB(@GLhandleARB int programObj, @GLuint int index, @GLsizei int maxLength,
+	                           @OutParameter @GLsizei @Constant("name_length, 0, APIUtils.getBufferInt(), 0, APIUtils.getBufferInt(), 1") IntBuffer length,
+	                           @OutParameter @GLcharARB ByteBuffer name);
+
+	/** Overloads glGetActiveUniformARB. This version returns only the uniform size. */
+	@Alternate(value = "glGetActiveUniformARB", javaAlt = true)
 	@GLreturn(value = "size")
 	void glGetActiveUniformSizeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength,
 	                               @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
 	                               @OutParameter IntBuffer size,
 	                               @OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore
-	                               @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+	                               @OutParameter @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
 
-	/** This version returns only the uniform type. */
+	/** Overloads glGetActiveUniformARB. This version returns only the uniform type. */
 	@Alternate(value = "glGetActiveUniformARB", javaAlt = true)
 	@GLreturn(value = "type")
 	void glGetActiveUniformTypeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength,
 	                               @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
 	                               @OutParameter @Constant("type, 1") IntBuffer size, // Reuse type buffer and ignore
 	                               @OutParameter @GLenum IntBuffer type,
-	                               @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+	                               @OutParameter @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
 
 	@StripPostfix("params")
 	void glGetUniformfvARB(@GLhandleARB int programObj, int location, @OutParameter @Check FloatBuffer params);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java	2010-04-07 10:28:05 UTC (rev 3311)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/ARB_vertex_shader.java	2010-04-07 11:59:33 UTC (rev 3312)
@@ -142,29 +142,39 @@
 	                          @OutParameter @GLenum @Check("1") IntBuffer type,
 	                          @OutParameter @GLcharARB ByteBuffer name);
 
+	/** Overloads glGetActiveAttribARB. This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
 	@Alternate("glGetActiveAttribARB")
 	@GLreturn(value = "name", maxLength = "maxLength")
 	void glGetActiveAttribARB2(@GLhandleARB int programObj, @GLuint int index, @GLsizei int maxLength,
 	                           @OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
-	                           @OutParameter @Check("1") IntBuffer size,
-	                           @OutParameter @GLenum @Check("1") IntBuffer type,
+	                           @OutParameter @Check("2") IntBuffer sizeType,
+	                           @OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type,
 	                           @OutParameter @GLcharARB ByteBuffer name);
 
+	/** Overloads glGetActiveAttribARB. This version returns only the uniform name. */
 	@Alternate(value = "glGetActiveAttribARB", javaAlt = true)
+	@GLreturn(value = "name", maxLength = "maxLength")
+	void glGetActiveAttribARB(@GLhandleARB int programObj, @GLuint int index, @GLsizei int maxLength,
+	                          @OutParameter @GLsizei @Constant("name_length, 0, APIUtils.getBufferInt(), 0, APIUtils.getBufferInt(), 1") IntBuffer length,
+	                          @OutParameter @GLcharARB ByteBuffer name);
+
+	/** Overloads glGetActiveAttribARB. This version returns only the uniform size. */
+	@Alternate(value = "glGetActiveAttribARB", javaAlt = true)
 	@GLreturn(value = "size")
 	void glGetActiveAttribSizeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength,
 	                              @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
 	                              @OutParameter IntBuffer size,
 	                              @OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore
-	                              @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+	                              @OutParameter @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
 
+	/** Overloads glGetActiveAttribARB. This version returns only the uniform type. */
 	@Alternate(value = "glGetActiveAttribARB", javaAlt = true)
 	@GLreturn(value = "type")
 	void glGetActiveAttribTypeARB(@GLhandleARB int programObj, @GLuint int index, @Constant("0") @GLsizei int maxLength,
 	                              @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
 	                              @OutParameter @Constant("type, 1") IntBuffer size, // Reuse type buffer and ignore
 	                              @OutParameter @GLenum IntBuffer type,
-	                              @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+	                              @OutParameter @GLcharARB @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
 
 	int glGetAttribLocationARB(@GLhandleARB int programObj, @NullTerminated @Const @GLcharARB ByteBuffer name);
 

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java	2010-04-07 10:28:05 UTC (rev 3311)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL20.java	2010-04-07 11:59:33 UTC (rev 3312)
@@ -242,40 +242,39 @@
 	                        @OutParameter @GLenum @Check("1") IntBuffer type,
 	                        @OutParameter @GLchar ByteBuffer name);
 
+	/** Overloads glGetActiveUniform. This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
 	@Alternate("glGetActiveUniform")
 	@GLreturn(value = "name", maxLength = "maxLength")
 	void glGetActiveUniform2(@GLuint int program, @GLuint int index, @GLsizei int maxLength,
 	                         @OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
-	                         @OutParameter @GLsizei @Check("1") IntBuffer size,
-	                         @OutParameter @GLenum @Check("1") IntBuffer type,
-	                         @OutParameter @GLchar ByteBuffer name);
-
-	/** This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
-	@Alternate("glGetActiveUniform")
-	@GLreturn(value = "name", maxLength = "maxLength")
-	void glGetActiveUniform3(@GLuint int program, @GLuint int index, @GLsizei int maxLength,
-	                         @OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
 	                         @OutParameter @Check("2") IntBuffer sizeType,
 	                         @OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type,
 	                         @OutParameter @GLchar ByteBuffer name);
 
-	/** This version returns only the uniform size. */
+	/** Overloads glGetActiveUniformARB. This version returns only the uniform name. */
 	@Alternate(value = "glGetActiveUniform", javaAlt = true)
+	@GLreturn(value = "name", maxLength = "maxLength")
+	void glGetActiveUniform(@GLuint int program, @GLuint int index, @GLsizei int maxLength,
+	                        @OutParameter @GLsizei @Constant("name_length, 0, APIUtils.getBufferInt(), 0, APIUtils.getBufferInt(), 1") IntBuffer length,
+	                        @OutParameter @GLchar ByteBuffer name);
+
+	/** Overloads glGetActiveUniform. This version returns only the uniform size. */
+	@Alternate(value = "glGetActiveUniform", javaAlt = true)
 	@GLreturn(value = "size")
 	void glGetActiveUniformSize(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int maxLength,
 	                            @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
 	                            @OutParameter IntBuffer size,
 	                            @OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore
-	                            @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+	                            @OutParameter @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
 
-	/** This version returns only the uniform type. */
+	/** Overloads glGetActiveUniform. This version returns only the uniform type. */
 	@Alternate(value = "glGetActiveUniform", javaAlt = true)
 	@GLreturn(value = "type")
 	void glGetActiveUniformType(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int maxLength,
 	                            @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
 	                            @OutParameter @Constant("type, 1") IntBuffer size, // Reuse type buffer and ignore
 	                            @OutParameter @GLenum IntBuffer type,
-	                            @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+	                            @OutParameter @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
 
 	@StripPostfix("params")
 	void glGetUniformfv(@GLuint int program, int location, @OutParameter @Check FloatBuffer params);

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback.java	2010-04-07 10:28:05 UTC (rev 3311)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/NV_transform_feedback.java	2010-04-07 11:59:33 UTC (rev 3312)
@@ -137,14 +137,40 @@
 	                          @OutParameter @GLenum @Check("1") IntBuffer type,
 	                          @OutParameter @GLchar ByteBuffer name);
 
+	/** Overloads glGetActiveVaryingNV. This version returns both size and type in the sizeType buffer (at .position() and .position() + 1). */
 	@Alternate("glGetActiveVaryingNV")
 	@GLreturn(value = "name", maxLength = "bufSize")
 	void glGetActiveVaryingNV2(@GLuint int program, @GLuint int index, @GLsizei int bufSize,
 	                           @OutParameter @GLsizei @Constant("name_length, 0") IntBuffer length,
-	                           @OutParameter @GLsizei @Check("1") IntBuffer size,
-	                           @OutParameter @GLenum @Check("1") IntBuffer type,
+	                           @OutParameter @Check("2") IntBuffer sizeType,
+	                           @OutParameter @GLenum @Constant("sizeType, sizeType.position() + 1") IntBuffer type,
 	                           @OutParameter @GLchar ByteBuffer name);
 
+	/** Overloads glGetActiveVaryingNV. This version returns only the varying name. */
+	@Alternate(value = "glGetActiveVaryingNV", javaAlt = true)
+	@GLreturn(value = "name", maxLength = "bufSize")
+	void glGetActiveVaryingNV(@GLuint int program, @GLuint int index, @GLsizei int bufSize,
+	                          @OutParameter @GLsizei @Constant("name_length, 0, APIUtils.getBufferInt(), 0, APIUtils.getBufferInt(), 1") IntBuffer length,
+	                          @OutParameter @GLchar ByteBuffer name);
+
+	/** Overloads glGetActiveVaryingNV. This version returns only the varying size. */
+	@Alternate(value = "glGetActiveVaryingNV", javaAlt = true)
+	@GLreturn(value = "size")
+	void glGetActiveVaryingSizeNV(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int bufSize,
+	                              @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
+	                              @OutParameter IntBuffer size,
+	                              @OutParameter @GLenum @Constant("size, 1") IntBuffer type, // Reuse size buffer and ignore
+	                              @OutParameter @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+
+	/** Overloads glGetActiveVaryingNV. This version returns only the varying type. */
+	@Alternate(value = "glGetActiveVaryingNV", javaAlt = true)
+	@GLreturn(value = "type")
+	void glGetActiveVaryingTypeNV(@GLuint int program, @GLuint int index, @Constant("0") @GLsizei int bufSize,
+	                              @OutParameter @GLsizei @Constant("null, 0") IntBuffer length,
+	                              @OutParameter @Constant("type, 1") IntBuffer size, // Reuse type buffer and ignore
+	                              @OutParameter @GLenum IntBuffer type,
+	                              @OutParameter @GLchar @Constant("APIUtils.getBufferByte(0), 0") ByteBuffer name);
+
 	void glActiveVaryingNV(@GLuint int program, @NullTerminated @Const @GLchar ByteBuffer name);
 
 	@Alternate("glActiveVaryingNV")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3311
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3311&view=rev
Author:   matzon
Date:     2010-04-07 10:28:05 +0000 (Wed, 07 Apr 2010)

Log Message:
-----------
make sure we overwrite existing files

Modified Paths:
--------------
    trunk/LWJGL/platform_build/build-applet.xml

Modified: trunk/LWJGL/platform_build/build-applet.xml
===================================================================
--- trunk/LWJGL/platform_build/build-applet.xml	2010-04-04 19:48:53 UTC (rev 3310)
+++ trunk/LWJGL/platform_build/build-applet.xml	2010-04-07 10:28:05 UTC (rev 3311)
@@ -68,12 +68,12 @@
   		<fileset dir="${lwjgl.res}" includes="applet*"/>
   	</jar>
 
-	  	<copy file="${lwjgl.lib}/lwjgl.jar" todir="applet"/>
-		<copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="applet"/>
-		<copy file="${lwjgl.lib}/lwjgl_util_applet.jar" todir="applet"/>
-		<copy file="${lwjgl.lib}/lwjgl_util.jar" todir="applet"/>
-		<copy file="${lwjgl.lib}/jinput.jar" todir="applet"/>
-		<copy file="${lwjgl.lib}/lzma.jar" todir="applet"/>
+	  	<copy file="${lwjgl.lib}/lwjgl.jar" todir="applet" overwrite="true"/>
+		<copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="applet" overwrite="true"/>
+		<copy file="${lwjgl.lib}/lwjgl_util_applet.jar" todir="applet" overwrite="true"/>
+		<copy file="${lwjgl.lib}/lwjgl_util.jar" todir="applet" overwrite="true"/>
+		<copy file="${lwjgl.lib}/jinput.jar" todir="applet" overwrite="true"/>
+		<copy file="${lwjgl.lib}/lzma.jar" todir="applet" overwrite="true"/>
 		<zip destfile="applet/res.jar">
 		  <zipfileset dir="${lwjgl.res}" includes="Footsteps.wav, ILtest.tga, Missing_you.mod"/>
 		</zip>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3310
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3310&view=rev
Author:   matzon
Date:     2010-04-04 19:48:53 +0000 (Sun, 04 Apr 2010)

Log Message:
-----------
trusted and sealed lzma, needed by Java update 19

Modified Paths:
--------------
    trunk/LWJGL/platform_build/build-applet.xml

Modified: trunk/LWJGL/platform_build/build-applet.xml
===================================================================
--- trunk/LWJGL/platform_build/build-applet.xml	2010-04-04 19:46:42 UTC (rev 3309)
+++ trunk/LWJGL/platform_build/build-applet.xml	2010-04-04 19:48:53 UTC (rev 3310)
@@ -78,6 +78,7 @@
 		  <zipfileset dir="${lwjgl.res}" includes="Footsteps.wav, ILtest.tga, Missing_you.mod"/>
 		</zip>
 		<signjar jar="applet/lwjgl_util_applet.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
+		<signjar jar="applet/lzma.jar" alias="${alias}" keystore="${keystore}" storepass="${password}"/>
 		
 		<!-- LZMA only, for 1.4 only clients -->
 		<antcall target="compress-resource">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3309
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3309&view=rev
Author:   matzon
Date:     2010-04-04 19:46:42 +0000 (Sun, 04 Apr 2010)

Log Message:
-----------
trusted and sealed lzma, needed by Java update 19

Modified Paths:
--------------
    trunk/LWJGL/libs/lzma.jar

Modified: trunk/LWJGL/libs/lzma.jar
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3308
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3308&view=rev
Author:   spasi
Date:     2010-04-03 19:03:49 +0000 (Sat, 03 Apr 2010)

Log Message:
-----------
Moved processMessages call after swapBuffers in Display.update.
Added option to not call processMessages during Display.update.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2010-04-03 13:32:35 UTC (rev 3307)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java	2010-04-03 19:03:49 UTC (rev 3308)
@@ -116,7 +116,7 @@
 	private static boolean window_created = false;
 
 	private static boolean parent_resized;
-	
+
 	/** Initial Background Color of Display */
 	private static float r = 0, g = 0, b = 0;
 
@@ -648,17 +648,27 @@
 	}
 
 	/**
-	 * Update the window. This calls processMessages(), and if the window is visible
-	 * clears the dirty flag and calls swapBuffers() and finally polls the input devices.
+	 * Update the window. If the window is visible clears
+	 * the dirty flag and calls swapBuffers() and finally
+	 * polls the input devices.
 	 *
-	 * @throws OpenGLException if an OpenGL error has occured since the last call to GL11.glGetError()
 	 */
 	public static void update() {
+		update(true);
+	}
+
+	/**
+	 * Update the window. If the window is visible clears
+	 * the dirty flag and calls swapBuffers() and finally
+	 * polls the input devices if processMessages is true.
+	 *
+	 * @param processMessages Poll input devices if true
+	 */
+	public static void update(boolean processMessages) {
 		synchronized ( GlobalLock.lock ) {
 			if ( !isCreated() )
 				throw new IllegalStateException("Display not created");
 
-			processMessages();
 			// We paint only when the window is visible or dirty
 			if ( display_impl.isVisible() || display_impl.isDirty() ) {
 				try {
@@ -667,13 +677,14 @@
 					throw new RuntimeException(e);
 				}
 			}
-			if ( swap_interval != 0 ) // Handle events again when vsync is enabled, to reduced input lag.
-				processMessages();
 
 			if ( parent_resized ) {
 				reshape();
 				parent_resized = false;
 			}
+
+			if ( processMessages )
+				processMessages();
 		}
 	}
 
@@ -866,11 +877,11 @@
 			}
 		}
 	}
-	
+
 	/**
 	*  Set the initial color of the Display. This method is called before the Display is created and will set the
 	*  background color to the one specified in this method.
-	*  
+	*
 	*  @param red - color value between 0 - 1
 	*  @param green - color value between 0 - 1
 	*  @param blue - color value between 0 - 1


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3307
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3307&view=rev
Author:   kappa1
Date:     2010-04-03 13:32:35 +0000 (Sat, 03 Apr 2010)

Log Message:
-----------
Modified build.xml so that the manifest file in lwjgl.jar and lwjgl_util_applet.jar is now tagged with 'Trusted-Library: true'.

This is needed from Java6u19+ when using a mix of signed/unsigned jars, otherwise an extra super scary dialog box will be shown to the user when an applet or JWS application is run.

Modified Paths:
--------------
    trunk/LWJGL/build.xml

Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2010-04-02 18:45:19 UTC (rev 3306)
+++ trunk/LWJGL/build.xml	2010-04-03 13:32:35 UTC (rev 3307)
@@ -124,6 +124,7 @@
 			<fileset refid="lwjgl.fileset" />
 			<manifest>
 				<attribute name="Sealed" value="true"/>
+				<attribute name="Trusted-Library" value="true"/>
 			</manifest>
 		</jar>
 		
@@ -132,6 +133,7 @@
 			<fileset refid="lwjgl_util_applet.fileset" />
 			<manifest>
 				<attribute name="Sealed" value="true"/>
+				<attribute name="Trusted-Library" value="true"/>
 			</manifest>
 		</jar>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3306
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3306&view=rev
Author:   spasi
Date:     2010-04-02 18:45:19 +0000 (Fri, 02 Apr 2010)

Log Message:
-----------
Fixed debug builds.

Modified Paths:
--------------
    trunk/LWJGL/build.xml
    trunk/LWJGL/platform_build/build-generator.xml

Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2010-04-01 21:01:51 UTC (rev 3305)
+++ trunk/LWJGL/build.xml	2010-04-02 18:45:19 UTC (rev 3306)
@@ -1,5 +1,7 @@
 <project name="LWJGL" default="all" basedir=".">
 
+	<property name="build.sysclasspath" value="last" />
+
 	<import file="platform_build/build-definitions.xml"/>
 	<import file="platform_build/build-generator.xml"/>
 	<import file="platform_build/build-applet.xml"/>
@@ -58,13 +60,16 @@
   	<antcall target="-initialize" />
 
   	<!-- compile and create jars -->
+	<antcall target="generate-debug"/>
+	<antcall target="compile" />
+  	<antcall target="-createdebugjars" />
+		<!-- Generator will skip all templates if we don't clean -->
+		<delete dir="${lwjgl.bin}" quiet="true" failonerror="false" taskname="cleaning bin folder" />
+		<mkdir dir="${lwjgl.bin}" taskname="initialiazing bin folder" />
 	<antcall target="generate-all"/>
   	<antcall target="compile" />
   	<antcall target="-createjars" />
-	<antcall target="generate-debug"/>
-	<antcall target="compile" />
-  	<antcall target="-createdebugjars" />
-	<antcall target="jars" />
+	<antcall target="-jars_NoDEP" />
  	<antcall target="javadoc" />
 	<antcall target="applet-release" />
   	
@@ -90,8 +95,10 @@
 
 	<!-- Create ONLY the jar archives -->
 	<target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, generate-all, compile, -createjars">
-		<!--		<target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, compile, -createjars">-->
-		<!--<target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, compile, -createjars">-->
+		<antcall target="-jars_NoDEP" />
+	</target>
+
+	<target name="-jars_NoDEP">
 		<move todir="libs/">
 			<fileset dir="${lwjgl.temp}/jar">
 				<include name="*.jar"/>
@@ -395,7 +402,7 @@
 	
 	<!-- Creates the Javadoc -->
 	<target name="javadoc" description="Creates javadoc from java source code">
-		<javadoc destdir="${lwjgl.docs}/javadoc" classpath="${lwjgl.lib}/jinput.jar" author="true" version="true" use="true" source="1.4" windowtitle="LWJGL API">
+		<javadoc destdir="${lwjgl.docs}/javadoc" classpath="${lwjgl.lib}/jinput.jar" author="true" version="true" use="true" source="1.4" windowtitle="LWJGL API" useexternalfile="true">
 			<fileset refid="lwjgl.javadoc.fileset" />
 			<doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle>
 			<bottom><![CDATA[<i>Copyright &#169; 2002-2009 lwjgl.org. All Rights Reserved.</i>]]></bottom>

Modified: trunk/LWJGL/platform_build/build-generator.xml
===================================================================
--- trunk/LWJGL/platform_build/build-generator.xml	2010-04-01 21:01:51 UTC (rev 3305)
+++ trunk/LWJGL/platform_build/build-generator.xml	2010-04-02 18:45:19 UTC (rev 3306)
@@ -22,7 +22,7 @@
 	<!-- Proxy target to generate it all -->
 	<target name="generate-all" depends="generate-openal, generate-opengl, generate-opengl-capabilities, generate-opengl-references" description="Generates java and native source"/>
 
-	<target name="generate-debug" depends="generate-openal, generate-opengl-debug, generate-opengl-capabilities, generate-opengl-references" description="Generates java and native source"/>
+	<target name="generate-debug" depends="generate-openal-debug, generate-opengl-debug, generate-opengl-capabilities, generate-opengl-references" description="Generates java and native source"/>
 
 	<!-- Generate OpenAL -->
 	<target name="generate-openal" depends="generators" description="Generates java and native source for AL">
@@ -37,6 +37,23 @@
 			<arg value="-d"/>
 			<arg path="${lwjgl.src.native}/generated"/>
 			<arg value="-Atypemap=org.lwjgl.util.generator.ALTypeMap"/>
+			<fileset dir="${lwjgl.src.templates}" includes="org/lwjgl/openal/AL10.java, org/lwjgl/openal/AL11.java"/>
+		</apply>
+	</target>
+	
+	<!-- Generate OpenAL [DEBUG] -->
+	<target name="generate-openal-debug" depends="generators" description="Generates java and native source for AL">
+		<apply executable="apt" parallel="true">
+			<arg value="-nocompile"/>
+			<arg value="-factory"/>
+			<arg value="org.lwjgl.util.generator.GeneratorProcessorFactory"/>
+			<arg value="-cp"/>
+			<arg path="${lwjgl.src}/java:${lwjgl.src.templates}:${lwjgl.bin}:${java.class.path}"/>
+			<arg value="-s"/>
+			<arg path="${lwjgl.src}/generated"/>
+			<arg value="-d"/>
+			<arg path="${lwjgl.src.native}/generated"/>
+			<arg value="-Atypemap=org.lwjgl.util.generator.ALTypeMap"/>
 			<arg value="-Ageneratechecks"/>
 			<fileset dir="${lwjgl.src.templates}" includes="org/lwjgl/openal/AL10.java, org/lwjgl/openal/AL11.java"/>
 		</apply>
@@ -54,14 +71,13 @@
 			<arg path="${lwjgl.src}/generated"/>
 			<arg value="-d"/>
 			<arg path="${lwjgl.src.native}/generated"/>
-			<!-- <arg value="-Ageneratechecks"/> -->
 			<arg value="-Acontextspecific"/>
 			<arg value="-Atypemap=org.lwjgl.util.generator.GLTypeMap"/>
 			<fileset dir="${lwjgl.src.templates}" includes="${opengl-template-pattern}"/>
 		</apply>
 	</target>
 
-	<!-- Generate OpenGL -->
+	<!-- Generate OpenGL [DEBUG] -->
 	<target name="generate-opengl-debug" depends="generators" description="Generates java and native source for GL">
 		<apply executable="apt" parallel="true">
 			<arg value="-nocompile"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3305
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3305&view=rev
Author:   kappa1
Date:     2010-04-01 21:01:51 +0000 (Thu, 01 Apr 2010)

Log Message:
-----------
Allow LWJGL applets to work when seperate_jvm parameter is not supported (i.e. java plugin1).

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2010-04-01 18:27:51 UTC (rev 3304)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2010-04-01 21:01:51 UTC (rev 3305)
@@ -52,6 +52,7 @@
 import java.io.StringWriter;
 import java.io.Writer;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.net.HttpURLConnection;
 import java.net.JarURLConnection;
@@ -68,6 +69,7 @@
 import java.security.cert.Certificate;
 import java.util.Enumeration;
 import java.util.StringTokenizer;
+import java.util.Vector;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.jar.JarOutputStream;
@@ -233,6 +235,9 @@
 												      "Please accept the permissions dialog to allow",
 												      "the applet to continue the loading process."};
 	
+	/** have natives been loaded by another instance of this applet */
+	static protected boolean natives_loaded = false;
+	
 	/*
 	 * @see java.applet.Applet#init()
 	 */
@@ -736,13 +741,67 @@
 		};
 		
 		debug_sleep(2000);
-
+		
+		// unload natives loaded by a previous instance of this lwjgl applet
+		unloadNatives(path);
+		
 		// add natives files path to native class path
 		System.setProperty("org.lwjgl.librarypath", path + "natives");
 
 		// Make sure jinput knows about the new path too
 		System.setProperty("net.java.games.input.librarypath", path + "natives");
+		
+		// mark natives as loaded
+		natives_loaded = true;
 	}
+	
+	/**
+	 * Unload natives loaded by a different classloader.
+	 * 
+	 * Due to limitations of the jvm, native files can only 
+	 * be loaded once and only be used by the classloader 
+	 * they were loaded from.
+	 * 
+	 * Due to the way applets on plugin1 work, one jvm must
+	 * be used for all applets. We need to use multiple 
+	 * classloaders in the same jvm due to LWJGL's static 
+	 * nature. I order to solver this we simply remove the 
+	 * natives from a previous classloader allowing a new 
+	 * classloader to use those natives in the same jvm.
+	 * 
+	 * This method will only attempt to unload natives from a
+	 * previous classloader if it detects that the natives have
+	 * been loaded in the same jvm.
+	 * 
+	 * @param nativePath directory where natives are stored
+	 */
+	private void unloadNatives(String nativePath) {
+		
+		// check whether natives have been loaded into this jvm
+		if (!natives_loaded) {
+			return;
+		}
+		
+		try {
+			Field field = ClassLoader.class.getDeclaredField("loadedLibraryNames");
+			field.setAccessible(true);
+			Vector libs = (Vector) field.get(getClass().getClassLoader());
+			
+			String path = new File(nativePath).getCanonicalPath();
+			
+			for (int i = 0; i < libs.size(); i++) {
+				String s = (String) libs.get(i);
+				
+				// if a native from the nativePath directory is loaded, unload it
+				if (s.startsWith(path)) {
+					libs.remove(i);
+					i--;
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
 
 	/**
 	 * replace the current applet with the lwjgl applet


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3304
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3304&view=rev
Author:   kappa1
Date:     2010-04-01 18:27:51 +0000 (Thu, 01 Apr 2010)

Log Message:
-----------
Added better support for FreeBSD to appletloader. Thx to monty_hall for the patch.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2010-04-01 15:05:32 UTC (rev 3303)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2010-04-01 18:27:51 UTC (rev 3304)
@@ -96,6 +96,7 @@
  * <li>al_linux - [String] Jar containing native files for linux.</li>
  * <li>al_mac - [String] Jar containing native files for mac.</li>
  * <li>al_solaris - [String] Jar containing native files for solaris.</li>
+ * <li>al_freebsd - [String] Jar containing native files for freebsd.</li>
  * </ul>
  * </p>
  * <p>
@@ -529,12 +530,14 @@
 		
 		if (osName.startsWith("Win")) {
 			nativeJar = getParameter("al_windows");
-		} else if (osName.startsWith("Linux") || osName.startsWith("FreeBSD")) {
+		} else if (osName.startsWith("Linux")) {
 			nativeJar = getParameter("al_linux");
 		} else if (osName.startsWith("Mac")) {
 			nativeJar = getParameter("al_mac");
 		} else if (osName.startsWith("Solaris") || osName.startsWith("SunOS")) {
 			nativeJar = getParameter("al_solaris");
+		} else if (osName.startsWith("FreeBSD")) {
+			nativeJar = getParameter("al_freebsd");
 		} else {
 			fatalErrorOccured("OS (" + osName + ") not supported", null);
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3303
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3303&view=rev
Author:   spasi
Date:     2010-04-01 15:05:32 +0000 (Thu, 01 Apr 2010)

Log Message:
-----------
Fix for grabbed mouse deltas.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2010-03-31 23:56:24 UTC (rev 3302)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2010-04-01 15:05:32 UTC (rev 3303)
@@ -542,19 +542,17 @@
 		if (getForegroundWindow() != hwnd && !hasParent)
 			return;
 		getGlobalClientRect(hwnd, rect);
-		/* -- This is wrong on multi-monitor setups
 		int local_offset_x = rect.left;
 		int local_offset_y = rect.top;
+		/* -- This is wrong on multi-monitor setups
 		getGlobalClientRect(getDesktopWindow(), rect2);
 		Rect.intersect(rect, rect2, rect);
+		*/
 		int center_x = (rect.left + rect.right)/2;
 		int center_y = (rect.top + rect.bottom)/2;
 		nSetCursorPosition(center_x, center_y);
 		int local_x = center_x - local_offset_x;
 		int local_y = center_y - local_offset_y;
-		*/
-		int local_x = (rect.right - rect.left) / 2;
-		int local_y = (rect.bottom - rect.top) / 2;
 		if (current_display != null)
 			current_display.setMousePosition(local_x, transformY(hwnd, local_y));
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.