moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-21 03:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Translate the analog stick values of controllers with "square" analog stick planes (DS3, DS4, and others) to the circular plane that XInput programs expect

Browse Source
This commit is contained in:
Cameron Gutman 2014-11-30 15:35:20 -06:00
parent a835e7aaa2
commit 7985be57ab
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/com/limelight/binding/input/ControllerHandler.java
View File

@ -421,12 +421,32 @@ public class ControllerHandler {
} }
} }
private void handleAnalogStickPlaneMapping(ControllerMapping mapping, Vector2d stickVector) {
if (!mapping.squareAnalogStick) {
// If the stick vector's magnitude exceeds 1.0 (1.1 to be safe), that means
// that the stick isn't behaving like a circular analog stick but like a square
if (stickVector.getMagnitude() > 1.1f) {
mapping.squareAnalogStick = true;
LimeLog.info("Switching to square analog stick mode");
}
}
if (mapping.squareAnalogStick) {
double xSquare = stickVector.getX();
double ySquare = stickVector.getY();
stickVector.setX((float)(xSquare * Math.sqrt(1.0 - 0.5*Math.abs(ySquare))));
stickVector.setY((float)(ySquare * Math.sqrt(1.0 - 0.5*Math.abs(xSquare))));
}
}
private void handleAxisSet(ControllerMapping mapping, float lsX, float lsY, float rsX, private void handleAxisSet(ControllerMapping mapping, float lsX, float lsY, float rsX,
float rsY, float lt, float rt, float hatX, float hatY) { float rsY, float lt, float rt, float hatX, float hatY) {
if (mapping.leftStickXAxis != -1 && mapping.leftStickYAxis != -1) { if (mapping.leftStickXAxis != -1 && mapping.leftStickYAxis != -1) {
Vector2d leftStickVector = handleDeadZone(lsX, lsY, mapping.leftStickDeadzoneRadius); Vector2d leftStickVector = handleDeadZone(lsX, lsY, mapping.leftStickDeadzoneRadius);
handleAnalogStickPlaneMapping(mapping, leftStickVector);
leftStickX = (short) (leftStickVector.getX() * 0x7FFE); leftStickX = (short) (leftStickVector.getX() * 0x7FFE);
leftStickY = (short) (-leftStickVector.getY() * 0x7FFE); leftStickY = (short) (-leftStickVector.getY() * 0x7FFE);
} }
@ -434,6 +454,8 @@ public class ControllerHandler {
if (mapping.rightStickXAxis != -1 && mapping.rightStickYAxis != -1) { if (mapping.rightStickXAxis != -1 && mapping.rightStickYAxis != -1) {
Vector2d rightStickVector = handleDeadZone(rsX, rsY, mapping.rightStickDeadzoneRadius); Vector2d rightStickVector = handleDeadZone(rsX, rsY, mapping.rightStickDeadzoneRadius);
handleAnalogStickPlaneMapping(mapping, rightStickVector);
rightStickX = (short) (rightStickVector.getX() * 0x7FFE); rightStickX = (short) (rightStickVector.getX() * 0x7FFE);
rightStickY = (short) (-rightStickVector.getY() * 0x7FFE); rightStickY = (short) (-rightStickVector.getY() * 0x7FFE);
} }
@ -748,5 +770,9 @@ public class ControllerHandler {
public boolean backIsStart; public boolean backIsStart;
public boolean isRemote; public boolean isRemote;
public boolean hasJoystickAxes; public boolean hasJoystickAxes;
// XInput uses a rounded analog stick where (1.0, 1.0) -> (2^(1/2), 2^(1/2))
// Some controllers have square sticks which we will map onto the circular plane
public boolean squareAnalogStick;
} }
} }