Browse Source

fixes android double tap regression

Alexander Holland 5 years ago
parent
commit
dd2fd4e853

+ 1 - 1
platform/android/java/lib/src/org/godotengine/godot/GodotLib.java

@@ -102,7 +102,7 @@ public class GodotLib {
 	/**
 	 * Forward double_tap events from the main thread to the GL thread.
 	 */
-	public static native void double_tap(int x, int y);
+	public static native void doubletap(int x, int y);
 
 	/**
 	 * Forward scroll events from the main thread to the GL thread.

+ 1 - 1
platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.java

@@ -78,7 +78,7 @@ public class GodotGestureHandler extends GestureDetector.SimpleOnGestureListener
 		queueEvent(new Runnable() {
 			@Override
 			public void run() {
-				GodotLib.double_tap(x, y);
+				GodotLib.doubletap(x, y);
 			}
 		});
 		return true;

+ 1 - 1
platform/android/java_godot_lib_jni.cpp

@@ -835,7 +835,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_hover(JNIEnv *env, jo
 	os_android->process_hover(p_type, Point2(p_x, p_y));
 }
 
-JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_double_tap(JNIEnv *env, jobject obj, jint p_x, jint p_y) {
+JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_doubletap(JNIEnv *env, jobject obj, jint p_x, jint p_y) {
 	if (step == 0)
 		return;
 

+ 1 - 1
platform/android/java_godot_lib_jni.h

@@ -46,7 +46,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv *env, job
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_back(JNIEnv *env, jobject obj);
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_touch(JNIEnv *env, jobject obj, jint ev, jint pointer, jint count, jintArray positions);
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_hover(JNIEnv *env, jobject obj, jint p_type, jint p_x, jint p_y);
-JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_double_tap(JNIEnv *env, jobject obj, jint p_x, jint p_y);
+JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_doubletap(JNIEnv *env, jobject obj, jint p_x, jint p_y);
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_scroll(JNIEnv *env, jobject obj, jint p_x, jint p_y);
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_key(JNIEnv *env, jobject obj, jint p_scancode, jint p_unicode_char, jboolean p_pressed);
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joybutton(JNIEnv *env, jobject obj, jint p_device, jint p_button, jboolean p_pressed);