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

Fix[input]: minor gesture handling an positioning issues

Browse Source
This commit is contained in:
artdeell 2024-04-06 08:30:30 -04:00 committed by Maksim Belov
parent b876d3c3a5
commit 1fdb483c1f
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/mouse/InGameEventProcessor.java
View File

@ -41,6 +41,13 @@ public class InGameEventProcessor implements TouchEventProcessor {
@Override
public boolean processTouchEvent(MotionEvent motionEvent) {
boolean hasDoubleTapped = mDoubleTapDetector.onTouchEvent(motionEvent);
boolean hasGuiBarHit = handleGuiBar(motionEvent);
// Handle this gesture separately, outside of the event masking to avoid inconsistencies
// with the double tap detector.
if(hasGuiBarHit && hasDoubleTapped && !LauncherPreferences.PREF_DISABLE_SWAP_HAND) {
CallbackBridge.sendKeyPress(LwjglGlfwKeycode.GLFW_KEY_F);
}
// Handle the rest of the in-game motion.
switch (motionEvent.getActionMasked()) {
case MotionEvent.ACTION_DOWN:
mTracker.startTracking(motionEvent);
@ -49,17 +56,17 @@ public class InGameEventProcessor implements TouchEventProcessor {
break;
case MotionEvent.ACTION_MOVE:
mTracker.trackEvent(motionEvent);
if(!LauncherPreferences.PREF_DISABLE_GESTURES) {
checkGestures(hasGuiBarHit);
}
// Only send new mouse positions if the event hasn't hit the inventory bar.
// Note that the events are sent to the tracker regardless, to prevent cursor
// jumps when leaving the inventory bar in one single touch gesture.
if(hasGuiBarHit) break;
float[] motionVector = mTracker.getMotionVector();
CallbackBridge.mouseX += motionVector[0] * mSensitivity;
CallbackBridge.mouseY += motionVector[1] * mSensitivity;
CallbackBridge.sendCursorPos(CallbackBridge.mouseX, CallbackBridge.mouseY);
boolean hasGuiBarHit = handleGuiBar(motionEvent);
// Handle this gesture separately as it's a separate toggle in settings
if(hasGuiBarHit && hasDoubleTapped && !LauncherPreferences.PREF_DISABLE_SWAP_HAND) {
CallbackBridge.sendKeyPress(LwjglGlfwKeycode.GLFW_KEY_F);
}
if(LauncherPreferences.PREF_DISABLE_GESTURES) break;
checkGestures(hasGuiBarHit);
break;
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL: