Thread: [Java-game-lib-cvs] SF.net SVN: java-game-lib: [2561] trunk/LWJGL/src/java/org/lwjgl/input/Controll

Revision: 2561
Author:   kevglass
Date:     2006-08-21 10:26:28 -0700 (Mon, 21 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2561&view=rev

Log Message:
-----------
Added sanity checks on reported controllers to prune out one with no Axis or no Buttons.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/input/Controllers.java
Modified: trunk/LWJGL/src/java/org/lwjgl/input/Controllers.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/Controllers.java	2006-08-21 17:25:49 UTC (rev 2560)
+++ trunk/LWJGL/src/java/org/lwjgl/input/Controllers.java	2006-08-21 17:26:28 UTC (rev 2561)
@@ -71,6 +71,19 @@
 		net.java.games.input.Controller[] sub = c.getControllers();
 		if (sub.length == 0) {
 			JInputController controller = new JInputController(controllerCount,c);
+			
+			// sanity checks to ensure we're actually getting game controllers rather than
+			// any old detected device
+			
+			// if we've got no buttons at all we're not a game controller
+			if (controller.getButtonCount() == 0) {
+				return;
+			}
+			// if we've got no axis at all we're not a game controller
+			if (controller.getAxisCount() == 0) {
+				return;
+			}
+			
 			controllers.add(controller);
 			controllerCount++;
 		} else {


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

Revision: 2565
Author:   kevglass
Date:     2006-08-29 19:47:49 -0700 (Tue, 29 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2565&view=rev

Log Message:
-----------
Removed sanity checks for controllers. All controllers are now reported allowing the developer to make the decision over which ones to display to the user.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/input/Controllers.java
Modified: trunk/LWJGL/src/java/org/lwjgl/input/Controllers.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/input/Controllers.java	2006-08-25 05:47:59 UTC (rev 2564)
+++ trunk/LWJGL/src/java/org/lwjgl/input/Controllers.java	2006-08-30 02:47:49 UTC (rev 2565)
@@ -72,18 +72,6 @@
 		if (sub.length == 0) {
 			JInputController controller = new JInputController(controllerCount,c);
 			
-			// sanity checks to ensure we're actually getting game controllers rather than
-			// any old detected device
-			
-			// if we've got no buttons at all we're not a game controller
-			if (controller.getButtonCount() == 0) {
-				return;
-			}
-			// if we've got no axis at all we're not a game controller
-			if (controller.getAxisCount() == 0) {
-				return;
-			}
-			
 			controllers.add(controller);
 			controllerCount++;
 		} else {


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