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

Revert square to circle analog work since it seems to be handled correctly already

Browse Source
This commit is contained in:
Cameron Gutman 2014-12-01 22:27:02 -08:00
parent 29fec2e0de
commit d00f78f859
1 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -396,37 +396,12 @@ public class ControllerHandler {
// evaluates the deadzone. // evaluates the deadzone.
} }
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();
// Scale the vector from the square stick to the circular range
stickVector.initialize(
(float)(xSquare * Math.sqrt(1.0 - 0.5*Math.abs(ySquare))),
(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 = populateCachedVector(lsX, lsY); Vector2d leftStickVector = populateCachedVector(lsX, lsY);
// Map to the circular plane before applying the deadzone to ensure
// the effective deadzone area isn't skewed by the transformation
handleAnalogStickPlaneMapping(mapping, leftStickVector);
handleDeadZone(leftStickVector, mapping.leftStickDeadzoneRadius); handleDeadZone(leftStickVector, mapping.leftStickDeadzoneRadius);
leftStickX = (short) (leftStickVector.getX() * 0x7FFE); leftStickX = (short) (leftStickVector.getX() * 0x7FFE);
@ -436,10 +411,6 @@ public class ControllerHandler {
if (mapping.rightStickXAxis != -1 && mapping.rightStickYAxis != -1) { if (mapping.rightStickXAxis != -1 && mapping.rightStickYAxis != -1) {
Vector2d rightStickVector = populateCachedVector(rsX, rsY); Vector2d rightStickVector = populateCachedVector(rsX, rsY);
// Map to the circular plane before applying the deadzone to ensure
// the effective deadzone area isn't skewed by the transformation
handleAnalogStickPlaneMapping(mapping, rightStickVector);
handleDeadZone(rightStickVector, mapping.rightStickDeadzoneRadius); handleDeadZone(rightStickVector, mapping.rightStickDeadzoneRadius);
rightStickX = (short) (rightStickVector.getX() * 0x7FFE); rightStickX = (short) (rightStickVector.getX() * 0x7FFE);
@ -756,9 +727,5 @@ 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;
} }
} }