AMay/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use RawInputListener for InputManager instead of creating another field.

Browse Source 
Set methods to use JoystickState enum instead of event integers.
This commit is contained in:
James Khan 2019-05-11 20:18:15 +01:00
parent 80adca6dce
commit 682d8c9fd8
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jme3-lwjgl3/src/main/java/com/jme3/input/lwjgl/GlfwJoystickInput.java
View File

@ -49,7 +49,7 @@ import static org.lwjgl.glfw.GLFW.*;
*/ */
public class GlfwJoystickInput implements JoyInput { 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; private RawInputListener listener;
@ -57,7 +57,7 @@ public class GlfwJoystickInput implements JoyInput {
private final Map<JoystickButton, Boolean> joyButtonPressed = new HashMap<>(); private final Map<JoystickButton, Boolean> joyButtonPressed = new HashMap<>();
private InputManager inputManager; // private InputManager inputManager;
private boolean initialized = false; private boolean initialized = false;
@ -68,24 +68,22 @@ public class GlfwJoystickInput implements JoyInput {
} }
} }
public void fireJoystickConnectionEvent(int jid, int event) { public void fireJoystickConnectionEvent(int jid, JoystickState state) {
inputManager.fireJoystickConnectionEvent(jid, event); ((InputManager)listener).fireJoystickConnectionEvent(jid, state);
} }
public void reloadJoysticks() { public void reloadJoysticks() {
joysticks.clear(); joysticks.clear();
if (inputManager != null) { InputManager inputManager = (InputManager) listener;
Joystick[] joysticks = loadJoysticks(inputManager);
inputManager.setJoysticks(joysticks); Joystick[] joysticks = loadJoysticks(inputManager);
} inputManager.setJoysticks(joysticks);
} }
@Override @Override
public Joystick[] loadJoysticks(final InputManager inputManager) { public Joystick[] loadJoysticks(final InputManager inputManager) {
this.inputManager = inputManager;
for (int i = 0; i < GLFW_JOYSTICK_LAST; i++) { for (int i = 0; i < GLFW_JOYSTICK_LAST; i++) {
if (glfwJoystickPresent(i)) { if (glfwJoystickPresent(i)) {
final String name = glfwGetJoystickName(i); final String name = glfwGetJoystickName(i);