|
From: Kevin G. <kev...@us...> - 2005-11-15 22:31:56
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16304/src/java/org/lwjgl/input Modified Files: Controllers.java Log Message: Removed the use of "jinput.plugins" system property since it doesn't appear to be needed any more and causes double detection of controllers. Index: Controllers.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/input/Controllers.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Controllers.java 29 Jun 2005 20:47:18 -0000 1.2 +++ Controllers.java 15 Nov 2005 22:31:49 -0000 1.3 @@ -12,13 +12,6 @@ * @author Kevin Glass */ public class Controllers { - /** The name of the plugin used on windows */ - private static final String WINDOWS_PLUGIN = "net.java.games.input.DirectInputEnvironmentPlugin"; - /** The name of the plugin used on linux */ - private static final String LINUX_PLUGIN = "net.java.games.input.LinuxEnvironmentPlugin"; - /** The name of the plugin used on macos */ - private static final String MACOS_PLUGIN = "net.java.games.input.OSXEnvironmentPlugin"; - /** The controllers available */ private static ArrayList controllers = new ArrayList(); /** The number of controllers */ @@ -42,20 +35,6 @@ return; try { - String plugins = System.getProperty("jinput.plugins"); - - if (plugins == null) { - if (System.getProperty("os.name").startsWith("Win")) { - System.setProperty("jinput.plugins",WINDOWS_PLUGIN); - } - if (System.getProperty("os.name").startsWith("Lin")) { - System.setProperty("jinput.plugins",LINUX_PLUGIN); - } - if (System.getProperty("os.name").startsWith("Mac")) { - System.setProperty("jinput.plugins",MACOS_PLUGIN); - } - } - ControllerEnvironment env = ControllerEnvironment.getDefaultEnvironment(); net.java.games.input.Controller[] found = env.getControllers(); |