godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix android wrong multi-touch pointerid

Browse Source 
Fixes #43519.
This commit is contained in:
alan-w-255 2020-11-27 15:45:07 +08:00 committed by Rémi Verschelde
parent 9a0610c1ff
commit 7fa803fa2c
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java
View File

@ -181,6 +181,7 @@ public class GodotInputHandler implements InputDeviceListener {
arr[i * 3 + 2] = event.getY(i); arr[i * 3 + 2] = event.getY(i);
} }
final int action = event.getActionMasked(); final int action = event.getActionMasked();
final int pointer_idx = event.getPointerId(event.getActionIndex());
mRenderView.queueOnRenderThread(new Runnable() { mRenderView.queueOnRenderThread(new Runnable() {
@Override @Override
@ -189,12 +190,9 @@ public class GodotInputHandler implements InputDeviceListener {
case MotionEvent.ACTION_DOWN: case MotionEvent.ACTION_DOWN:
case MotionEvent.ACTION_CANCEL: case MotionEvent.ACTION_CANCEL:
case MotionEvent.ACTION_UP: case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_MOVE: { case MotionEvent.ACTION_MOVE:
GodotLib.touch(event.getSource(), action, 0, evcount, arr);
} break;
case MotionEvent.ACTION_POINTER_UP: case MotionEvent.ACTION_POINTER_UP:
case MotionEvent.ACTION_POINTER_DOWN: { case MotionEvent.ACTION_POINTER_DOWN: {
int pointer_idx = event.getPointerId(event.getActionIndex());
GodotLib.touch(event.getSource(), action, pointer_idx, evcount, arr); GodotLib.touch(event.getSource(), action, pointer_idx, evcount, arr);
} break; } break;
} }