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

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12635/src/java/org/lwjgl/input

Modified Files:
	Mouse.java 
Log Message:
Mouse: Allow delta queries when not grabbed.

Index: Mouse.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Mouse.java,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- Mouse.java	28 Apr 2005 11:57:38 -0000	1.83
+++ Mouse.java	17 May 2005 08:04:48 -0000	1.84
@@ -293,6 +293,8 @@
 			x += poll_coord1;
 			y += poll_coord2;
 		} else {
+			dx = poll_coord1 - x;
+			dy = poll_coord2 - y;
 			x = poll_coord1;
 			y = poll_coord2;
 		}
@@ -367,8 +369,12 @@
 				event_x += event_dx;
 				event_y += event_dy;
 			} else {
-				event_x = readBuffer.get();
-				event_y = readBuffer.get();
+				int new_event_x = readBuffer.get();
+				int new_event_y = readBuffer.get();
+				event_dx = new_event_x - event_x;
+				event_dy = new_event_y - event_y;
+				event_x = new_event_x;
+				event_y = new_event_y;
 			}
 			event_x = Math.min(Display.getDisplayMode().getWidth() - 1, Math.max(0, event_x));
 			event_y = Math.min(Display.getDisplayMode().getHeight() - 1, Math.max(0, event_y));
@@ -400,8 +406,6 @@
 	 * @return Current events delta x. Only valid when the mouse is grabbed.
 	 */
 	public static int getEventDX() {
-		if (!isGrabbed())
-			throw new IllegalStateException("X, Y deltas are only available when the mouse is grabbed. Use getEventX()/getEventY() instead.");
 		return event_dx;
 	}
 
@@ -409,8 +413,6 @@
 	 * @return Current events delta y. Only valid when the mouse is grabbed.
 	 */
 	public static int getEventDY() {
-		if (!isGrabbed())
-			throw new IllegalStateException("X, Y deltas are only available when the mouse is grabbed. Use getEventX()/getEventY() instead.");
 		return event_dy;
 	}
 
@@ -459,8 +461,6 @@
 	 * @return Movement on the x axis since last time getDX() was called. Only valid when the mouse is grabbed.
 	 */
 	public static int getDX() {
-		if (!isGrabbed())
-			throw new IllegalStateException("X, Y deltas are only available when the mouse is grabbed. Use getEventX()/getEventY() instead.");
 		int result = dx;
 		dx = 0;
 		return result;
@@ -470,8 +470,6 @@
 	 * @return Movement on the y axis since last time getDY() was called. Only valid when the mouse is grabbed.
 	 */
 	public static int getDY() {
-		if (!isGrabbed())
-			throw new IllegalStateException("X, Y deltas are only available when the mouse is grabbed. Use getEventX()/getEventY() instead.");
 		int result = dy;
 		dy = 0;
 		return result;

Update of /cvsroot/java-game-lib/LWJGL/src/native/common/devil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8779/devil

Modified Files:
	extil.c extilu.c extilut.c 
Log Message:
Mac OS X Devil: Make sure we include our own header files last so that our definition of bool is used

Index: extilut.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/devil/extilut.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- extilut.c	28 Mar 2005 14:53:30 -0000	1.4
+++ extilut.c	17 May 2005 07:43:40 -0000	1.5
@@ -1,5 +1,3 @@
-#include "extilut.h"
-
 /* Handle to ilut Library */
 #ifdef _WIN32
 static HMODULE devILUThandle;
@@ -15,6 +13,7 @@
 extern const struct mach_header* devILhandle;
 static const struct mach_header* devILUThandle; // never actually used, just makes it shut up
 #endif
+#include "extilut.h"
 
 /**
  * Retrieves a function pointer from the ilut library

Index: extil.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/devil/extil.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- extil.c	29 Mar 2005 10:32:42 -0000	1.7
+++ extil.c	17 May 2005 07:43:40 -0000	1.8
@@ -1,5 +1,3 @@
-#include "extil.h"
-
 /* Handle to devil Library */
 #ifdef _WIN32
 static HMODULE devILhandle;
@@ -13,6 +11,7 @@
 #include <string.h>
 const struct mach_header* devILhandle = NULL;
 #endif
+#include "extil.h"
 
 /**
  * Retrieves a function pointer from the devil library

Index: extilu.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/devil/extilu.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- extilu.c	28 Mar 2005 14:59:22 -0000	1.5
+++ extilu.c	17 May 2005 07:43:40 -0000	1.6
@@ -1,5 +1,3 @@
-#include "extilu.h"
-
 /* Handle to ilu Library */
 #ifdef _WIN32
 static HMODULE devILUhandle;
@@ -15,6 +13,7 @@
 extern const struct mach_header* devILhandle;
 static const struct mach_header* devILUhandle; // never actually used, just makes it shut up
 #endif
+#include "extilu.h"
 
 /**
  * Retrieves a function pointer from the ilu library