diff options
| author | Rémi Verschelde | 2018-01-08 08:04:33 +0100 |
|---|---|---|
| committer | GitHub | 2018-01-08 08:04:33 +0100 |
| commit | 06bb4acae04ea45948780c333bb5d9c2b4c45ced (patch) | |
| tree | 8a2c2815418a21ff7549f8427f0094caf4f81364 /platform/android/java | |
| parent | 37ca542d2bfd9aac296e82e30a76117090dea08e (diff) | |
| parent | 8fbb82719e6d1f4e29980d66380474b6a0c45e1d (diff) | |
| download | godot-06bb4acae04ea45948780c333bb5d9c2b4c45ced.tar.gz godot-06bb4acae04ea45948780c333bb5d9c2b4c45ced.tar.zst godot-06bb4acae04ea45948780c333bb5d9c2b4c45ced.zip | |
Diffstat (limited to 'platform/android/java')
| -rw-r--r-- | platform/android/java/src/org/godotengine/godot/Godot.java | 5 | ||||
| -rw-r--r-- | platform/android/java/src/org/godotengine/godot/GodotView.java | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/platform/android/java/src/org/godotengine/godot/Godot.java b/platform/android/java/src/org/godotengine/godot/Godot.java index 37f25cc83..b5b0afb9e 100644 --- a/platform/android/java/src/org/godotengine/godot/Godot.java +++ b/platform/android/java/src/org/godotengine/godot/Godot.java @@ -828,7 +828,6 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC //@Override public boolean dispatchTouchEvent (MotionEvent event) { public boolean gotTouchEvent(final MotionEvent event) { - super.onTouchEvent(event); final int evcount = event.getPointerCount(); if (evcount == 0) return true; @@ -842,6 +841,7 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC arr[i * 3 + 1] = (int)event.getX(i); arr[i * 3 + 2] = (int)event.getY(i); } + final int pointer_idx = event.getPointerId(event.getActionIndex()); //System.out.printf("gaction: %d\n",event.getAction()); final int action = event.getAction() & MotionEvent.ACTION_MASK; @@ -862,13 +862,10 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC */ } break; case MotionEvent.ACTION_POINTER_UP: { - 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)); } break; case MotionEvent.ACTION_POINTER_DOWN: { - int pointer_idx = event.getActionIndex(); GodotLib.touch(3, pointer_idx, evcount, arr); //System.out.printf("%d - s.down at: %f,%f\n",pointer_idx, event.getX(pointer_idx),event.getY(pointer_idx)); } break; diff --git a/platform/android/java/src/org/godotengine/godot/GodotView.java b/platform/android/java/src/org/godotengine/godot/GodotView.java index ca4895a2b..0222758c2 100644 --- a/platform/android/java/src/org/godotengine/godot/GodotView.java +++ b/platform/android/java/src/org/godotengine/godot/GodotView.java @@ -110,7 +110,7 @@ public class GodotView extends GLSurfaceView implements InputDeviceListener { @Override public boolean onTouchEvent(MotionEvent event) { - + super.onTouchEvent(event); return activity.gotTouchEvent(event); }; |