From 23fcaa1bab210c0ab494685c4a3de197dd8268f4 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Wed, 1 Oct 2014 20:24:40 -0700
Subject: [PATCH] Add axis scaling support

---
 libs/limelight-common.jar                     | Bin 418136 -> 418537 bytes
 .../binding/input/ControllerHandler.java      |  25 ++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/libs/limelight-common.jar b/libs/limelight-common.jar
index 4cfafd60d8b25ffab78f8455023f9b7df4d4972f..0348acc13d669b6fa12132b3e7c66957bb28fe05 100644
GIT binary patch
delta 1949
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
Ay8r+H

delta 1526
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
IXu5#709EIuqW}N^

diff --git a/src/com/limelight/binding/input/ControllerHandler.java b/src/com/limelight/binding/input/ControllerHandler.java
index 26d47a18..471ff411 100644
--- a/src/com/limelight/binding/input/ControllerHandler.java
+++ b/src/com/limelight/binding/input/ControllerHandler.java
@@ -47,6 +47,9 @@ public class ControllerHandler {
 	
 	public ControllerHandler(NvConnection conn) {
 		this.conn = conn;
+		
+		// We want limelight-common to scale the axis values to match Xinput values
+		ControllerPacket.enableAxisScaling = true;
 	}
 	
 	private ControllerMapping createMappingForDevice(InputDevice dev) {
@@ -135,6 +138,15 @@ public class ControllerHandler {
 			InputDevice.MotionRange lsYRange = dev.getMotionRange(mapping.leftStickYAxis);
 			if (lsXRange != null && lsYRange != null) {
 				mapping.leftStickDeadzoneRadius = Math.max(lsXRange.getFlat(), lsYRange.getFlat());
+				
+				// If there isn't a (reasonable) deadzone at all, use 20%
+				if (mapping.leftStickDeadzoneRadius < 0.02f) {
+					mapping.leftStickDeadzoneRadius = 0.20f;
+				}
+				// Check that the deadzone is 10% at minimum
+				else if (mapping.leftStickDeadzoneRadius < 0.10f) {
+					mapping.leftStickDeadzoneRadius = 0.10f;
+				}
 			}
 		}
 		
@@ -143,6 +155,15 @@ public class ControllerHandler {
 			InputDevice.MotionRange rsYRange = dev.getMotionRange(mapping.rightStickYAxis);
 			if (rsXRange != null && rsYRange != null) {
 				mapping.rightStickDeadzoneRadius = Math.max(rsXRange.getFlat(), rsYRange.getFlat());
+				
+				// If there isn't a (reasonable) deadzone at all, use 20%
+				if (mapping.rightStickDeadzoneRadius < 0.02f) {
+					mapping.rightStickDeadzoneRadius = 0.20f;
+				}
+				// Check that the deadzone is 10% at minimum
+				else if (mapping.rightStickDeadzoneRadius < 0.10f) {
+					mapping.rightStickDeadzoneRadius = 0.10f;
+				}
 			}
 		}
 		
@@ -242,7 +263,7 @@ public class ControllerHandler {
 			// Scale the input based on the distance from the deadzone
 			inputVector.getNormalized(normalizedInputVector);
 			normalizedInputVector.scalarMultiply((inputVector.getMagnitude() - deadzoneRadius) / (1.0f - deadzoneRadius));
-			
+		
 			// Bound the X value to -1.0 to 1.0
 			if (normalizedInputVector.getX() > 1.0f) {
 				normalizedInputVector.setX(1.0f);
@@ -284,7 +305,7 @@ public class ControllerHandler {
 					event.getAxisValue(mapping.rightStickYAxis), mapping.rightStickDeadzoneRadius);
 			
 			rightStickX = (short)(rightStickVector.getX() * 0x7FFE);
-			rightStickY = (short)(-rightStickVector.getY() * 0x7FFE);	
+			rightStickY = (short)(-rightStickVector.getY() * 0x7FFE);
 		}
 		
 		// Handle controllers with analog triggers