moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-20 11:33:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add axis scaling support

Browse Source
This commit is contained in:
Cameron Gutman 2014-10-01 20:24:40 -07:00
parent ad684a6f6b
commit 23fcaa1bab
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
libs/limelight-common.jar
View File

Binary file not shown.

25
src/com/limelight/binding/input/ControllerHandler.java
View File

@ -47,6 +47,9 @@ public class ControllerHandler {
public ControllerHandler(NvConnection conn) { public ControllerHandler(NvConnection conn) {
this.conn = 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) { private ControllerMapping createMappingForDevice(InputDevice dev) {
@ -135,6 +138,15 @@ public class ControllerHandler {
InputDevice.MotionRange lsYRange = dev.getMotionRange(mapping.leftStickYAxis); InputDevice.MotionRange lsYRange = dev.getMotionRange(mapping.leftStickYAxis);
if (lsXRange != null && lsYRange != null) { if (lsXRange != null && lsYRange != null) {
mapping.leftStickDeadzoneRadius = Math.max(lsXRange.getFlat(), lsYRange.getFlat()); 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); InputDevice.MotionRange rsYRange = dev.getMotionRange(mapping.rightStickYAxis);
if (rsXRange != null && rsYRange != null) { if (rsXRange != null && rsYRange != null) {
mapping.rightStickDeadzoneRadius = Math.max(rsXRange.getFlat(), rsYRange.getFlat()); 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 // Scale the input based on the distance from the deadzone
inputVector.getNormalized(normalizedInputVector); inputVector.getNormalized(normalizedInputVector);
normalizedInputVector.scalarMultiply((inputVector.getMagnitude() - deadzoneRadius) / (1.0f - deadzoneRadius)); normalizedInputVector.scalarMultiply((inputVector.getMagnitude() - deadzoneRadius) / (1.0f - deadzoneRadius));
// Bound the X value to -1.0 to 1.0 // Bound the X value to -1.0 to 1.0
if (normalizedInputVector.getX() > 1.0f) { if (normalizedInputVector.getX() > 1.0f) {
normalizedInputVector.setX(1.0f); normalizedInputVector.setX(1.0f);
@ -284,7 +305,7 @@ public class ControllerHandler {
event.getAxisValue(mapping.rightStickYAxis), mapping.rightStickDeadzoneRadius); event.getAxisValue(mapping.rightStickYAxis), mapping.rightStickDeadzoneRadius);
rightStickX = (short)(rightStickVector.getX() * 0x7FFE); rightStickX = (short)(rightStickVector.getX() * 0x7FFE);
rightStickY = (short)(-rightStickVector.getY() * 0x7FFE); rightStickY = (short)(-rightStickVector.getY() * 0x7FFE);
} }
// Handle controllers with analog triggers // Handle controllers with analog triggers