aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorendolf <[email protected]>2009-07-15 16:19:15 +0000
committerendolf <[email protected]>2009-07-15 16:19:15 +0000
commit1766ed9b4b99f7a9188f7a9d5ac9717d0c805a15 (patch)
treedcac7353a1ca8fca02a3a580de072133025a48ed
parent55c2fe21fac4af7c4a5a210b09044ebb799da35e (diff)
Apply patch from bjunglas for issue 42 to allow 3D Connexions space navigator to be detected on osx
git-svn-id: file:///home/sven/projects/JOGL/git-svn/svn-server-sync/jinput/trunk@227 e343933a-64c8-49c5-92b1-88f2ce3e89e8
-rwxr-xr-xplugins/OSX/src/java/net/java/games/input/OSXEnvironmentPlugin.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/OSX/src/java/net/java/games/input/OSXEnvironmentPlugin.java b/plugins/OSX/src/java/net/java/games/input/OSXEnvironmentPlugin.java
index c900279..b20c428 100755
--- a/plugins/OSX/src/java/net/java/games/input/OSXEnvironmentPlugin.java
+++ b/plugins/OSX/src/java/net/java/games/input/OSXEnvironmentPlugin.java
@@ -238,6 +238,10 @@ public final class OSXEnvironmentPlugin extends ControllerEnvironment implements
Controller joystick = createControllerFromDevice(device, elements, Controller.Type.STICK);
if (joystick != null)
controllers.add(joystick);
+ } else if (usage_pair.getUsagePage() == UsagePage.GENERIC_DESKTOP && usage_pair.getUsage() == GenericDesktopUsage.MULTI_AXIS_CONTROLLER) {
+ Controller multiaxis = createControllerFromDevice(device, elements, Controller.Type.STICK);
+ if (multiaxis != null)
+ controllers.add(multiaxis);
} else if (usage_pair.getUsagePage() == UsagePage.GENERIC_DESKTOP && usage_pair.getUsage() == GenericDesktopUsage.GAME_PAD) {
Controller game_pad = createControllerFromDevice(device, elements, Controller.Type.GAMEPAD);
if (game_pad != null)