-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_badlogic_gdx_controllers_desktop_ois_Ois */
-
-#ifndef _Included_com_badlogic_gdx_controllers_desktop_ois_Ois
-#define _Included_com_badlogic_gdx_controllers_desktop_ois_Ois
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class: com_badlogic_gdx_controllers_desktop_ois_Ois
- * Method: getWindowHandleWindowsHack
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_Ois_getWindowHandleWindowsHack
- (JNIEnv *, jobject);
-
-/*
- * Class: com_badlogic_gdx_controllers_desktop_ois_Ois
- * Method: createInputManager
- * Signature: (J)J
- */
-JNIEXPORT jlong JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_Ois_createInputManager
- (JNIEnv *, jobject, jlong);
-
-/*
- * Class: com_badlogic_gdx_controllers_desktop_ois_Ois
- * Method: getJoystickCount
- * Signature: (J)I
- */
-JNIEXPORT jint JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_Ois_getJoystickCount
- (JNIEnv *, jobject, jlong);
-
-/*
- * Class: com_badlogic_gdx_controllers_desktop_ois_Ois
- * Method: createJoystick
- * Signature: (J)J
- */
-JNIEXPORT jlong JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_Ois_createJoystick
- (JNIEnv *, jobject, jlong);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
+/* DO NOT EDIT THIS FILE - it is machine generated */\r
+#include <jni.h>\r
+/* Header for class com_badlogic_gdx_controllers_desktop_ois_Ois */\r
+\r
+#ifndef _Included_com_badlogic_gdx_controllers_desktop_ois_Ois\r
+#define _Included_com_badlogic_gdx_controllers_desktop_ois_Ois\r
+#ifdef __cplusplus\r
+extern "C" {\r
+#endif\r
+/*\r
+ * Class: com_badlogic_gdx_controllers_desktop_ois_Ois\r
+ * Method: getWindowHandleWindowsHack\r
+ * Signature: ()J\r
+ */\r
+JNIEXPORT jlong JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_Ois_getWindowHandleWindowsHack\r
+ (JNIEnv *, jobject);\r
+\r
+/*\r
+ * Class: com_badlogic_gdx_controllers_desktop_ois_Ois\r
+ * Method: createInputManager\r
+ * Signature: (J)J\r
+ */\r
+JNIEXPORT jlong JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_Ois_createInputManager\r
+ (JNIEnv *, jobject, jlong);\r
+\r
+/*\r
+ * Class: com_badlogic_gdx_controllers_desktop_ois_Ois\r
- * Method: getJoystickNames\r
- * Signature: (J)[Ljava/lang/String;\r
- */\r
- JNIEXPORT jobjectArray JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_Ois_getJoystickNames\r
- (JNIEnv *, jobject, jlong);\r
- \r
- /*\r
- * Class: com_badlogic_gdx_controllers_desktop_ois_Ois\r
- * Method: getVersionNumber\r
++ * Method: getJoystickCount\r
+ * Signature: (J)I\r
+ */\r
- JNIEXPORT jint JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_Ois_getVersionNumber\r
- (JNIEnv *, jobject, jlong);\r
- \r
- /*\r
- * Class: com_badlogic_gdx_controllers_desktop_ois_Ois\r
- * Method: getVersionName\r
- * Signature: (J)Ljava/lang/String;\r
- */\r
- JNIEXPORT jstring JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_Ois_getVersionName\r
- (JNIEnv *, jobject, jlong);\r
- \r
- /*\r
- * Class: com_badlogic_gdx_controllers_desktop_ois_Ois\r
- * Method: getInputSystemName\r
- * Signature: (J)Ljava/lang/String;\r
- */\r
- JNIEXPORT jstring JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_Ois_getInputSystemName\r
++JNIEXPORT jint JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_Ois_getJoystickCount\r
+ (JNIEnv *, jobject, jlong);\r
+\r
+/*\r
+ * Class: com_badlogic_gdx_controllers_desktop_ois_Ois\r
+ * Method: createJoystick\r
+ * Signature: (J)J\r
+ */\r
+JNIEXPORT jlong JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_Ois_createJoystick\r
+ (JNIEnv *, jobject, jlong);\r
+\r
+#ifdef __cplusplus\r
+}\r
+#endif\r
+#endif\r
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_badlogic_gdx_controllers_desktop_ois_OisJoystick */
-
-#ifndef _Included_com_badlogic_gdx_controllers_desktop_ois_OisJoystick
-#define _Included_com_badlogic_gdx_controllers_desktop_ois_OisJoystick
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef com_badlogic_gdx_controllers_desktop_ois_OisJoystick_MIN_AXIS
-#define com_badlogic_gdx_controllers_desktop_ois_OisJoystick_MIN_AXIS -32768L
-#undef com_badlogic_gdx_controllers_desktop_ois_OisJoystick_MAX_AXIS
-#define com_badlogic_gdx_controllers_desktop_ois_OisJoystick_MAX_AXIS 32767L
-/*
- * Class: com_badlogic_gdx_controllers_desktop_ois_OisJoystick
- * Method: initialize
- * Signature: (Lcom/badlogic/gdx/controllers/desktop/ois/OisJoystick;)V
- */
-JNIEXPORT void JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_OisJoystick_initialize
- (JNIEnv *, jobject, jobject);
-
-/*
- * Class: com_badlogic_gdx_controllers_desktop_ois_OisJoystick
- * Method: updateJni
- * Signature: (JLcom/badlogic/gdx/controllers/desktop/ois/OisJoystick;)V
- */
-JNIEXPORT void JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_OisJoystick_updateJni
- (JNIEnv *, jobject, jlong, jobject);
-
-/*
- * Class: com_badlogic_gdx_controllers_desktop_ois_OisJoystick
- * Method: getAxesCountJni
- * Signature: (J)I
- */
-JNIEXPORT jint JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_OisJoystick_getAxesCountJni
- (JNIEnv *, jobject, jlong);
-
-/*
- * Class: com_badlogic_gdx_controllers_desktop_ois_OisJoystick
- * Method: getButtonCountJni
- * Signature: (J)I
- */
-JNIEXPORT jint JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_OisJoystick_getButtonCountJni
- (JNIEnv *, jobject, jlong);
-
-/*
- * Class: com_badlogic_gdx_controllers_desktop_ois_OisJoystick
- * Method: getPovCountJni
- * Signature: (J)I
- */
-JNIEXPORT jint JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_OisJoystick_getPovCountJni
- (JNIEnv *, jobject, jlong);
-
-/*
- * Class: com_badlogic_gdx_controllers_desktop_ois_OisJoystick
- * Method: getSliderCountJni
- * Signature: (J)I
- */
-JNIEXPORT jint JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_OisJoystick_getSliderCountJni
- (JNIEnv *, jobject, jlong);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-/* Header for class com_badlogic_gdx_controllers_desktop_ois_OisJoystick_OisPov */
-
-#ifndef _Included_com_badlogic_gdx_controllers_desktop_ois_OisJoystick_OisPov
-#define _Included_com_badlogic_gdx_controllers_desktop_ois_OisJoystick_OisPov
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
+/* DO NOT EDIT THIS FILE - it is machine generated */\r
+#include <jni.h>\r
+/* Header for class com_badlogic_gdx_controllers_desktop_ois_OisJoystick */\r
+\r
+#ifndef _Included_com_badlogic_gdx_controllers_desktop_ois_OisJoystick\r
+#define _Included_com_badlogic_gdx_controllers_desktop_ois_OisJoystick\r
+#ifdef __cplusplus\r
+extern "C" {\r
+#endif\r
+#undef com_badlogic_gdx_controllers_desktop_ois_OisJoystick_MIN_AXIS\r
+#define com_badlogic_gdx_controllers_desktop_ois_OisJoystick_MIN_AXIS -32768L\r
+#undef com_badlogic_gdx_controllers_desktop_ois_OisJoystick_MAX_AXIS\r
+#define com_badlogic_gdx_controllers_desktop_ois_OisJoystick_MAX_AXIS 32767L\r
+/*\r
+ * Class: com_badlogic_gdx_controllers_desktop_ois_OisJoystick\r
+ * Method: initialize\r
+ * Signature: (Lcom/badlogic/gdx/controllers/desktop/ois/OisJoystick;)V\r
+ */\r
+JNIEXPORT void JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_OisJoystick_initialize\r
+ (JNIEnv *, jobject, jobject);\r
+\r
+/*\r
+ * Class: com_badlogic_gdx_controllers_desktop_ois_OisJoystick\r
- * Method: update\r
++ * Method: updateJni\r
+ * Signature: (JLcom/badlogic/gdx/controllers/desktop/ois/OisJoystick;)V\r
+ */\r
- JNIEXPORT void JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_OisJoystick_update\r
++JNIEXPORT void JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_OisJoystick_updateJni\r
+ (JNIEnv *, jobject, jlong, jobject);\r
+\r
+/*\r
+ * Class: com_badlogic_gdx_controllers_desktop_ois_OisJoystick\r
- * Method: getAxesCount\r
++ * Method: getAxesCountJni\r
+ * Signature: (J)I\r
+ */\r
- JNIEXPORT jint JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_OisJoystick_getAxesCount\r
++JNIEXPORT jint JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_OisJoystick_getAxesCountJni\r
+ (JNIEnv *, jobject, jlong);\r
+\r
+/*\r
+ * Class: com_badlogic_gdx_controllers_desktop_ois_OisJoystick\r
- * Method: getButtonCount\r
++ * Method: getButtonCountJni\r
+ * Signature: (J)I\r
+ */\r
- JNIEXPORT jint JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_OisJoystick_getButtonCount\r
++JNIEXPORT jint JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_OisJoystick_getButtonCountJni\r
+ (JNIEnv *, jobject, jlong);\r
+\r
+/*\r
+ * Class: com_badlogic_gdx_controllers_desktop_ois_OisJoystick\r
- * Method: getPovCount\r
++ * Method: getPovCountJni\r
+ * Signature: (J)I\r
+ */\r
- JNIEXPORT jint JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_OisJoystick_getPovCount\r
++JNIEXPORT jint JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_OisJoystick_getPovCountJni\r
+ (JNIEnv *, jobject, jlong);\r
+\r
+/*\r
+ * Class: com_badlogic_gdx_controllers_desktop_ois_OisJoystick\r
- * Method: getSliderCount\r
++ * Method: getSliderCountJni\r
+ * Signature: (J)I\r
+ */\r
- JNIEXPORT jint JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_OisJoystick_getSliderCount\r
++JNIEXPORT jint JNICALL Java_com_badlogic_gdx_controllers_desktop_ois_OisJoystick_getSliderCountJni\r
+ (JNIEnv *, jobject, jlong);\r
+\r
+#ifdef __cplusplus\r
+}\r
+#endif\r
+#endif\r
+/* Header for class com_badlogic_gdx_controllers_desktop_ois_OisJoystick_OisPov */\r
+\r
+#ifndef _Included_com_badlogic_gdx_controllers_desktop_ois_OisJoystick_OisPov\r
+#define _Included_com_badlogic_gdx_controllers_desktop_ois_OisJoystick_OisPov\r
+#ifdef __cplusplus\r
+extern "C" {\r
+#endif\r
+#ifdef __cplusplus\r
+}\r
+#endif\r
+#endif\r
-\r
-package com.badlogic.gdx.controllers;\r
-\r
-import com.badlogic.gdx.jnigen.AntScriptGenerator;\r
-import com.badlogic.gdx.jnigen.BuildConfig;\r
-import com.badlogic.gdx.jnigen.BuildExecutor;\r
-import com.badlogic.gdx.jnigen.BuildTarget;\r
-import com.badlogic.gdx.jnigen.NativeCodeGenerator;\r
-import com.badlogic.gdx.jnigen.BuildTarget.TargetOs;\r
-\r
-public class DesktopControllersBuild {\r
- public static void main (String[] args) throws Exception {\r
- new NativeCodeGenerator().generate("src/", "bin/", "jni/");\r
- BuildConfig buildConfig = new BuildConfig("gdx-controllers-desktop");\r
- \r
- String[] windowsSrc = {"*.cpp",\r
- "ois-v1-4svn/src/*.cpp",\r
- "ois-v1-4svn/src/win32/*.cpp"\r
- };\r
- \r
- String[] linuxSrc = { "*.cpp",\r
- "ois-v1-4svn/src/*.cpp",\r
- "ois-v1-4svn/src/linux/*.cpp"\r
- };\r
- \r
- String[] macSrc = { "*.cpp",\r
- "ois-v1-4svn/src/*.cpp",\r
- "ois-v1-4svn/src/linux/*.cpp"\r
- };\r
- \r
- String[] includes = new String[] {\r
- "ois-v1-4svn/includes",\r
- "dinput/"\r
- };\r
- \r
- BuildTarget win32home = BuildTarget.newDefaultTarget(TargetOs.Windows, false);\r
- win32home.buildFileName = "build-windows32home.xml";\r
- win32home.excludeFromMasterBuildFile = true;\r
- win32home.is64Bit = false;\r
- win32home.compilerPrefix = "";\r
- win32home.cppIncludes = windowsSrc;\r
- win32home.headerDirs = includes;\r
- win32home.cIncludes = new String[0];\r
- win32home.libraries = "-ldinput8 -ldxguid";\r
- \r
- BuildTarget win32 = BuildTarget.newDefaultTarget(TargetOs.Windows, false);\r
- win32.cppIncludes = windowsSrc;\r
- win32.headerDirs = includes;\r
- win32.libraries = "-ldinput8 -ldxguid";\r
- \r
- BuildTarget win64 = BuildTarget.newDefaultTarget(TargetOs.Windows, true);\r
- win64.cppIncludes = windowsSrc;\r
- win64.headerDirs = includes;\r
- win64.libraries = "-ldinput8 -ldxguid";\r
- \r
- BuildTarget lin32 = BuildTarget.newDefaultTarget(TargetOs.Linux, false);\r
- lin32.cppIncludes = linuxSrc;\r
- lin32.headerDirs = includes;\r
- lin32.libraries = "-lX11";\r
-\r
- BuildTarget lin64 = BuildTarget.newDefaultTarget(TargetOs.Linux, true);\r
- lin64.cppIncludes = linuxSrc;\r
- lin64.headerDirs = includes;\r
- lin64.libraries = "-lX11";\r
- \r
- BuildTarget mac = BuildTarget.newDefaultTarget(TargetOs.MacOsX, false);\r
- mac.cppIncludes = macSrc;\r
- mac.headerDirs = includes;\r
- mac.libraries = ""; // FIXME\r
- \r
- new AntScriptGenerator().generate(buildConfig, win32home, win32, win64, lin32, lin64, mac);\r
- if(!BuildExecutor.executeAnt("jni/build-linux32.xml", "-Dhas-compiler=true -v postcompile")) {\r
- throw new Exception("build failed");\r
- }\r
- BuildExecutor.executeAnt("jni/build.xml", "pack-natives");\r
- }\r
-}\r
+
- package com.badlogic.gdx.controllers.desktop;
++package com.badlogic.gdx.controllers;
+
+import com.badlogic.gdx.jnigen.AntScriptGenerator;
+import com.badlogic.gdx.jnigen.BuildConfig;
+import com.badlogic.gdx.jnigen.BuildExecutor;
+import com.badlogic.gdx.jnigen.BuildTarget;
+import com.badlogic.gdx.jnigen.NativeCodeGenerator;
+import com.badlogic.gdx.jnigen.BuildTarget.TargetOs;
+
+public class DesktopControllersBuild {
+ public static void main (String[] args) throws Exception {
+ new NativeCodeGenerator().generate("src/", "bin/", "jni/");
+ BuildConfig buildConfig = new BuildConfig("gdx-controllers-desktop");
- BuildTarget win32home = BuildTarget.newDefaultTarget(TargetOs.Windows, false);
- win32home.buildFileName = "build-windows32home.xml";
- win32home.is64Bit = false;
- win32home.compilerPrefix = "";
- win32home.cppIncludes = new String[] {
- "*.cpp",
++
++ String[] windowsSrc = {"*.cpp",
+ "ois-v1-4svn/src/*.cpp",
+ "ois-v1-4svn/src/win32/*.cpp"
+ };
- win32home.headerDirs = new String[] {
++
++ String[] linuxSrc = { "*.cpp",
++ "ois-v1-4svn/src/*.cpp",
++ "ois-v1-4svn/src/linux/*.cpp"
++ };
++
++ String[] macSrc = { "*.cpp",
++ "ois-v1-4svn/src/*.cpp",
++ "ois-v1-4svn/src/linux/*.cpp"
++ };
++
++ String[] includes = new String[] {
+ "ois-v1-4svn/includes",
+ "dinput/"
+ };
++
++ BuildTarget win32home = BuildTarget.newDefaultTarget(TargetOs.Windows, false);
++ win32home.buildFileName = "build-windows32home.xml";
++ win32home.excludeFromMasterBuildFile = true;
++ win32home.is64Bit = false;
++ win32home.compilerPrefix = "";
++ win32home.cppIncludes = windowsSrc;
++ win32home.headerDirs = includes;
+ win32home.cIncludes = new String[0];
+ win32home.libraries = "-ldinput8 -ldxguid";
++
++ BuildTarget win32 = BuildTarget.newDefaultTarget(TargetOs.Windows, false);
++ win32.cppIncludes = windowsSrc;
++ win32.headerDirs = includes;
++ win32.libraries = "-ldinput8 -ldxguid";
++
++ BuildTarget win64 = BuildTarget.newDefaultTarget(TargetOs.Windows, true);
++ win64.cppIncludes = windowsSrc;
++ win64.headerDirs = includes;
++ win64.libraries = "-ldinput8 -ldxguid";
++
++ BuildTarget lin32 = BuildTarget.newDefaultTarget(TargetOs.Linux, false);
++ lin32.cppIncludes = linuxSrc;
++ lin32.headerDirs = includes;
++ lin32.libraries = "-lX11";
+
- new AntScriptGenerator().generate(buildConfig, win32home);
- if(!BuildExecutor.executeAnt("jni/build-windows32home.xml", "-Dhas-compiler=true -v postcompile")) {
++ BuildTarget lin64 = BuildTarget.newDefaultTarget(TargetOs.Linux, true);
++ lin64.cppIncludes = linuxSrc;
++ lin64.headerDirs = includes;
++ lin64.libraries = "-lX11";
++
++ BuildTarget mac = BuildTarget.newDefaultTarget(TargetOs.MacOsX, false);
++ mac.cppIncludes = macSrc;
++ mac.headerDirs = includes;
++ mac.libraries = ""; // FIXME
++
++ new AntScriptGenerator().generate(buildConfig, win32home, win32, win64, lin32, lin64, mac);
++ if(!BuildExecutor.executeAnt("jni/build-linux32.xml", "-Dhas-compiler=true -v postcompile")) {
+ throw new Exception("build failed");
+ }
+ BuildExecutor.executeAnt("jni/build.xml", "pack-natives");
+ }
+}
// if(System.getProperty("os.name").toLowerCase().contains("windows")) {\r
// inputManager = createInputManager(getWindowHandleWindowsHack());\r
// } else {\r
- inputManager = createInputManager(getWindowHandle());\r
+ inputManagerPtr = createInputManager(getWindowHandle());\r
// }\r
\r
- int count = getJoystickCount(inputManager);\r
- for (int i = 0; i < count; i++) {\r
- joysticks.add(new OisJoystick(createJoystick(inputManager)));\r
+ String[] names = getJoystickNames(inputManagerPtr);\r
+ for (int i = 0, n = names.length; i < n; i++) {\r
- System.out.println(names[i]);\r
- joysticks.add(new OisJoystick(createJoystick(inputManagerPtr)));\r
++ joysticks.add(new OisJoystick(createJoystick(inputManagerPtr), names[i]));\r
}\r
}\r
\r
Centered, North, South, East, West, NorthEast, SouthEast, NorthWest, SouthWest\r
}\r
\r
++ private String name;\r
private long joystickPtr;\r
private final boolean[] buttons;\r
private final float[] axes;\r
private final boolean[] slidersX, slidersY;\r
private OisListener listener;\r
\r
-- public OisJoystick (long joystickPtr) {\r
++ public OisJoystick (long joystickPtr, String name) {\r
this.joystickPtr = joystickPtr;\r
++ this.name = name;\r
initialize(this);\r
buttons = new boolean[getButtonCount()];\r
axes = new float[getAxisCount()];\r
return slidersY[sliderIndex];\r
}\r
\r
++ public String getName () {\r
++ return name;\r
++ }\r
++\r
++ public String toString () {\r
++ return name;\r
++ }\r
++\r
// @off\r
/*JNI\r
#include <OISJoyStick.h>\r
OSDN Git Service
