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

Revision: 3612
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3612&view=rev
Author:   spasi
Date:     2011-08-13 19:16:58 +0000 (Sat, 13 Aug 2011)

Log Message:
-----------
Replaced Arrays.copyof with custom implementation for Java 5 compatibility.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/mapped/MappedObjectClassLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/mapped/MappedObjectClassLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/mapped/MappedObjectClassLoader.java	2011-08-13 18:53:54 UTC (rev 3611)
+++ trunk/LWJGL/src/java/org/lwjgl/util/mapped/MappedObjectClassLoader.java	2011-08-13 19:16:58 UTC (rev 3612)
@@ -38,7 +38,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URLClassLoader;
-import java.util.Arrays;
 
 /**
  * This classloader is responsible for applying the bytecode transformation to mapped objects.
@@ -167,7 +166,7 @@
 		try {
 			while ( true ) {
 				if ( bytecode.length == len )
-					bytecode = Arrays.copyOf(bytecode, len * 2);
+					bytecode = copyOf(bytecode, len * 2);
 				int got = in.read(bytecode, len, bytecode.length - len);
 				if ( got == -1 )
 					break;
@@ -182,7 +181,13 @@
 				// ignore...
 			}
 		}
-		return Arrays.copyOf(bytecode, len);
+		return copyOf(bytecode, len);
 	}
 
+	private static byte[] copyOf(byte[] original, int newLength) {
+		byte[] copy = new byte[newLength];
+		System.arraycopy(original, 0, copy, 0, Math.min(original.length, newLength));
+		return copy;
+	}
+
 }
\ No newline at end of file


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

Revision: 3611
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3611&view=rev
Author:   kappa1
Date:     2011-08-13 18:53:54 +0000 (Sat, 13 Aug 2011)

Log Message:
-----------
Fix issue with Mouse getWidth/getHeight values being wrongly clipped when using Display.setParent(), thx to MatthiasM for finding this.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java

Modified: trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java	2011-08-13 17:20:59 UTC (rev 3610)
+++ trunk/LWJGL/src/java/org/lwjgl/input/Mouse.java	2011-08-13 18:53:54 UTC (rev 3611)
@@ -362,8 +362,8 @@
 				y = poll_coord2;
 			}
                         if(clipMouseCoordinatesToWindow) {
-                            x = Math.min(implementation.getWidth() - 1, Math.max(0, x));
-                            y = Math.min(implementation.getHeight() - 1, Math.max(0, y));
+                            x = Math.min(Display.getWidth() - 1, Math.max(0, x));
+                            y = Math.min(Display.getHeight() - 1, Math.max(0, y));
                         }
                         dwheel += poll_dwheel;
 			read();
@@ -453,8 +453,8 @@
 					last_event_raw_y = new_event_y;
 				}
 				if(clipMouseCoordinatesToWindow) {
-					event_x = Math.min(implementation.getWidth() - 1, Math.max(0, event_x));
-					event_y = Math.min(implementation.getHeight() - 1, Math.max(0, event_y));
+					event_x = Math.min(Display.getWidth() - 1, Math.max(0, event_x));
+					event_y = Math.min(Display.getHeight() - 1, Math.max(0, event_y));
 				}
 				event_dwheel = readBuffer.getInt();
 				event_nanos = readBuffer.getLong();


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

Revision: 3610
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3610&view=rev
Author:   spasi
Date:     2011-08-13 17:20:59 +0000 (Sat, 13 Aug 2011)

Log Message:
-----------
Fixed GL42 detection and added an @Optional so that AMD's beta driver works.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java
    trunk/LWJGL/src/templates/org/lwjgl/opengl/GL42.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java	2011-08-10 17:27:49 UTC (rev 3609)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/GLContext.java	2011-08-13 17:20:59 UTC (rev 3610)
@@ -221,7 +221,7 @@
 			{ 1, 2, 3, 4, 5 },  // OpenGL 1
 			{ 0, 1 },           // OpenGL 2
 			{ 0, 1, 2, 3 },     // OpenGL 3
-			{ 0, 1 },           // OpenGL 4
+			{ 0, 1, 2 },        // OpenGL 4
 		};
 
 		for ( int major = 1; major <= GL_VERSIONS.length; major++ ) {

Modified: trunk/LWJGL/src/templates/org/lwjgl/opengl/GL42.java
===================================================================
--- trunk/LWJGL/src/templates/org/lwjgl/opengl/GL42.java	2011-08-10 17:27:49 UTC (rev 3609)
+++ trunk/LWJGL/src/templates/org/lwjgl/opengl/GL42.java	2011-08-13 17:20:59 UTC (rev 3610)
@@ -127,6 +127,7 @@
 	/** Returned in &lt;params&gt; by GetActiveUniform and GetActiveUniformsiv: */
 	int GL_UNSIGNED_INT_ATOMIC_COUNTER = 0x92DB;
 
+	@Optional(reason = "AMD's beta 4.2 driver (11.8) does not expose this")
 	@StripPostfix("params")
 	void glGetActiveAtomicCounterBufferiv(@GLuint int program, @GLuint int bufferIndex, @GLenum int pname, @Check("1") @OutParameter IntBuffer params);
 


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