Merge pull request #62290 from madmiraal/fix-61816-3.x
[3.x] Remove broken scroll gesture on Android
This commit is contained in:
commit
af4e3cb931
6 changed files with 0 additions and 35 deletions
platform/android
android_input_handler.cppandroid_input_handler.h
java/lib/src/org/godotengine/godot
java_godot_lib_jni.cppjava_godot_lib_jni.h
|
@ -317,16 +317,6 @@ void AndroidInputHandler::process_double_tap(int event_android_button_mask, Poin
|
||||||
input->parse_input_event(ev);
|
input->parse_input_event(ev);
|
||||||
}
|
}
|
||||||
|
|
||||||
void AndroidInputHandler::process_scroll(Point2 p_pos) {
|
|
||||||
Ref<InputEventPanGesture> 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) {
|
int AndroidInputHandler::_button_index_from_mask(int button_mask) {
|
||||||
switch (button_mask) {
|
switch (button_mask) {
|
||||||
case BUTTON_MASK_LEFT:
|
case BUTTON_MASK_LEFT:
|
||||||
|
|
|
@ -62,7 +62,6 @@ public:
|
||||||
private:
|
private:
|
||||||
Vector<TouchPos> touch;
|
Vector<TouchPos> touch;
|
||||||
Point2 hover_prev_pos; // needed to calculate the relative position on hover events
|
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 alt_mem = false;
|
||||||
bool shift_mem = false;
|
bool shift_mem = false;
|
||||||
|
@ -89,7 +88,6 @@ public:
|
||||||
void process_hover(int p_type, Point2 p_pos);
|
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_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_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);
|
void joy_connection_changed(int p_device, bool p_connected, String p_name);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -105,11 +105,6 @@ public class GodotLib {
|
||||||
*/
|
*/
|
||||||
public static native void doubleTap(int buttonMask, int x, int y);
|
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.
|
* Forward accelerometer sensor events from the main thread to the GL thread.
|
||||||
* @see android.hardware.SensorEventListener#onSensorChanged(SensorEvent)
|
* @see android.hardware.SensorEventListener#onSensorChanged(SensorEvent)
|
||||||
|
|
|
@ -79,15 +79,6 @@ public class GodotGestureHandler extends GestureDetector.SimpleOnGestureListener
|
||||||
return true;
|
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
|
@Override
|
||||||
public boolean onFling(MotionEvent event1, MotionEvent event2, float velocityX, float velocityY) {
|
public boolean onFling(MotionEvent event1, MotionEvent event2, float velocityX, float velocityY) {
|
||||||
//Log.i("GodotGesture", "onFling");
|
//Log.i("GodotGesture", "onFling");
|
||||||
|
|
|
@ -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));
|
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
|
// 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) {
|
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) {
|
if (step.get() <= 0) {
|
||||||
|
|
|
@ -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_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_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_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_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_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);
|
JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyaxis(JNIEnv *env, jclass clazz, jint p_device, jint p_axis, jfloat p_value);
|
||||||
|
|
Loading…
Add table
Reference in a new issue