From 682d8c9fd8b94be6cc83e9421664bf342d0599fb Mon Sep 17 00:00:00 2001 From: James Khan Date: Sat, 11 May 2019 20:18:15 +0100 Subject: [PATCH] Use RawInputListener for InputManager instead of creating another field. Set methods to use JoystickState enum instead of event integers. --- .../jme3/input/lwjgl/GlfwJoystickInput.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/jme3-lwjgl3/src/main/java/com/jme3/input/lwjgl/GlfwJoystickInput.java b/jme3-lwjgl3/src/main/java/com/jme3/input/lwjgl/GlfwJoystickInput.java index be970d5fa..02720379f 100644 --- a/jme3-lwjgl3/src/main/java/com/jme3/input/lwjgl/GlfwJoystickInput.java +++ b/jme3-lwjgl3/src/main/java/com/jme3/input/lwjgl/GlfwJoystickInput.java @@ -49,7 +49,7 @@ import static org.lwjgl.glfw.GLFW.*; */ public class GlfwJoystickInput implements JoyInput { - private static final Logger LOGGER = Logger.getLogger(InputManager.class.getName()); + private static final Logger LOGGER = Logger.getLogger(GlfwJoystickInput.class.getName()); private RawInputListener listener; @@ -57,7 +57,7 @@ public class GlfwJoystickInput implements JoyInput { private final Map joyButtonPressed = new HashMap<>(); - private InputManager inputManager; + // private InputManager inputManager; private boolean initialized = false; @@ -68,24 +68,22 @@ public class GlfwJoystickInput implements JoyInput { } } - public void fireJoystickConnectionEvent(int jid, int event) { - inputManager.fireJoystickConnectionEvent(jid, event); + public void fireJoystickConnectionEvent(int jid, JoystickState state) { + ((InputManager)listener).fireJoystickConnectionEvent(jid, state); } public void reloadJoysticks() { joysticks.clear(); - if (inputManager != null) { - Joystick[] joysticks = loadJoysticks(inputManager); - inputManager.setJoysticks(joysticks); - } + InputManager inputManager = (InputManager) listener; + + Joystick[] joysticks = loadJoysticks(inputManager); + inputManager.setJoysticks(joysticks); } @Override public Joystick[] loadJoysticks(final InputManager inputManager) { - this.inputManager = inputManager; - for (int i = 0; i < GLFW_JOYSTICK_LAST; i++) { if (glfwJoystickPresent(i)) { final String name = glfwGetJoystickName(i);