From 77461a126e1fe2d0586b7683bd8b58cbb700fc64 Mon Sep 17 00:00:00 2001 From: Kyle Luce Date: Sun, 31 May 2015 19:37:19 -0700 Subject: Additional Fix for Multi-touch release problem - Was duplicating the functionality of event.getActionIndex() but was missing the bitmask. - Switched back to getActionIndex() but kept the corrected getPointerId() from change #1980 https://github.com/okamstudio/godot/pull/1908 --- platform/android/java/src/com/android/godot/Godot.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'platform/android/java/src/com') diff --git a/platform/android/java/src/com/android/godot/Godot.java b/platform/android/java/src/com/android/godot/Godot.java index 4f42a1a82b..9b9b1ab2ad 100644 --- a/platform/android/java/src/com/android/godot/Godot.java +++ b/platform/android/java/src/com/android/godot/Godot.java @@ -747,7 +747,7 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC //} } break; case MotionEvent.ACTION_POINTER_UP: { - final int indexPointUp = event.getAction() >> MotionEvent.ACTION_POINTER_INDEX_SHIFT; + final int indexPointUp = event.getActionIndex(); final int pointer_idx = event.getPointerId(indexPointUp); GodotLib.touch(4,pointer_idx,evcount,arr); //System.out.printf("%d - s.up at: %f,%f\n",pointer_idx, event.getX(pointer_idx),event.getY(pointer_idx)); -- cgit v1.2.3