[Java-game-lib-cvs] SF.net SVN: java-game-lib: [2639] trunk/LWJGL/src/java/org/lwjgl

[<eli...@us...>]

Revision: 2639
          http://svn.sourceforge.net/java-game-lib/?rev=2639&view=rev
Author:   elias_naur
Date:     2006-11-10 05:52:18 -0800 (Fri, 10 Nov 2006)

Log Message:
-----------
Remove AWTInputAdapter.update() and let users poll() Mouse and Keyboard directly

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/AWTCanvasInputImplementation.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/AWTInputAdapter.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTInput.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTInput.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java
    trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTInputAdapterTest.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTCanvasInputImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTCanvasInputImplementation.java	2006-11-10 11:44:00 UTC (rev 2638)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTCanvasInputImplementation.java	2006-11-10 13:52:18 UTC (rev 2639)
@@ -41,7 +41,6 @@
  */
 interface AWTCanvasInputImplementation extends InputImplementation {
 	void processInput(PeerInfo peer_info);
-	void update();
 	void init();
 	void destroy();
 }

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTInputAdapter.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTInputAdapter.java	2006-11-10 11:44:00 UTC (rev 2638)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTInputAdapter.java	2006-11-10 13:52:18 UTC (rev 2639)
@@ -94,11 +94,4 @@
 			awt_input = null;
 		}
 	}
-
-	public static synchronized void update() {
-		if (awt_input == null)
-			throw new IllegalStateException("You need to create() the adapter.");
-		awt_input.update();
-		Display.pollDevices();
-	}
 }

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTInput.java	2006-11-10 11:44:00 UTC (rev 2638)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxAWTInput.java	2006-11-10 13:52:18 UTC (rev 2639)
@@ -132,6 +132,7 @@
 			checkFocus();
 			if (!input_grabbed && shouldGrab())
 				grabInput(new_window);
+			update();
 		} finally {
 			LinuxDisplay.unlockAWT();
 		}
@@ -150,20 +151,15 @@
 		return !input_released && isGrabbed();
 	}
 
-	public synchronized void update() {
-		LinuxDisplay.lockAWT();
-		try {
-			while (LinuxEvent.getPending(display) > 0) {
-				event.nextEvent(display);
-				if (shouldGrab()) {
-					long event_window = event.getWindow();
-					boolean processed = event.filterEvent(event_window) ||
-						cached_mouse.filterEvent(isGrabbed(), shouldGrab(), event)/* ||
-						cached_keyboard.filterEvent(event)*/;
-				}
+	private void update() {
+		while (LinuxEvent.getPending(display) > 0) {
+			event.nextEvent(display);
+			if (shouldGrab()) {
+				long event_window = event.getWindow();
+				boolean processed = event.filterEvent(event_window) ||
+					cached_mouse.filterEvent(isGrabbed(), shouldGrab(), event);/* ||
+						cached_keyboard.filterEvent(event) */
 			}
-		} finally {
-			LinuxDisplay.unlockAWT();
 		}
 	}
 

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTInput.java	2006-11-10 11:44:00 UTC (rev 2638)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXAWTInput.java	2006-11-10 13:52:18 UTC (rev 2639)
@@ -63,7 +63,4 @@
 
 	public void destroy() {
 	}
-
-	public void update() {
-	}
 }

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java	2006-11-10 11:44:00 UTC (rev 2638)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsAWTInput.java	2006-11-10 13:52:18 UTC (rev 2639)
@@ -129,9 +129,6 @@
 		}
 	}
 
-	public void update() {
-	}
-
 	public synchronized void pollMouse(IntBuffer coord_buffer, ByteBuffer buttons) {
 		if (isGrabbed()) {
 			if (cached_mouse != null)

Modified: trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTInputAdapterTest.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTInputAdapterTest.java	2006-11-10 11:44:00 UTC (rev 2638)
+++ trunk/LWJGL/src/java/org/lwjgl/test/opengl/awt/AWTInputAdapterTest.java	2006-11-10 13:52:18 UTC (rev 2639)
@@ -140,11 +140,12 @@
 							+ (fps / (timeUsed / 1000f)));
 					fps = 0;
 				}
-				AWTInputAdapter.update();
+				Mouse.poll();
 				while (Mouse.next()) {
 					view_roty += Mouse.getEventDX()*.1;
 					view_rotx -= Mouse.getEventDY()*.1;
 				}
+				Keyboard.poll();
 				while (Keyboard.next()) {
 					if (Keyboard.getEventKeyState()) {
 						switch (Keyboard.getEventKey()) {


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