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

Try to fix trigger left mouse while moving camera

Browse Source
This commit is contained in:
khanhduytran0 2020-09-26 19:01:56 +07:00
parent 909cd35ef1
commit 1bf8b47512
2 changed files with 103 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
app/src/main/java/net/kdt/pojavlaunch/MainActivity.java
View File

@ -325,7 +325,6 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O
} }
}).start(); }).start();
// ORIGINAL Touch pad
touchPad.setOnTouchListener(new OnTouchListener(){ touchPad.setOnTouchListener(new OnTouchListener(){
private float prevX, prevY; private float prevX, prevY;
@Override @Override
@ -403,7 +402,92 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O
public boolean onTouch(View p1, MotionEvent e) public boolean onTouch(View p1, MotionEvent e)
{ {
// System.out.println("Pre touch, isTouchInHotbar=" + Boolean.toString(isTouchInHotbar) + ", action=" + MotionEvent.actionToString(e.getActionMasked())); // System.out.println("Pre touch, isTouchInHotbar=" + Boolean.toString(isTouchInHotbar) + ", action=" + MotionEvent.actionToString(e.getActionMasked()));
int x = ((int) e.getX()) / scaleFactor;
int y = (CallbackBridge.windowHeight - ((int) e.getY())) / scaleFactor;
int hudKeyHandled = handleGuiBar(x, y, e);
if (!CallbackBridge.isGrabbing() && gestureDetector.onTouchEvent(e)) {
if (hudKeyHandled != -1) {
sendKeyPress(hudKeyHandled);
} else {
CallbackBridge.putMouseEventWithCoords(rightOverride ? (byte) 1 : (byte) 0, (byte) 1, x, y, 0, System.nanoTime());
CallbackBridge.putMouseEventWithCoords(rightOverride ? (byte) 1 : (byte) 0, (byte) 0, x, y, 0, System.nanoTime());
if (!rightOverride) {
CallbackBridge.mouseLeft = true;
}
}
} else {
switch (e.getActionMasked()) {
case MotionEvent.ACTION_DOWN: // 0
case MotionEvent.ACTION_POINTER_DOWN: // 5
isTouchInHotbar = hudKeyHandled != -1;
if (isTouchInHotbar) {
sendKeyPress(hudKeyHandled, 0, true);
hotbarX = x;
hotbarY = y;
theHandler.sendEmptyMessageDelayed(MainActivity.MSG_DROP_ITEM_BUTTON_CHECK, LauncherPreferences.PREF_LONGPRESS_TRIGGER);
} else {
CallbackBridge.mouseX = x;
CallbackBridge.mouseY = y;
if (!rightOverride) {
CallbackBridge.mouseLeft = true;
}
if (CallbackBridge.isGrabbing()) {
CallbackBridge.putMouseEventWithCoords(rightOverride ? (byte) 1 : (byte) 0, (byte) 1, x, y, 0, System.nanoTime());
initialX = x;
initialY = y;
theHandler.sendEmptyMessageDelayed(MainActivity.MSG_LEFT_MOUSE_BUTTON_CHECK, LauncherPreferences.PREF_LONGPRESS_TRIGGER);
}
}
break;
case MotionEvent.ACTION_UP: // 1
case MotionEvent.ACTION_CANCEL: // 3
case MotionEvent.ACTION_POINTER_UP: // 6
if (!isTouchInHotbar) {
CallbackBridge.mouseX = x;
CallbackBridge.mouseY = y;
// TODO uncomment after fix wrong trigger
// CallbackBridge.putMouseEventWithCoords(rightOverride ? (byte) 1 : (byte) 0, (byte) 0, x, y, 0, System.nanoTime());
if (!rightOverride) {
CallbackBridge.mouseLeft = false;
}
}
if (CallbackBridge.isGrabbing()) {
// System.out.println((String) ("[Math.abs(" + initialX + " - " + x + ") = " + Math.abs(initialX - x) + "] < " + fingerStillThreshold));
// System.out.println((String) ("[Math.abs(" + initialY + " - " + y + ") = " + Math.abs(initialY - y) + "] < " + fingerStillThreshold));
if (isTouchInHotbar && Math.abs(hotbarX - x) < fingerStillThreshold && Math.abs(hotbarY - y) < fingerStillThreshold) {
sendKeyPress(hudKeyHandled, 0, false);
} else if (!triggeredLeftMouseButton && Math.abs(initialX - x) < fingerStillThreshold && Math.abs(initialY - y) < fingerStillThreshold) {
sendMouseButton(1, true);
sendMouseButton(1, false);
}
if (!isTouchInHotbar) {
if (triggeredLeftMouseButton) {
sendMouseButton(0, false);
}
triggeredLeftMouseButton = false;
theHandler.removeMessages(MainActivity.MSG_LEFT_MOUSE_BUTTON_CHECK);
} else {
sendKeyPress(LWJGLGLFWKeycode.GLFW_KEY_Q, 0, false);
theHandler.removeMessages(MSG_DROP_ITEM_BUTTON_CHECK);
}
}
break;
default:
if (!isTouchInHotbar) {
CallbackBridge.mouseX = x;
CallbackBridge.mouseY = y;
}
break;
}
}
/*
int x = ((int) e.getX()) / scaleFactor; int x = ((int) e.getX()) / scaleFactor;
int y = (minecraftGLView.getHeight() - ((int) e.getY())) / scaleFactor; int y = (minecraftGLView.getHeight() - ((int) e.getY())) / scaleFactor;
int hudKeyHandled = handleGuiBar(x, y, e); int hudKeyHandled = handleGuiBar(x, y, e);
@ -432,11 +516,11 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O
theHandler.sendEmptyMessageDelayed(MainActivity.MSG_DROP_ITEM_BUTTON_CHECK, LauncherPreferences.PREF_LONGPRESS_TRIGGER); theHandler.sendEmptyMessageDelayed(MainActivity.MSG_DROP_ITEM_BUTTON_CHECK, LauncherPreferences.PREF_LONGPRESS_TRIGGER);
} else { } else {
CallbackBridge.sendCursorPos(x, CallbackBridge.windowHeight - y); CallbackBridge.sendCursorPos(x, CallbackBridge.windowHeight - y);
/*
if (!rightOverride) { // if (!rightOverride)
CallbackBridge.mouseLeft = true; // CallbackBridge.mouseLeft = true;
}
*/
if (CallbackBridge.isGrabbing()) { if (CallbackBridge.isGrabbing()) {
CallbackBridge.sendMouseKeycode(rightOverride ? LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT : LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_LEFT, 0, true); CallbackBridge.sendMouseKeycode(rightOverride ? LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT : LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_LEFT, 0, true);
@ -486,8 +570,10 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O
CallbackBridge.sendCursorPos(x, CallbackBridge.windowHeight - y); CallbackBridge.sendCursorPos(x, CallbackBridge.windowHeight - y);
} }
break; break;
} }
} }
*/
debugText.setText(CallbackBridge.DEBUG_STRING.toString()); debugText.setText(CallbackBridge.DEBUG_STRING.toString());
CallbackBridge.DEBUG_STRING.setLength(0); CallbackBridge.DEBUG_STRING.setLength(0);
@ -794,9 +880,14 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O
if (CallbackBridge.isGrabbing()) { if (CallbackBridge.isGrabbing()) {
sendMouseButton(1, isDown); sendMouseButton(1, isDown);
} else { } else {
/*
if (!isDown) { if (!isDown) {
CallbackBridge.sendMouseEvent(CallbackBridge.mouseX, CallbackBridge.mouseY, LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT); CallbackBridge.putMouseEventWithCoords(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT, CallbackBridge.mouseX, CallbackBridge.mouseY);
} }
*/
CallbackBridge.putMouseEventWithCoords(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT, isDown ? 1 : 0, CallbackBridge.mouseX, CallbackBridge.mouseY, 0, 0l);
setRightOverride(isDown); setRightOverride(isDown);
} break; } break;
case R.id.control_debug: sendKeyPress(LWJGLGLFWKeycode.GLFW_KEY_F3, 0, isDown); break; case R.id.control_debug: sendKeyPress(LWJGLGLFWKeycode.GLFW_KEY_F3, 0, isDown); break;
@ -1088,6 +1179,8 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O
public void sendMouseButton(int button, boolean status) { public void sendMouseButton(int button, boolean status) {
// TODO implement this method!!! // TODO implement this method!!!
// CallbackBridge.setMouseButtonInGrabMode((byte) button, status ? (byte) 1 : (byte) 0); // CallbackBridge.setMouseButtonInGrabMode((byte) button, status ? (byte) 1 : (byte) 0);
// or
CallbackBridge.sendMouseKeycode(button, 0, status);
} }
public void calculateMcScale() { public void calculateMcScale() {

10
app/src/main/java/org/lwjgl/glfw/CallbackBridge.java
View File

@ -1,6 +1,7 @@
package org.lwjgl.glfw; package org.lwjgl.glfw;
import java.io.*; import java.io.*;
import java.util.*; import java.util.*;
import android.widget.*;
public class CallbackBridge { public class CallbackBridge {
public static final int JRE_TYPE_CURSOR_POS = 0; public static final int JRE_TYPE_CURSOR_POS = 0;
@ -19,14 +20,9 @@ public class CallbackBridge {
volatile private static boolean isGrabbing = false; volatile private static boolean isGrabbing = false;
public static void sendMouseEvent(int x, int y, int keycode) { public static void putMouseEventWithCoords(int button, int state, int x, int y, int dz, long nanos) {
sendCursorPos(x, y); sendCursorPos(x, y);
sendMouseKeycode(keycode); sendMouseKeycode(button, 0, state == 1);
}
public static void sendMouseEvent(int x, int y, int keycode, boolean isDown) {
sendCursorPos(x, y);
sendMouseKeycode(keycode, 0, isDown);
} }
public static void sendCursorPos(int x, int y) { public static void sendCursorPos(int x, int y) {