diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-20 09:00:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-20 09:00:50 +0100 |
| commit | bec9fe2c2af1027a53ec52479527f974e7382090 (patch) | |
| tree | 21a414ee18f854673ed5e2a8406ab64a997a916d /platform/android/java_godot_wrapper.cpp | |
| parent | b0aecb466dbc8a8c67f8aefb8277447f7603e9a5 (diff) | |
| parent | d7b10beb1b856c0a7061a3dc93eac949671093e4 (diff) | |
Merge pull request #37174 from m4gr3d/make_godot_plugin_callbacks_generic
Update the naming scheme for the GodotPlugin's methods
Diffstat (limited to 'platform/android/java_godot_wrapper.cpp')
| -rw-r--r-- | platform/android/java_godot_wrapper.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/android/java_godot_wrapper.cpp b/platform/android/java_godot_wrapper.cpp index 7b677c186e..2a540bb4a9 100644 --- a/platform/android/java_godot_wrapper.cpp +++ b/platform/android/java_godot_wrapper.cpp @@ -66,7 +66,7 @@ GodotJavaWrapper::GodotJavaWrapper(JNIEnv *p_env, jobject p_godot_instance) { _is_activity_resumed = p_env->GetMethodID(cls, "isActivityResumed", "()Z"); _vibrate = p_env->GetMethodID(cls, "vibrate", "(I)V"); _get_input_fallback_mapping = p_env->GetMethodID(cls, "getInputFallbackMapping", "()Ljava/lang/String;"); - _on_gl_godot_main_loop_started = p_env->GetMethodID(cls, "onGLGodotMainLoopStarted", "()V"); + _on_godot_main_loop_started = p_env->GetMethodID(cls, "onGodotMainLoopStarted", "()V"); } GodotJavaWrapper::~GodotJavaWrapper() { @@ -108,13 +108,13 @@ void GodotJavaWrapper::on_video_init(JNIEnv *p_env) { p_env->CallVoidMethod(godot_instance, _on_video_init); } -void GodotJavaWrapper::on_gl_godot_main_loop_started(JNIEnv *p_env) { - if (_on_gl_godot_main_loop_started) { +void GodotJavaWrapper::on_godot_main_loop_started(JNIEnv *p_env) { + if (_on_godot_main_loop_started) { if (p_env == NULL) { p_env = ThreadAndroid::get_env(); } } - p_env->CallVoidMethod(godot_instance, _on_gl_godot_main_loop_started); + p_env->CallVoidMethod(godot_instance, _on_godot_main_loop_started); } void GodotJavaWrapper::restart(JNIEnv *p_env) { |