TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-17 16:47:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up some code

Browse Source
This commit is contained in:
SerpentSpirale 2021-07-19 09:53:06 +02:00
parent 047a9f6043
commit ef05b9c955
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/gamepad/Gamepad.java
View File

@ -124,18 +124,17 @@ public class Gamepad {
CallbackBridge.mouseX += Math.cos(mouseAngle) * acceleration * mouseSensitivity; CallbackBridge.mouseX += Math.cos(mouseAngle) * acceleration * mouseSensitivity;
CallbackBridge.mouseY -= Math.sin(mouseAngle) * acceleration * mouseSensitivity; CallbackBridge.mouseY -= Math.sin(mouseAngle) * acceleration * mouseSensitivity;
if(!CallbackBridge.isGrabbing()) {
CallbackBridge.mouseX = MathUtils.clamp(CallbackBridge.mouseX, 0, CallbackBridge.windowWidth);
CallbackBridge.mouseY = MathUtils.clamp(CallbackBridge.mouseY, 0, CallbackBridge.windowHeight);
}
gameActivity.mouse_x = CallbackBridge.mouseX;
gameActivity.mouse_y = CallbackBridge.mouseY;
gameActivity.runOnUiThread(mouseRunnable); gameActivity.runOnUiThread(mouseRunnable);
if(!CallbackBridge.isGrabbing()){ if(!CallbackBridge.isGrabbing()){
placePointerView((int)(CallbackBridge.mouseX / gameActivity.scaleFactor), (int) (CallbackBridge.mouseY / gameActivity.scaleFactor)); CallbackBridge.mouseX = MathUtils.clamp(CallbackBridge.mouseX, 0, CallbackBridge.windowWidth);
CallbackBridge.mouseY = MathUtils.clamp(CallbackBridge.mouseY, 0, CallbackBridge.windowHeight);
placePointerView((int) (CallbackBridge.mouseX /gameActivity.scaleFactor), (int) (CallbackBridge.mouseY/gameActivity.scaleFactor));
} }
gameActivity.mouse_x = CallbackBridge.mouseX;
gameActivity.mouse_y = CallbackBridge.mouseY;
} }
} }
@ -145,7 +144,7 @@ public class Gamepad {
//Initialize runnables to be used by the input system, avoiding generating one each time is better memory. //Initialize runnables to be used by the input system, avoiding generating one each time is better memory.
mouseRunnable = () -> CallbackBridge.sendCursorPos(gameActivity.mouse_x, gameActivity.mouse_y); mouseRunnable = () -> CallbackBridge.sendCursorPos(CallbackBridge.mouseX, CallbackBridge.mouseY);
switchStateRunnable = () -> { switchStateRunnable = () -> {
currentMap.resetPressedState(); currentMap.resetPressedState();
if(lastGrabbingState){ if(lastGrabbingState){
@ -433,12 +432,7 @@ public class Gamepad {
} }
public static boolean isGamepadEvent(KeyEvent event){ public static boolean isGamepadEvent(KeyEvent event){
return ((event.getSource() & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD return ((event.getSource() & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD
|| GamepadDpad.isDpadEvent(event) ); || GamepadDpad.isDpadEvent(event) );
} }
} }