diff options
author | Kyle Luce <razzlegames@gmail.com> | 2015-05-31 19:37:19 -0700 |
---|---|---|
committer | Kyle Luce <razzlegames@gmail.com> | 2015-05-31 19:37:19 -0700 |
commit | 77461a126e1fe2d0586b7683bd8b58cbb700fc64 (patch) | |
tree | 705bf13cf5d167beb7219f1c3e5534e1bfe9250b | |
parent | 07a466f6e6dd28bbb8b917690b634070537f1613 (diff) |
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
-rw-r--r-- | platform/android/java/src/com/android/godot/Godot.java | 2 |
1 files changed, 1 insertions, 1 deletions
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)); |