From 9091309ab7d93a74217acaf4943d23e05a112f05 Mon Sep 17 00:00:00 2001 From: Marcel Admiraal Date: Tue, 21 Jun 2022 17:04:42 +0100 Subject: [PATCH] Remove broken scroll gesture on Android --- platform/android/android_input_handler.cpp | 10 ---------- platform/android/android_input_handler.h | 2 -- .../java/lib/src/org/godotengine/godot/GodotLib.java | 5 ----- .../godotengine/godot/input/GodotGestureHandler.java | 9 --------- platform/android/java_godot_lib_jni.cpp | 8 -------- platform/android/java_godot_lib_jni.h | 1 - 6 files changed, 35 deletions(-) diff --git a/platform/android/android_input_handler.cpp b/platform/android/android_input_handler.cpp index a71adee8f7db..3264e53415cb 100644 --- a/platform/android/android_input_handler.cpp +++ b/platform/android/android_input_handler.cpp @@ -317,16 +317,6 @@ void AndroidInputHandler::process_double_tap(int event_android_button_mask, Poin input->parse_input_event(ev); } -void AndroidInputHandler::process_scroll(Point2 p_pos) { - Ref ev; - ev.instance(); - _set_key_modifier_state(ev); - ev->set_position(p_pos); - ev->set_delta(p_pos - scroll_prev_pos); - input->parse_input_event(ev); - scroll_prev_pos = p_pos; -} - int AndroidInputHandler::_button_index_from_mask(int button_mask) { switch (button_mask) { case BUTTON_MASK_LEFT: diff --git a/platform/android/android_input_handler.h b/platform/android/android_input_handler.h index b3983ecd60f9..9be9270298c5 100644 --- a/platform/android/android_input_handler.h +++ b/platform/android/android_input_handler.h @@ -62,7 +62,6 @@ class AndroidInputHandler { private: Vector touch; Point2 hover_prev_pos; // needed to calculate the relative position on hover events - Point2 scroll_prev_pos; // needed to calculate the relative position on scroll events bool alt_mem = false; bool shift_mem = false; @@ -89,7 +88,6 @@ class AndroidInputHandler { void process_hover(int p_type, Point2 p_pos); void process_mouse_event(int event_action, int event_android_buttons_mask, Point2 event_pos, float event_vertical_factor, float event_horizontal_factor); void process_double_tap(int event_android_button_mask, Point2 p_pos); - void process_scroll(Point2 p_pos); void joy_connection_changed(int p_device, bool p_connected, String p_name); }; diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotLib.java b/platform/android/java/lib/src/org/godotengine/godot/GodotLib.java index 8bc3073bc02b..4c5ddec03130 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/GodotLib.java +++ b/platform/android/java/lib/src/org/godotengine/godot/GodotLib.java @@ -105,11 +105,6 @@ public class GodotLib { */ public static native void doubleTap(int buttonMask, int x, int y); - /** - * Forward scroll events from the main thread to the GL thread. - */ - public static native void scroll(int x, int y); - /** * Forward accelerometer sensor events from the main thread to the GL thread. * @see android.hardware.SensorEventListener#onSensorChanged(SensorEvent) diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.java b/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.java index daa5338c6b9e..d63a78bc1fc8 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.java +++ b/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.java @@ -79,15 +79,6 @@ public boolean onDoubleTap(MotionEvent event) { return true; } - @Override - public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) { - //Log.i("GodotGesture", "onScroll"); - final int x = Math.round(distanceX); - final int y = Math.round(distanceY); - GodotLib.scroll(x, y); - return true; - } - @Override public boolean onFling(MotionEvent event1, MotionEvent event2, float velocityX, float velocityY) { //Log.i("GodotGesture", "onFling"); diff --git a/platform/android/java_godot_lib_jni.cpp b/platform/android/java_godot_lib_jni.cpp index f4a43ad932b1..f217b34a2d82 100644 --- a/platform/android/java_godot_lib_jni.cpp +++ b/platform/android/java_godot_lib_jni.cpp @@ -324,14 +324,6 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_doubleTap(JNIEnv *env input_handler->process_double_tap(p_button_mask, Point2(p_x, p_y)); } -// Called on the UI thread -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_scroll(JNIEnv *env, jclass clazz, jint p_x, jint p_y) { - if (step.get() <= 0) { - return; - } - input_handler->process_scroll(Point2(p_x, p_y)); -} - // Called on the UI thread JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joybutton(JNIEnv *env, jclass clazz, jint p_device, jint p_button, jboolean p_pressed) { if (step.get() <= 0) { diff --git a/platform/android/java_godot_lib_jni.h b/platform/android/java_godot_lib_jni.h index f31667d98ab8..b8a638eb82ad 100644 --- a/platform/android/java_godot_lib_jni.h +++ b/platform/android/java_godot_lib_jni.h @@ -50,7 +50,6 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_touch__IIII_3FI(JNIEn JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_touch__IIII_3FIFF(JNIEnv *env, jclass clazz, jint input_device, jint ev, jint pointer, jint pointer_count, jfloatArray positions, jint buttons_mask, jfloat vertical_factor, jfloat horizontal_factor); JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_hover(JNIEnv *env, jclass clazz, jint p_type, jfloat p_x, jfloat p_y); JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_doubleTap(JNIEnv *env, jclass clazz, jint p_button_mask, jint p_x, jint p_y); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_scroll(JNIEnv *env, jclass clazz, jint p_x, jint p_y); JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_key(JNIEnv *env, jclass clazz, jint p_keycode, jint p_scancode, jint p_unicode_char, jboolean p_pressed); JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joybutton(JNIEnv *env, jclass clazz, jint p_device, jint p_button, jboolean p_pressed); JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyaxis(JNIEnv *env, jclass clazz, jint p_device, jint p_axis, jfloat p_value);