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

Mitigate android pointer ID swap issue.

Browse Source
This commit is contained in:
SerpentSpirale 2021-08-10 16:50:13 +02:00
parent c5a580bff9
commit 847cc1e3e2
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
View File

@ -321,6 +321,12 @@ public class BaseMainActivity extends LoggableActivity {
* It is due to the mouse passthrough option bundled with the control button. * It is due to the mouse passthrough option bundled with the control button.
*/ */
private boolean shouldBeDown = false; private boolean shouldBeDown = false;
/*
* When the android system has fingers really near to each other, it tends to
* either swap or remove a pointer.
* This variable is here to mitigate the issue.
*/
private int lastPointerCount = 0;
@Override @Override
public boolean onTouch(View p1, MotionEvent e) { public boolean onTouch(View p1, MotionEvent e) {
@ -384,6 +390,8 @@ public class BaseMainActivity extends LoggableActivity {
case MotionEvent.ACTION_UP: // 1 case MotionEvent.ACTION_UP: // 1
case MotionEvent.ACTION_CANCEL: // 3 case MotionEvent.ACTION_CANCEL: // 3
shouldBeDown = false; shouldBeDown = false;
currentPointerID = -1;
if (!isTouchInHotbar) { if (!isTouchInHotbar) {
// -TODO uncomment after fix wrong trigger // -TODO uncomment after fix wrong trigger
if (!rightOverride) CallbackBridge.mouseLeft = false; if (!rightOverride) CallbackBridge.mouseLeft = false;
@ -426,19 +434,26 @@ public class BaseMainActivity extends LoggableActivity {
//Camera movement //Camera movement
if(CallbackBridge.isGrabbing()){ if(CallbackBridge.isGrabbing()){
int pointerIndex = e.findPointerIndex(currentPointerID); int pointerIndex = e.findPointerIndex(currentPointerID);
if(pointerIndex == -1 || !shouldBeDown){ if(pointerIndex == -1 || lastPointerCount != e.getPointerCount() || !shouldBeDown){
shouldBeDown = true; shouldBeDown = true;
currentPointerID = e.getPointerId(0); currentPointerID = e.getPointerId(0);
prevX = e.getX();
prevY = e.getY();
}else{ }else{
mouse_x += (e.getX(pointerIndex) - prevX) * sensitivityFactor; mouse_x += (e.getX(pointerIndex) - prevX) * sensitivityFactor;
mouse_y += (e.getY(pointerIndex) - prevY) * sensitivityFactor; mouse_y += (e.getY(pointerIndex) - prevY) * sensitivityFactor;
prevX = e.getX(pointerIndex);
prevY = e.getY(pointerIndex);
CallbackBridge.sendCursorPos(mouse_x, mouse_y);
} }
prevX = e.getX();
prevY = e.getY();
} }
CallbackBridge.sendCursorPos(mouse_x, mouse_y);
} }
lastPointerCount = e.getPointerCount();
break; break;
} }