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

Fix snapping into the deadzone when using analog sticks

Browse Source
This commit is contained in:
Cameron Gutman 2016-01-19 19:54:52 -05:00
parent fd4caac013
commit 63d6f3ac78
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/limelight/binding/input/virtual_controller/AnalogStick.java
View File

@ -239,12 +239,7 @@ public class AnalogStick extends VirtualControllerElement {
canvas.drawCircle(getWidth() / 2, getHeight() / 2, radius_analog_stick, paint); canvas.drawCircle(getWidth() / 2, getHeight() / 2, radius_analog_stick, paint);
break; break;
} }
case MOVED_IN_DEAD_ZONE: { case MOVED_IN_DEAD_ZONE:
paint.setColor(getDefaultColor());
canvas.drawCircle(position_stick_x, position_stick_y, radius_analog_stick, paint);
break;
}
case MOVED_ACTIVE: { case MOVED_ACTIVE: {
paint.setColor(pressedColor); paint.setColor(pressedColor);
canvas.drawCircle(position_stick_x, position_stick_y, radius_analog_stick, paint); canvas.drawCircle(position_stick_x, position_stick_y, radius_analog_stick, paint);
@ -265,8 +260,9 @@ public class AnalogStick extends VirtualControllerElement {
position_stick_x = getWidth() / 2 - correlated_x; position_stick_x = getWidth() / 2 - correlated_x;
position_stick_y = getHeight() / 2 - correlated_y; position_stick_y = getHeight() / 2 - correlated_y;
// set active depending on dead zone // Stay active even if we're back in the deadzone because we know the user is actively
stick_state = movement_radius > radius_dead_zone ? // giving analog stick input and we don't want to snap back into the deadzone.
stick_state = (stick_state == STICK_STATE.MOVED_ACTIVE || movement_radius > radius_dead_zone) ?
STICK_STATE.MOVED_ACTIVE : STICK_STATE.MOVED_IN_DEAD_ZONE; STICK_STATE.MOVED_ACTIVE : STICK_STATE.MOVED_IN_DEAD_ZONE;
// trigger move event if state active // trigger move event if state active