diff options
-rw-r--r-- | platform/android/AndroidManifest.xml.template | 4 | ||||
-rw-r--r-- | platform/android/audio_driver_jandroid.cpp | 4 | ||||
-rw-r--r-- | platform/android/export/export.cpp | 2 | ||||
-rw-r--r-- | platform/android/godot_android.cpp | 22 | ||||
-rw-r--r-- | platform/android/java/src/org/godotengine/godot/Dictionary.java (renamed from platform/android/java/src/com/android/godot/Dictionary.java) | 2 | ||||
-rw-r--r-- | platform/android/java/src/org/godotengine/godot/Godot.java (renamed from platform/android/java/src/com/android/godot/Godot.java) | 6 | ||||
-rw-r--r-- | platform/android/java/src/org/godotengine/godot/GodotDownloaderAlarmReceiver.java (renamed from platform/android/java/src/com/android/godot/GodotDownloaderAlarmReceiver.java) | 2 | ||||
-rw-r--r-- | platform/android/java/src/org/godotengine/godot/GodotDownloaderService.java (renamed from platform/android/java/src/com/android/godot/GodotDownloaderService.java) | 2 | ||||
-rw-r--r-- | platform/android/java/src/org/godotengine/godot/GodotIO.java (renamed from platform/android/java/src/com/android/godot/GodotIO.java) | 4 | ||||
-rw-r--r-- | platform/android/java/src/org/godotengine/godot/GodotLib.java (renamed from platform/android/java/src/com/android/godot/GodotLib.java) | 2 | ||||
-rw-r--r-- | platform/android/java/src/org/godotengine/godot/GodotPaymentV3.java (renamed from platform/android/java/src/com/android/godot/GodotPaymentV3.java) | 4 | ||||
-rw-r--r-- | platform/android/java/src/org/godotengine/godot/GodotView.java (renamed from platform/android/java/src/com/android/godot/GodotView.java) | 2 | ||||
-rw-r--r-- | platform/android/java/src/org/godotengine/godot/input/GodotEditText.java (renamed from platform/android/java/src/com/android/godot/input/GodotEditText.java) | 4 | ||||
-rw-r--r-- | platform/android/java/src/org/godotengine/godot/input/GodotTextInputWrapper.java (renamed from platform/android/java/src/com/android/godot/input/GodotTextInputWrapper.java) | 4 | ||||
-rw-r--r-- | platform/android/java/src/org/godotengine/godot/payments/ConsumeTask.java (renamed from platform/android/java/src/com/android/godot/payments/ConsumeTask.java) | 2 | ||||
-rw-r--r-- | platform/android/java/src/org/godotengine/godot/payments/GenericConsumeTask.java (renamed from platform/android/java/src/com/android/godot/payments/GenericConsumeTask.java) | 2 | ||||
-rw-r--r-- | platform/android/java/src/org/godotengine/godot/payments/HandlePurchaseTask.java (renamed from platform/android/java/src/com/android/godot/payments/HandlePurchaseTask.java) | 6 | ||||
-rw-r--r-- | platform/android/java/src/org/godotengine/godot/payments/PaymentsCache.java (renamed from platform/android/java/src/com/android/godot/payments/PaymentsCache.java) | 2 | ||||
-rw-r--r-- | platform/android/java/src/org/godotengine/godot/payments/PaymentsManager.java (renamed from platform/android/java/src/com/android/godot/payments/PaymentsManager.java) | 8 | ||||
-rw-r--r-- | platform/android/java/src/org/godotengine/godot/payments/PurchaseTask.java (renamed from platform/android/java/src/com/android/godot/payments/PurchaseTask.java) | 6 | ||||
-rw-r--r-- | platform/android/java/src/org/godotengine/godot/payments/ReleaseAllConsumablesTask.java (renamed from platform/android/java/src/com/android/godot/payments/ReleaseAllConsumablesTask.java) | 6 | ||||
-rw-r--r-- | platform/android/java/src/org/godotengine/godot/payments/ValidateTask.java (renamed from platform/android/java/src/com/android/godot/payments/ValidateTask.java) | 14 | ||||
-rw-r--r-- | platform/android/java/src/org/godotengine/godot/utils/Crypt.java (renamed from platform/android/java/src/com/android/godot/utils/Crypt.java) | 2 | ||||
-rw-r--r-- | platform/android/java/src/org/godotengine/godot/utils/CustomSSLSocketFactory.java (renamed from platform/android/java/src/com/android/godot/utils/CustomSSLSocketFactory.java) | 2 | ||||
-rw-r--r-- | platform/android/java/src/org/godotengine/godot/utils/HttpRequester.java (renamed from platform/android/java/src/com/android/godot/utils/HttpRequester.java) | 2 | ||||
-rw-r--r-- | platform/android/java/src/org/godotengine/godot/utils/RequestParams.java (renamed from platform/android/java/src/com/android/godot/utils/RequestParams.java) | 2 | ||||
-rw-r--r-- | platform/android/java_class_wrapper.cpp | 2 | ||||
-rw-r--r-- | platform/android/java_glue.cpp | 56 | ||||
-rw-r--r-- | platform/android/java_glue.h | 36 |
29 files changed, 106 insertions, 106 deletions
diff --git a/platform/android/AndroidManifest.xml.template b/platform/android/AndroidManifest.xml.template index 9fd52f6438..37dee4a9a5 100644 --- a/platform/android/AndroidManifest.xml.template +++ b/platform/android/AndroidManifest.xml.template @@ -11,7 +11,7 @@ android:xlargeScreens="true"/> <application android:label="@string/godot_project_name_string" android:icon="@drawable/icon" android:allowBackup="false" $$ADD_APPATTRIBUTE_CHUNKS$$ > - <activity android:name="com.android.godot.Godot" + <activity android:name="org.godotengine.godot.Godot" android:label="@string/godot_project_name_string" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:launchMode="singleTask" @@ -23,7 +23,7 @@ <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> - <service android:name="com.android.godot.GodotDownloaderService" /> + <service android:name="org.godotengine.godot.GodotDownloaderService" /> diff --git a/platform/android/audio_driver_jandroid.cpp b/platform/android/audio_driver_jandroid.cpp index 1ce70673b9..6d428e3fe5 100644 --- a/platform/android/audio_driver_jandroid.cpp +++ b/platform/android/audio_driver_jandroid.cpp @@ -147,13 +147,13 @@ void AudioDriverAndroid::setup( jobject p_io) { void AudioDriverAndroid::thread_func(JNIEnv *env) { - jclass cls = env->FindClass("com/android/godot/Godot"); + jclass cls = env->FindClass("org/godotengine/godot/Godot"); if (cls) { cls=(jclass)env->NewGlobalRef(cls); __android_log_print(ANDROID_LOG_INFO,"godot","*******CLASS FOUND!!!"); } - jfieldID fid = env->GetStaticFieldID(cls, "io", "Lcom/android/godot/GodotIO;"); + jfieldID fid = env->GetStaticFieldID(cls, "io", "Lorg/godotengine/godot/GodotIO;"); jobject ob = env->GetStaticObjectField(cls,fid); jobject gob = env->NewGlobalRef(ob); jclass c = env->GetObjectClass(gob); diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 7d550f4fa0..c908f6729b 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -1569,7 +1569,7 @@ Error EditorExportPlatformAndroid::run(int p_device, int p_flags) { args.push_back("-a"); args.push_back("android.intent.action.MAIN"); args.push_back("-n"); - args.push_back(get_package_name()+"/com.android.godot.Godot"); + args.push_back(get_package_name()+"/org.godotengine.godot.Godot"); err = OS::get_singleton()->execute(adb,args,true,NULL,NULL,&rv); if (err || rv!=0) { diff --git a/platform/android/godot_android.cpp b/platform/android/godot_android.cpp index b645847d40..f9feb3481f 100644 --- a/platform/android/godot_android.cpp +++ b/platform/android/godot_android.cpp @@ -50,9 +50,9 @@ extern "C" { - JNIEXPORT void JNICALL Java_com_android_godot_Godot_registerSingleton(JNIEnv * env, jobject obj, jstring name,jobject p_object); - JNIEXPORT void JNICALL Java_com_android_godot_Godot_registerMethod(JNIEnv * env, jobject obj, jstring sname, jstring name, jstring ret, jobjectArray args); - JNIEXPORT jstring JNICALL Java_com_android_godot_Godot_getGlobal(JNIEnv * env, jobject obj, jstring path); + JNIEXPORT void JNICALL Java_org_godotengine_godot_Godot_registerSingleton(JNIEnv * env, jobject obj, jstring name,jobject p_object); + JNIEXPORT void JNICALL Java_org_godotengine_godot_Godot_registerMethod(JNIEnv * env, jobject obj, jstring sname, jstring name, jstring ret, jobjectArray args); + JNIEXPORT jstring JNICALL Java_org_godotengine_godot_Godot_getGlobal(JNIEnv * env, jobject obj, jstring path); }; class JNISingleton : public Object { @@ -671,12 +671,12 @@ static void engine_handle_cmd(struct android_app* app, int32_t cmd) { static JNINativeMethod methods[] = { - {"registerSingleton", "(Ljava/lang/String;Ljava/lang/Object;)V",(void *)&Java_com_android_godot_Godot_registerSingleton}, - {"registerMethod", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V",(void *)&Java_com_android_godot_Godot_registerMethod}, - {"getGlobal", "(Ljava/lang/String;)Ljava/lang/String;", (void *)&Java_com_android_godot_Godot_getGlobal}, + {"registerSingleton", "(Ljava/lang/String;Ljava/lang/Object;)V",(void *)&Java_org_godotengine_godot_Godot_registerSingleton}, + {"registerMethod", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)V",(void *)&Java_org_godotengine_godot_Godot_registerMethod}, + {"getGlobal", "(Ljava/lang/String;)Ljava/lang/String;", (void *)&Java_org_godotengine_godot_Godot_getGlobal}, }; - jstring gstrClassName = engine->jni->NewStringUTF("com/android/godot/Godot"); + jstring gstrClassName = engine->jni->NewStringUTF("org/godotengine/godot/Godot"); jclass GodotClass = (jclass)engine->jni->CallObjectMethod(cls, findClass, gstrClassName); __android_log_print(ANDROID_LOG_INFO,"godot","godot ****^*^*?^*^*class data %x",GodotClass); @@ -692,7 +692,7 @@ static void engine_handle_cmd(struct android_app* app, int32_t cmd) { jclass singletonClass = (jclass)engine->jni->CallObjectMethod(cls, findClass, strClassName); __android_log_print(ANDROID_LOG_INFO,"godot","****^*^*?^*^*class data %x",singletonClass); - jmethodID initialize = engine->jni->GetStaticMethodID(singletonClass, "initialize", "(Landroid/app/Activity;)Lcom/android/godot/Godot$SingletonBase;"); + jmethodID initialize = engine->jni->GetStaticMethodID(singletonClass, "initialize", "(Landroid/app/Activity;)Lorg/godotengine/godot/Godot$SingletonBase;"); jobject obj = engine->jni->CallStaticObjectMethod(singletonClass,initialize,app->activity->clazz); @@ -863,7 +863,7 @@ void android_main(struct android_app* state) { -JNIEXPORT void JNICALL Java_com_android_godot_Godot_registerSingleton(JNIEnv * env, jobject obj, jstring name,jobject p_object){ +JNIEXPORT void JNICALL Java_org_godotengine_godot_Godot_registerSingleton(JNIEnv * env, jobject obj, jstring name,jobject p_object){ String singname = env->GetStringUTFChars( name, NULL ); JNISingleton *s = memnew( JNISingleton ); @@ -938,7 +938,7 @@ static const char* get_jni_sig(const String& p_type) { return ""; } -JNIEXPORT jstring JNICALL Java_com_android_godot_Godot_getGlobal(JNIEnv * env, jobject obj, jstring path) { +JNIEXPORT jstring JNICALL Java_org_godotengine_godot_Godot_getGlobal(JNIEnv * env, jobject obj, jstring path) { String js = env->GetStringUTFChars( path, NULL ); @@ -949,7 +949,7 @@ JNIEXPORT jstring JNICALL Java_com_android_godot_Godot_getGlobal(JNIEnv * env, j -JNIEXPORT void JNICALL Java_com_android_godot_Godot_registerMethod(JNIEnv * env, jobject obj, jstring sname, jstring name, jstring ret, jobjectArray args){ +JNIEXPORT void JNICALL Java_org_godotengine_godot_Godot_registerMethod(JNIEnv * env, jobject obj, jstring sname, jstring name, jstring ret, jobjectArray args){ String singname = env->GetStringUTFChars( sname, NULL ); diff --git a/platform/android/java/src/com/android/godot/Dictionary.java b/platform/android/java/src/org/godotengine/godot/Dictionary.java index 4ed12f5818..34051c4bb8 100644 --- a/platform/android/java/src/com/android/godot/Dictionary.java +++ b/platform/android/java/src/org/godotengine/godot/Dictionary.java @@ -26,7 +26,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package com.android.godot; +package org.godotengine.godot; import java.util.HashMap; import java.util.Set; diff --git a/platform/android/java/src/com/android/godot/Godot.java b/platform/android/java/src/org/godotengine/godot/Godot.java index 4c5a313576..6aa5d24f1c 100644 --- a/platform/android/java/src/com/android/godot/Godot.java +++ b/platform/android/java/src/org/godotengine/godot/Godot.java @@ -26,7 +26,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package com.android.godot; +package org.godotengine.godot; import android.R; import android.app.Activity; @@ -60,14 +60,14 @@ import java.lang.reflect.Method; import java.util.List; import java.util.ArrayList; -import com.android.godot.payments.PaymentsManager; +import org.godotengine.godot.payments.PaymentsManager; import java.io.IOException; import android.provider.Settings.Secure; import android.widget.FrameLayout; -import com.android.godot.input.*; +import org.godotengine.godot.input.*; import java.io.InputStream; import javax.microedition.khronos.opengles.GL10; diff --git a/platform/android/java/src/com/android/godot/GodotDownloaderAlarmReceiver.java b/platform/android/java/src/org/godotengine/godot/GodotDownloaderAlarmReceiver.java index e82c3eb0fe..b602f4757c 100644 --- a/platform/android/java/src/com/android/godot/GodotDownloaderAlarmReceiver.java +++ b/platform/android/java/src/org/godotengine/godot/GodotDownloaderAlarmReceiver.java @@ -1,4 +1,4 @@ -package com.android.godot; +package org.godotengine.godot; import com.google.android.vending.expansion.downloader.DownloaderClientMarshaller; diff --git a/platform/android/java/src/com/android/godot/GodotDownloaderService.java b/platform/android/java/src/org/godotengine/godot/GodotDownloaderService.java index 2657edc1d2..6735d387f3 100644 --- a/platform/android/java/src/com/android/godot/GodotDownloaderService.java +++ b/platform/android/java/src/org/godotengine/godot/GodotDownloaderService.java @@ -1,4 +1,4 @@ -package com.android.godot; +package org.godotengine.godot; import android.content.Context; import android.content.SharedPreferences; diff --git a/platform/android/java/src/com/android/godot/GodotIO.java b/platform/android/java/src/org/godotengine/godot/GodotIO.java index a7dc0c2f75..071d090e8b 100644 --- a/platform/android/java/src/com/android/godot/GodotIO.java +++ b/platform/android/java/src/org/godotengine/godot/GodotIO.java @@ -26,7 +26,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package com.android.godot; +package org.godotengine.godot; import java.util.HashMap; import java.util.Locale; import android.net.Uri; @@ -47,7 +47,7 @@ import android.media.*; import android.hardware.*; import android.content.*; import android.content.pm.ActivityInfo; -import com.android.godot.input.*; +import org.godotengine.godot.input.*; //android.os.Build // Wrapper for native library diff --git a/platform/android/java/src/com/android/godot/GodotLib.java b/platform/android/java/src/org/godotengine/godot/GodotLib.java index 3d870b3b1f..ddbcf2e5c6 100644 --- a/platform/android/java/src/com/android/godot/GodotLib.java +++ b/platform/android/java/src/org/godotengine/godot/GodotLib.java @@ -26,7 +26,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package com.android.godot; +package org.godotengine.godot; // Wrapper for native library diff --git a/platform/android/java/src/com/android/godot/GodotPaymentV3.java b/platform/android/java/src/org/godotengine/godot/GodotPaymentV3.java index 0799e1e83d..6bec49410d 100644 --- a/platform/android/java/src/com/android/godot/GodotPaymentV3.java +++ b/platform/android/java/src/org/godotengine/godot/GodotPaymentV3.java @@ -1,6 +1,6 @@ -package com.android.godot; +package org.godotengine.godot; -import com.android.godot.Dictionary; +import org.godotengine.godot.Dictionary; import android.app.Activity; import android.util.Log; diff --git a/platform/android/java/src/com/android/godot/GodotView.java b/platform/android/java/src/org/godotengine/godot/GodotView.java index bc249d46c6..04b5dfa5dd 100644 --- a/platform/android/java/src/com/android/godot/GodotView.java +++ b/platform/android/java/src/org/godotengine/godot/GodotView.java @@ -26,7 +26,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -package com.android.godot; +package org.godotengine.godot; import android.content.Context; import android.graphics.PixelFormat; import android.opengl.GLSurfaceView; diff --git a/platform/android/java/src/com/android/godot/input/GodotEditText.java b/platform/android/java/src/org/godotengine/godot/input/GodotEditText.java index 5898e95423..c8ffa74ecd 100644 --- a/platform/android/java/src/com/android/godot/input/GodotEditText.java +++ b/platform/android/java/src/org/godotengine/godot/input/GodotEditText.java @@ -1,9 +1,9 @@ -package com.android.godot.input; +package org.godotengine.godot.input; import android.content.Context; import android.util.AttributeSet; import android.view.KeyEvent; import android.widget.EditText; -import com.android.godot.*; +import org.godotengine.godot.*; import android.os.Handler; import android.os.Message; import android.view.inputmethod.InputMethodManager; diff --git a/platform/android/java/src/com/android/godot/input/GodotTextInputWrapper.java b/platform/android/java/src/org/godotengine/godot/input/GodotTextInputWrapper.java index 537fa6aa76..64d8826b44 100644 --- a/platform/android/java/src/com/android/godot/input/GodotTextInputWrapper.java +++ b/platform/android/java/src/org/godotengine/godot/input/GodotTextInputWrapper.java @@ -1,4 +1,4 @@ -package com.android.godot.input; +package org.godotengine.godot.input; import android.content.Context; import android.text.Editable; import android.text.TextWatcher; @@ -8,7 +8,7 @@ import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputMethodManager; import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; -import com.android.godot.*; +import org.godotengine.godot.*; public class GodotTextInputWrapper implements TextWatcher, OnEditorActionListener { // =========================================================== diff --git a/platform/android/java/src/com/android/godot/payments/ConsumeTask.java b/platform/android/java/src/org/godotengine/godot/payments/ConsumeTask.java index c983960770..61ccb97161 100644 --- a/platform/android/java/src/com/android/godot/payments/ConsumeTask.java +++ b/platform/android/java/src/org/godotengine/godot/payments/ConsumeTask.java @@ -1,4 +1,4 @@ -package com.android.godot.payments; +package org.godotengine.godot.payments; import com.android.vending.billing.IInAppBillingService; diff --git a/platform/android/java/src/com/android/godot/payments/GenericConsumeTask.java b/platform/android/java/src/org/godotengine/godot/payments/GenericConsumeTask.java index d68f029246..293e903284 100644 --- a/platform/android/java/src/com/android/godot/payments/GenericConsumeTask.java +++ b/platform/android/java/src/org/godotengine/godot/payments/GenericConsumeTask.java @@ -1,4 +1,4 @@ -package com.android.godot.payments; +package org.godotengine.godot.payments; import com.android.vending.billing.IInAppBillingService; diff --git a/platform/android/java/src/com/android/godot/payments/HandlePurchaseTask.java b/platform/android/java/src/org/godotengine/godot/payments/HandlePurchaseTask.java index 4c31704cc8..d120551e4a 100644 --- a/platform/android/java/src/com/android/godot/payments/HandlePurchaseTask.java +++ b/platform/android/java/src/org/godotengine/godot/payments/HandlePurchaseTask.java @@ -1,10 +1,10 @@ -package com.android.godot.payments; +package org.godotengine.godot.payments; import org.json.JSONException; import org.json.JSONObject; -import com.android.godot.GodotLib; -import com.android.godot.utils.Crypt; +import org.godotengine.godot.GodotLib; +import org.godotengine.godot.utils.Crypt; import com.android.vending.billing.IInAppBillingService; import android.app.Activity; diff --git a/platform/android/java/src/com/android/godot/payments/PaymentsCache.java b/platform/android/java/src/org/godotengine/godot/payments/PaymentsCache.java index 1de772bf28..5f3d931593 100644 --- a/platform/android/java/src/com/android/godot/payments/PaymentsCache.java +++ b/platform/android/java/src/org/godotengine/godot/payments/PaymentsCache.java @@ -1,4 +1,4 @@ -package com.android.godot.payments; +package org.godotengine.godot.payments; import android.content.Context; import android.content.SharedPreferences; diff --git a/platform/android/java/src/com/android/godot/payments/PaymentsManager.java b/platform/android/java/src/org/godotengine/godot/payments/PaymentsManager.java index 189f7108c1..effb58aa35 100644 --- a/platform/android/java/src/com/android/godot/payments/PaymentsManager.java +++ b/platform/android/java/src/org/godotengine/godot/payments/PaymentsManager.java @@ -1,4 +1,4 @@ -package com.android.godot.payments; +package org.godotengine.godot.payments; import java.util.ArrayList; import java.util.List; @@ -17,9 +17,9 @@ import org.json.JSONException; import org.json.JSONObject; import org.json.JSONStringer; -import com.android.godot.Dictionary; -import com.android.godot.Godot; -import com.android.godot.GodotPaymentV3; +import org.godotengine.godot.Dictionary; +import org.godotengine.godot.Godot; +import org.godotengine.godot.GodotPaymentV3; import com.android.vending.billing.IInAppBillingService; public class PaymentsManager { diff --git a/platform/android/java/src/com/android/godot/payments/PurchaseTask.java b/platform/android/java/src/org/godotengine/godot/payments/PurchaseTask.java index c1f9d164a1..8b048d8065 100644 --- a/platform/android/java/src/com/android/godot/payments/PurchaseTask.java +++ b/platform/android/java/src/org/godotengine/godot/payments/PurchaseTask.java @@ -1,10 +1,10 @@ -package com.android.godot.payments; +package org.godotengine.godot.payments; import org.json.JSONException; import org.json.JSONObject; -import com.android.godot.GodotLib; -import com.android.godot.utils.Crypt; +import org.godotengine.godot.GodotLib; +import org.godotengine.godot.utils.Crypt; import com.android.vending.billing.IInAppBillingService; import android.app.Activity; diff --git a/platform/android/java/src/com/android/godot/payments/ReleaseAllConsumablesTask.java b/platform/android/java/src/org/godotengine/godot/payments/ReleaseAllConsumablesTask.java index c1a9c5d421..7bb5131b49 100644 --- a/platform/android/java/src/com/android/godot/payments/ReleaseAllConsumablesTask.java +++ b/platform/android/java/src/org/godotengine/godot/payments/ReleaseAllConsumablesTask.java @@ -1,12 +1,12 @@ -package com.android.godot.payments; +package org.godotengine.godot.payments; import java.util.ArrayList; import org.json.JSONException; import org.json.JSONObject; -import com.android.godot.Dictionary; -import com.android.godot.Godot; +import org.godotengine.godot.Dictionary; +import org.godotengine.godot.Godot; import com.android.vending.billing.IInAppBillingService; import android.content.Context; diff --git a/platform/android/java/src/com/android/godot/payments/ValidateTask.java b/platform/android/java/src/org/godotengine/godot/payments/ValidateTask.java index 6ea415e8a9..2fcf7483b4 100644 --- a/platform/android/java/src/com/android/godot/payments/ValidateTask.java +++ b/platform/android/java/src/org/godotengine/godot/payments/ValidateTask.java @@ -1,14 +1,14 @@ -package com.android.godot.payments; +package org.godotengine.godot.payments; import org.json.JSONException; import org.json.JSONObject; -import com.android.godot.Godot; -import com.android.godot.GodotLib; -import com.android.godot.GodotPaymentV3; -import com.android.godot.utils.Crypt; -import com.android.godot.utils.HttpRequester; -import com.android.godot.utils.RequestParams; +import org.godotengine.godot.Godot; +import org.godotengine.godot.GodotLib; +import org.godotengine.godot.GodotPaymentV3; +import org.godotengine.godot.utils.Crypt; +import org.godotengine.godot.utils.HttpRequester; +import org.godotengine.godot.utils.RequestParams; import com.android.vending.billing.IInAppBillingService; import android.app.Activity; diff --git a/platform/android/java/src/com/android/godot/utils/Crypt.java b/platform/android/java/src/org/godotengine/godot/utils/Crypt.java index 7801f474b9..2fb81cef8c 100644 --- a/platform/android/java/src/com/android/godot/utils/Crypt.java +++ b/platform/android/java/src/org/godotengine/godot/utils/Crypt.java @@ -1,4 +1,4 @@ -package com.android.godot.utils; +package org.godotengine.godot.utils; import java.security.MessageDigest; import java.util.Random; diff --git a/platform/android/java/src/com/android/godot/utils/CustomSSLSocketFactory.java b/platform/android/java/src/org/godotengine/godot/utils/CustomSSLSocketFactory.java index 5f2b44fc8c..2db88fcc9b 100644 --- a/platform/android/java/src/com/android/godot/utils/CustomSSLSocketFactory.java +++ b/platform/android/java/src/org/godotengine/godot/utils/CustomSSLSocketFactory.java @@ -1,4 +1,4 @@ -package com.android.godot.utils; +package org.godotengine.godot.utils; import java.io.IOException; import java.net.Socket; import java.net.UnknownHostException; diff --git a/platform/android/java/src/com/android/godot/utils/HttpRequester.java b/platform/android/java/src/org/godotengine/godot/utils/HttpRequester.java index 7de77881d0..14346702cc 100644 --- a/platform/android/java/src/com/android/godot/utils/HttpRequester.java +++ b/platform/android/java/src/org/godotengine/godot/utils/HttpRequester.java @@ -1,4 +1,4 @@ -package com.android.godot.utils; +package org.godotengine.godot.utils; import java.io.BufferedReader; import java.io.IOException; diff --git a/platform/android/java/src/com/android/godot/utils/RequestParams.java b/platform/android/java/src/org/godotengine/godot/utils/RequestParams.java index 31bf1940ad..36753e368c 100644 --- a/platform/android/java/src/com/android/godot/utils/RequestParams.java +++ b/platform/android/java/src/org/godotengine/godot/utils/RequestParams.java @@ -1,4 +1,4 @@ -package com.android.godot.utils; +package org.godotengine.godot.utils; import java.util.ArrayList; import java.util.Date; diff --git a/platform/android/java_class_wrapper.cpp b/platform/android/java_class_wrapper.cpp index d4cf848484..283ea81152 100644 --- a/platform/android/java_class_wrapper.cpp +++ b/platform/android/java_class_wrapper.cpp @@ -1281,7 +1281,7 @@ JavaClassWrapper::JavaClassWrapper(jobject p_activity) { JNIEnv *env = ThreadAndroid::get_env(); - jclass activityClass = env->FindClass("com/android/godot/Godot"); + jclass activityClass = env->FindClass("org/godotengine/godot/Godot"); jmethodID getClassLoader = env->GetMethodID(activityClass,"getClassLoader", "()Ljava/lang/ClassLoader;"); classLoader = env->CallObjectMethod(p_activity, getClassLoader); classLoader=(jclass)env->NewGlobalRef(classLoader); diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp index 4c0c9ed6dc..459cf4c994 100644 --- a/platform/android/java_glue.cpp +++ b/platform/android/java_glue.cpp @@ -138,7 +138,7 @@ jvalret _variant_to_jvalue(JNIEnv *env, Variant::Type p_type, const Variant* p_a case Variant::DICTIONARY: { Dictionary dict = *p_arg; - jclass dclass = env->FindClass("com/android/godot/Dictionary"); + jclass dclass = env->FindClass("org/godotengine/godot/Dictionary"); jmethodID ctor = env->GetMethodID(dclass, "<init>", "()V"); jobject jdict = env->NewObject(dclass, ctor); @@ -373,7 +373,7 @@ Variant _jobject_to_variant(JNIEnv * env, jobject obj) { return varr; }; - if (name == "java.util.HashMap" || name == "com.android.godot.Dictionary") { + if (name == "java.util.HashMap" || name == "org.godotengine.godot.Dictionary") { Dictionary ret(true); jclass oclass = c; @@ -765,7 +765,7 @@ static void _stop_video() { env->CallVoidMethod(godot_io, _stopVideo); } -JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_initialize(JNIEnv * env, jobject obj, jobject activity,jboolean p_need_reload_hook, jobjectArray p_cmdline,jobject p_asset_manager) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_initialize(JNIEnv * env, jobject obj, jobject activity,jboolean p_need_reload_hook, jobjectArray p_cmdline,jobject p_asset_manager) { __android_log_print(ANDROID_LOG_INFO,"godot","**INIT EVENT! - %p\n",env); @@ -783,7 +783,7 @@ JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_initialize(JNIEnv * env, { //setup IO Object - jclass cls = env->FindClass("com/android/godot/Godot"); + jclass cls = env->FindClass("org/godotengine/godot/Godot"); if (cls) { cls=(jclass)env->NewGlobalRef(cls); @@ -791,7 +791,7 @@ JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_initialize(JNIEnv * env, } __android_log_print(ANDROID_LOG_INFO,"godot","STEP2, %p",cls); - jfieldID fid = env->GetStaticFieldID(cls, "io", "Lcom/android/godot/GodotIO;"); + jfieldID fid = env->GetStaticFieldID(cls, "io", "Lorg/godotengine/godot/GodotIO;"); __android_log_print(ANDROID_LOG_INFO,"godot","STEP3 %i",fid); jobject ob = env->GetStaticObjectField(cls,fid); __android_log_print(ANDROID_LOG_INFO,"godot","STEP4, %p",ob); @@ -802,7 +802,7 @@ JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_initialize(JNIEnv * env, _on_video_init = env->GetMethodID(cls, "onVideoInit", "(Z)V"); - jclass clsio = env->FindClass("com/android/godot/Godot"); + jclass clsio = env->FindClass("org/godotengine/godot/Godot"); if (cls) { jclass c = env->GetObjectClass(gob); _openURI = env->GetMethodID(c,"openURI","(Ljava/lang/String;)I"); @@ -905,7 +905,7 @@ JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_initialize(JNIEnv * env, } -JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_resize(JNIEnv * env, jobject obj, jint width, jint height, jboolean reload) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_resize(JNIEnv * env, jobject obj, jint width, jint height, jboolean reload) { __android_log_print(ANDROID_LOG_INFO,"godot","^_^_^_^_^ resize %lld, %i, %i\n",Thread::get_caller_ID(),width,height); if (os_android) @@ -920,7 +920,7 @@ JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_resize(JNIEnv * env, jobj } -JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_newcontext(JNIEnv * env, jobject obj,bool p_32_bits) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_newcontext(JNIEnv * env, jobject obj,bool p_32_bits) { __android_log_print(ANDROID_LOG_INFO,"godot","^_^_^_^_^ newcontext %lld\n",Thread::get_caller_ID()); @@ -937,7 +937,7 @@ JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_newcontext(JNIEnv * env, } -JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_quit(JNIEnv * env, jobject obj) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_quit(JNIEnv * env, jobject obj) { input_mutex->lock(); quit_request=true; @@ -958,7 +958,7 @@ static void _initialize_java_modules() { JNIEnv *env = ThreadAndroid::get_env(); - jclass activityClass = env->FindClass("com/android/godot/Godot"); + jclass activityClass = env->FindClass("org/godotengine/godot/Godot"); jmethodID getClassLoader = env->GetMethodID(activityClass,"getClassLoader", "()Ljava/lang/ClassLoader;"); @@ -987,7 +987,7 @@ static void _initialize_java_modules() { //singletonClass=(jclass)env->NewGlobalRef(singletonClass); __android_log_print(ANDROID_LOG_INFO,"godot","****^*^*?^*^*class data %x",singletonClass); - jmethodID initialize = env->GetStaticMethodID(singletonClass, "initialize", "(Landroid/app/Activity;)Lcom/android/godot/Godot$SingletonBase;"); + jmethodID initialize = env->GetStaticMethodID(singletonClass, "initialize", "(Landroid/app/Activity;)Lorg/godotengine/godot/Godot$SingletonBase;"); if (!initialize) { @@ -1007,7 +1007,7 @@ static void _initialize_java_modules() { } -JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_step(JNIEnv * env, jobject obj) +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv * env, jobject obj) { @@ -1074,7 +1074,7 @@ JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_step(JNIEnv * env, jobjec if (os_android->main_loop_iterate()==true) { - jclass cls = env->FindClass("com/android/godot/Godot"); + jclass cls = env->FindClass("org/godotengine/godot/Godot"); jmethodID _finish = env->GetMethodID(cls, "forceQuit", "()V"); env->CallVoidMethod(_godot_instance, _finish); __android_log_print(ANDROID_LOG_INFO,"godot","**FINISH REQUEST!!! - %p-%i\n",env,Thread::get_caller_ID()); @@ -1085,7 +1085,7 @@ JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_step(JNIEnv * env, jobjec } -JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_touch(JNIEnv * env, jobject obj, jint ev,jint pointer, jint count, jintArray positions) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_touch(JNIEnv * env, jobject obj, jint ev,jint pointer, jint count, jintArray positions) { @@ -1390,7 +1390,7 @@ static int find_device(int p_device) { return joy_device_ids.size() - 1; }; -JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_joybutton(JNIEnv * env, jobject obj, jint p_device, jint p_button, 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) { InputEvent ievent; ievent.type = InputEvent::JOYSTICK_BUTTON; @@ -1403,7 +1403,7 @@ JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_joybutton(JNIEnv * env, j input_mutex->unlock(); }; -JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_joyaxis(JNIEnv * env, jobject obj, jint p_device, jint p_axis, jfloat p_value) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyaxis(JNIEnv * env, jobject obj, jint p_device, jint p_axis, jfloat p_value) { InputEvent ievent; ievent.type = InputEvent::JOYSTICK_MOTION; @@ -1417,7 +1417,7 @@ JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_joyaxis(JNIEnv * env, job }; -JNIEXPORT void JNICALL Java_com_android_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_key(JNIEnv * env, jobject obj, jint p_scancode, jint p_unicode_char, jboolean p_pressed) { InputEvent ievent; ievent.type = InputEvent::KEY; @@ -1455,7 +1455,7 @@ JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_key(JNIEnv * env, jobject }; -JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_accelerometer(JNIEnv * env, jobject obj, jfloat x, jfloat y, jfloat z) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_accelerometer(JNIEnv * env, jobject obj, jfloat x, jfloat y, jfloat z) { input_mutex->lock(); accelerometer=Vector3(x,y,z); @@ -1463,7 +1463,7 @@ JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_accelerometer(JNIEnv * en } -JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_focusin(JNIEnv * env, jobject obj){ +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_focusin(JNIEnv * env, jobject obj){ if (!suspend_mutex) return; @@ -1475,7 +1475,7 @@ JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_focusin(JNIEnv * env, job suspend_mutex->unlock(); } -JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_focusout(JNIEnv * env, jobject obj){ +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_focusout(JNIEnv * env, jobject obj){ if (!suspend_mutex) return; @@ -1490,7 +1490,7 @@ JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_focusout(JNIEnv * env, jo -JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_audio(JNIEnv * env, jobject obj) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_audio(JNIEnv * env, jobject obj) { ThreadAndroid::setup_thread(); AudioDriverAndroid::thread_func(env); @@ -1499,7 +1499,7 @@ JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_audio(JNIEnv * env, jobje } -JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_singleton(JNIEnv * env, jobject obj, jstring name,jobject p_object){ +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_singleton(JNIEnv * env, jobject obj, jstring name,jobject p_object){ String singname = env->GetStringUTFChars( name, NULL ); JNISingleton *s = memnew( JNISingleton ); @@ -1528,7 +1528,7 @@ static Variant::Type get_jni_type(const String& p_type) { {"[B",Variant::RAW_ARRAY}, {"[F",Variant::REAL_ARRAY}, {"[java.lang.String",Variant::STRING_ARRAY}, - {"com.android.godot.Dictionary", Variant::DICTIONARY}, + {"org.godotengine.godot.Dictionary", Variant::DICTIONARY}, {NULL,Variant::NIL} }; @@ -1559,7 +1559,7 @@ static const char* get_jni_sig(const String& p_type) { {"float","F"}, {"double","D"}, {"java.lang.String","Ljava/lang/String;"}, - {"com.android.godot.Dictionary", "Lcom/android/godot/Dictionary;"}, + {"org.godotengine.godot.Dictionary", "Lorg/godotengine/godot/Dictionary;"}, {"[I","[I"}, {"[B","[B"}, {"[F","[F"}, @@ -1581,7 +1581,7 @@ static const char* get_jni_sig(const String& p_type) { return "Ljava/lang/Object;"; } -JNIEXPORT jstring JNICALL Java_com_android_godot_GodotLib_getGlobal(JNIEnv * env, jobject obj, jstring path) { +JNIEXPORT jstring JNICALL Java_org_godotengine_godot_GodotLib_getGlobal(JNIEnv * env, jobject obj, jstring path) { String js = env->GetStringUTFChars( path, NULL ); @@ -1591,7 +1591,7 @@ JNIEXPORT jstring JNICALL Java_com_android_godot_GodotLib_getGlobal(JNIEnv * env } -JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_method(JNIEnv * env, jobject obj, jstring sname, jstring name, jstring ret, jobjectArray args){ +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_method(JNIEnv * env, jobject obj, jstring sname, jstring name, jstring ret, jobjectArray args){ String singname = env->GetStringUTFChars( sname, NULL ); @@ -1632,7 +1632,7 @@ JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_method(JNIEnv * env, jobj } -JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_callobject(JNIEnv * env, jobject p_obj, jint ID, jstring method, jobjectArray params) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_callobject(JNIEnv * env, jobject p_obj, jint ID, jstring method, jobjectArray params) { Object* obj = ObjectDB::get_instance(ID); ERR_FAIL_COND(!obj); @@ -1667,7 +1667,7 @@ JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_callobject(JNIEnv * env, }; -JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_calldeferred(JNIEnv * env, jobject p_obj, jint ID, jstring method, jobjectArray params) { +JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_calldeferred(JNIEnv * env, jobject p_obj, jint ID, jstring method, jobjectArray params) { Object* obj = ObjectDB::get_instance(ID); diff --git a/platform/android/java_glue.h b/platform/android/java_glue.h index 0eae4cf418..efa5b2839d 100644 --- a/platform/android/java_glue.h +++ b/platform/android/java_glue.h @@ -36,24 +36,24 @@ extern "C" { - JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_initialize(JNIEnv * env, jobject obj, jobject activity,jboolean p_need_reload_hook, jobjectArray p_cmdline,jobject p_asset_manager); - JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_resize(JNIEnv * env, jobject obj, jint width, jint height, jboolean reload); - JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_newcontext(JNIEnv * env, jobject obj, bool p_32_bits); - JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_step(JNIEnv * env, jobject obj); - JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_quit(JNIEnv * env, jobject obj); - JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_touch(JNIEnv * env, jobject obj, jint ev,jint pointer, jint count, jintArray positions); - JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_key(JNIEnv * env, jobject obj, jint p_scancode, jint p_unicode_char, jboolean p_pressed); - JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_joybutton(JNIEnv * env, jobject obj, jint p_device, jint p_button, jboolean p_pressed); - JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_joyaxis(JNIEnv * env, jobject obj, jint p_device, jint p_axis, jfloat p_value); - JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_audio(JNIEnv * env, jobject obj); - JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_accelerometer(JNIEnv * env, jobject obj, jfloat x, jfloat y, jfloat z); - JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_focusin(JNIEnv * env, jobject obj); - JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_focusout(JNIEnv * env, jobject obj); - JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_singleton(JNIEnv * env, jobject obj, jstring name,jobject p_object); - JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_method(JNIEnv * env, jobject obj, jstring sname, jstring name, jstring ret, jobjectArray args); - JNIEXPORT jstring JNICALL Java_com_android_godot_GodotLib_getGlobal(JNIEnv * env, jobject obj, jstring path); - JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_callobject(JNIEnv * env, jobject obj, jint ID, jstring method, jobjectArray params); - JNIEXPORT void JNICALL Java_com_android_godot_GodotLib_calldeferred(JNIEnv * env, jobject obj, jint ID, jstring method, jobjectArray params); + JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_initialize(JNIEnv * env, jobject obj, jobject activity,jboolean p_need_reload_hook, jobjectArray p_cmdline,jobject p_asset_manager); + JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_resize(JNIEnv * env, jobject obj, jint width, jint height, jboolean reload); + JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_newcontext(JNIEnv * env, jobject obj, bool p_32_bits); + JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv * env, jobject obj); + JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_quit(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_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); + JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyaxis(JNIEnv * env, jobject obj, jint p_device, jint p_axis, jfloat p_value); + JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_audio(JNIEnv * env, jobject obj); + JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_accelerometer(JNIEnv * env, jobject obj, jfloat x, jfloat y, jfloat z); + JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_focusin(JNIEnv * env, jobject obj); + JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_focusout(JNIEnv * env, jobject obj); + JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_singleton(JNIEnv * env, jobject obj, jstring name,jobject p_object); + JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_method(JNIEnv * env, jobject obj, jstring sname, jstring name, jstring ret, jobjectArray args); + JNIEXPORT jstring JNICALL Java_org_godotengine_godot_GodotLib_getGlobal(JNIEnv * env, jobject obj, jstring path); + JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_callobject(JNIEnv * env, jobject obj, jint ID, jstring method, jobjectArray params); + JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_calldeferred(JNIEnv * env, jobject obj, jint ID, jstring method, jobjectArray params); }; |