Fix axis direction not being handled

Author: rolandoislas

android/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.rolandoislas.drcsimclient"
-    android:versionCode="6"
+    android:versionCode="7"
     android:versionName="2.0" >
 
     <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="25" />

core/src/com/rolandoislas/drcsimclient/control/ControlController.java

@@ -6,7 +6,6 @@
 import com.rolandoislas.drcsimclient.config.ConfigKeymap;
 import com.rolandoislas.drcsimclient.data.Constants;
 import com.rolandoislas.drcsimclient.stage.StageControl;
-import com.rolandoislas.drcsimclient.util.logging.Logger;
 
 import java.util.HashMap;
 
@@ -91,16 +90,15 @@ public void update() {
 	private float getJoystickInput(Controller controller, ConfigKeymap.Input input) {
 		if (input.getType() == ConfigKeymap.Input.TYPE_AXIS)
 			return controller.getAxis(input.getInput());
-		else {
-			Logger.warn("Joystick input not set to an axis. Cannot get input.");
+		else
 			return 0;
-		}
 	}
 
 	private boolean isPressed(Controller controller, ConfigKeymap.Input input) {
 		switch (input.getType()) {
 			case ConfigKeymap.Input.TYPE_AXIS:
-				return true;
+				return input.getExtra() == 0 ? controller.getAxis(input.getInput()) < -.2 :
+						controller.getAxis(input.getInput()) > .2;
 			case ConfigKeymap.Input.TYPE_POV:
 				return controller.getPov(input.getInput()).ordinal() == input.getExtra();
 			case ConfigKeymap.Input.TYPE_BUTTON:

core/src/com/rolandoislas/drcsimclient/stage/StageConfigInput.java

@@ -101,7 +101,8 @@ public static String getInputDisplayName(int type, ConfigKeymap config, String k
             return Input.Keys.toString(input.getInput());
         else if (type == CONTROLLER) {
             if (input.getType() == ConfigKeymap.Input.TYPE_AXIS)
-                return String.format(Locale.US, "Axis %d", input.getInput());
+                return String.format(Locale.US, "Axis %d %s", input.getInput(),
+                        input.getExtra() == 0 ? "negative" : "positive");
             else if (input.getType() == ConfigKeymap.Input.TYPE_POV) {
                 String pov = String.valueOf(input.getExtra());
                 for (PovDirection dir : PovDirection.values())
@@ -170,9 +171,17 @@ private void pollInputController() {
                 continue;
             // Check axes
             for (int axis = 0; axis < 1000; axis++) {
-                if (Math.abs(controller.getAxis(axis)) > .2) {
+                float ax = controller.getAxis(axis);
+                if (ax > .5) {
                     input_type = ConfigKeymap.Input.TYPE_AXIS;
                     input = axis;
+                    input_extra = 1; // positive
+                    break main;
+                }
+                else if (ax < -.5) {
+                    input_type = ConfigKeymap.Input.TYPE_AXIS;
+                    input = axis;
+                    input_extra = 0; // negative
                     break main;
                 }
             }