asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #43907 from alan-w-255/fix_android_wrong_multitouch_pointerid

Browse source 
fix android wrong multi-touch pointerid
This commit is contained in:
Rémi Verschelde 2020-12-03 14:49:30 +01:00 committed by GitHub
commit 185520c5b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -182,6 +182,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());
godotView.queueEvent(new Runnable() { godotView.queueEvent(new Runnable() {
@Override @Override
@ -190,12 +191,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;
} }