Merge pull request #980 from fba-rio/patch-2

Fixed call to onJoyButtonEvent()
accellbaker
Paul Speed 6 years ago committed by GitHub
commit 7b0471c43a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 15
      jme3-lwjgl3/src/main/java/com/jme3/input/lwjgl/GlfwJoystickInput.java

@ -52,8 +52,11 @@ public class GlfwJoystickInput implements JoyInput {
private static final Logger LOGGER = Logger.getLogger(InputManager.class.getName());
private RawInputListener listener;
private final Map<Integer, GlfwJoystick> joysticks = new HashMap<>();
private final Map<JoystickButton, Boolean> joyButtonPressed = new HashMap<>();
private boolean initialized = false;
@Override
@ -88,8 +91,11 @@ public class GlfwJoystickInput implements JoyInput {
int buttonIndex = 0;
while (byteBuffer.hasRemaining()) {
byteBuffer.get();
final String logicalId = JoystickCompatibilityMappings.remapComponent(joystick.getName(), String.valueOf(buttonIndex));
joystick.addButton(new DefaultJoystickButton(inputManager, joystick, buttonIndex, String.valueOf(buttonIndex), logicalId));
final JoystickButton button = new DefaultJoystickButton(inputManager, joystick, buttonIndex, String.valueOf(buttonIndex), logicalId);
joystick.addButton(button);
joyButtonPressed.put(button, false);
buttonIndex++;
}
}
@ -133,10 +139,14 @@ public class GlfwJoystickInput implements JoyInput {
for (final JoystickButton button : entry.getValue().getButtons()) {
final boolean pressed = byteBuffer.get(button.getButtonId()) == GLFW_PRESS;
if (joyButtonPressed.get(button) != pressed) {
joyButtonPressed.put(button, pressed);
listener.onJoyButtonEvent(new JoyButtonEvent(button, pressed));
}
}
}
}
@Override
public void destroy() {
@ -213,6 +223,3 @@ public class GlfwJoystickInput implements JoyInput {
}
}
}

Loading…
Cancel
Save