From 2e1aa64958ec767180e8a592cb51e5caa8db92b8 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 12 Dec 2013 21:24:39 -0600 Subject: [Android] Fix joysticks only capable of right/down movements. Also make it capable of using onscreen joystick even if controller 1 is bound. --- .../emulation/overlay/InputOverlayDrawableJoystick.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'Source/Android/src') diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlayDrawableJoystick.java b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlayDrawableJoystick.java index 791e5812e9..4f4e7d669b 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlayDrawableJoystick.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/overlay/InputOverlayDrawableJoystick.java @@ -103,14 +103,10 @@ public final class InputOverlayDrawableJoystick extends BitmapDrawable public float[] getAxisValues() { float[] joyaxises = {0f, 0f, 0f, 0f}; - if (axises[0] >= 0.0f) - joyaxises[1] = Math.min(axises[0], 1.0f); - else - joyaxises[0] = Math.min(Math.abs(axises[0]), 1.0f); - if (axises[1] >= 0.0) - joyaxises[3] = Math.min(axises[1], 1.0f); - else - joyaxises[2] = Math.min(Math.abs(axises[1]), 1.0f); + joyaxises[1] = Math.min(axises[0], 1.0f); + joyaxises[0] = Math.min(axises[0], 0.0f); + joyaxises[3] = Math.min(axises[1], 1.0f); + joyaxises[2] = Math.min(axises[1], 0.0f); return joyaxises; } -- cgit v1.2.3