aboutsummaryrefslogtreecommitdiff
path: root/platform/android/java
diff options
context:
space:
mode:
authorRémi Verschelde2017-03-05 16:44:50 +0100
committerRémi Verschelde2017-03-05 16:44:50 +0100
commit5dbf1809c6e3e905b94b8764e99491e608122261 (patch)
tree5e5a5360db15d86d59ec8c6e4f7eb511388c5a9a /platform/android/java
parent45438e9918d421b244bfd7776a30e67dc7f2d3e3 (diff)
downloadgodot-5dbf180.tar.gz
godot-5dbf180.tar.zst
godot-5dbf180.zip
A Whole New World (clang-format edition)
I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
Diffstat (limited to '')
-rw-r--r--platform/android/java_class_wrapper.cpp755
-rw-r--r--platform/android/java_class_wrapper.h166
-rw-r--r--platform/android/java_glue.cpp1190
-rw-r--r--platform/android/java_glue.h48
4 files changed, 1023 insertions, 1136 deletions
diff --git a/platform/android/java_class_wrapper.cpp b/platform/android/java_class_wrapper.cpp
index 2923ef6a9..eb208f0ee 100644
--- a/platform/android/java_class_wrapper.cpp
+++ b/platform/android/java_class_wrapper.cpp
@@ -29,56 +29,55 @@
#include "java_class_wrapper.h"
#include "thread_jandroid.h"
+bool JavaClass::_call_method(JavaObject *p_instance, const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error, Variant &ret) {
-bool JavaClass::_call_method(JavaObject* p_instance,const StringName& p_method,const Variant** p_args,int p_argcount,Variant::CallError &r_error,Variant& ret) {
-
- Map<StringName,List<MethodInfo> >::Element *M=methods.find(p_method);
+ Map<StringName, List<MethodInfo> >::Element *M = methods.find(p_method);
if (!M)
return false;
JNIEnv *env = ThreadAndroid::get_env();
- MethodInfo *method=NULL;
- for (List<MethodInfo>::Element *E=M->get().front();E;E=E->next()) {
+ MethodInfo *method = NULL;
+ for (List<MethodInfo>::Element *E = M->get().front(); E; E = E->next()) {
if (!p_instance && !E->get()._static) {
- r_error.error=Variant::CallError::CALL_ERROR_INSTANCE_IS_NULL;
+ r_error.error = Variant::CallError::CALL_ERROR_INSTANCE_IS_NULL;
continue;
}
int pc = E->get().param_types.size();
- if (pc>p_argcount) {
+ if (pc > p_argcount) {
- r_error.error=Variant::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
- r_error.argument=pc;
+ r_error.error = Variant::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
+ r_error.argument = pc;
continue;
}
- if (pc<p_argcount) {
+ if (pc < p_argcount) {
- r_error.error=Variant::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS;
- r_error.argument=pc;
+ r_error.error = Variant::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS;
+ r_error.argument = pc;
continue;
}
- uint32_t *ptypes=E->get().param_types.ptr();
- bool valid=true;
+ uint32_t *ptypes = E->get().param_types.ptr();
+ bool valid = true;
- for(int i=0;i<pc;i++) {
+ for (int i = 0; i < pc; i++) {
- Variant::Type arg_expected=Variant::NIL;
- switch(ptypes[i]) {
+ Variant::Type arg_expected = Variant::NIL;
+ switch (ptypes[i]) {
case ARG_TYPE_VOID: {
//bug?
} break;
case ARG_TYPE_BOOLEAN: {
- if (p_args[i]->get_type()!=Variant::BOOL)
- arg_expected=Variant::BOOL;
+ if (p_args[i]->get_type() != Variant::BOOL)
+ arg_expected = Variant::BOOL;
} break;
- case ARG_NUMBER_CLASS_BIT|ARG_TYPE_BYTE:
- case ARG_NUMBER_CLASS_BIT|ARG_TYPE_CHAR:
- case ARG_NUMBER_CLASS_BIT|ARG_TYPE_SHORT:
- case ARG_NUMBER_CLASS_BIT|ARG_TYPE_INT:
- case ARG_NUMBER_CLASS_BIT|ARG_TYPE_LONG:
+ case ARG_NUMBER_CLASS_BIT | ARG_TYPE_BYTE:
+ case ARG_NUMBER_CLASS_BIT | ARG_TYPE_CHAR:
+ case ARG_NUMBER_CLASS_BIT | ARG_TYPE_SHORT:
+ case ARG_NUMBER_CLASS_BIT | ARG_TYPE_INT:
+ case ARG_NUMBER_CLASS_BIT | ARG_TYPE_LONG:
case ARG_TYPE_BYTE:
case ARG_TYPE_CHAR:
case ARG_TYPE_SHORT:
@@ -86,127 +85,119 @@ bool JavaClass::_call_method(JavaObject* p_instance,const StringName& p_method,c
case ARG_TYPE_LONG: {
if (!p_args[i]->is_num())
- arg_expected=Variant::INT;
+ arg_expected = Variant::INT;
} break;
- case ARG_NUMBER_CLASS_BIT|ARG_TYPE_FLOAT:
- case ARG_NUMBER_CLASS_BIT|ARG_TYPE_DOUBLE:
+ case ARG_NUMBER_CLASS_BIT | ARG_TYPE_FLOAT:
+ case ARG_NUMBER_CLASS_BIT | ARG_TYPE_DOUBLE:
case ARG_TYPE_FLOAT:
case ARG_TYPE_DOUBLE: {
if (!p_args[i]->is_num())
- arg_expected=Variant::REAL;
+ arg_expected = Variant::REAL;
} break;
case ARG_TYPE_STRING: {
- if (p_args[i]->get_type()!=Variant::STRING)
- arg_expected=Variant::STRING;
+ if (p_args[i]->get_type() != Variant::STRING)
+ arg_expected = Variant::STRING;
} break;
case ARG_TYPE_CLASS: {
- if (p_args[i]->get_type()!=Variant::OBJECT)
- arg_expected=Variant::OBJECT;
+ if (p_args[i]->get_type() != Variant::OBJECT)
+ arg_expected = Variant::OBJECT;
else {
Ref<Reference> ref = *p_args[i];
if (!ref.is_null()) {
- if (ref->cast_to<JavaObject>() ) {
+ if (ref->cast_to<JavaObject>()) {
- Ref<JavaObject> jo=ref;
+ Ref<JavaObject> jo = ref;
//could be faster
jclass c = env->FindClass(E->get().param_sigs[i].operator String().utf8().get_data());
- if (!c || !env->IsInstanceOf(jo->instance,c)) {
+ if (!c || !env->IsInstanceOf(jo->instance, c)) {
- arg_expected=Variant::OBJECT;
+ arg_expected = Variant::OBJECT;
} else {
//ok
}
} else {
- arg_expected=Variant::OBJECT;
+ arg_expected = Variant::OBJECT;
}
-
}
}
} break;
default: {
- if (p_args[i]->get_type()!=Variant::ARRAY)
- arg_expected=Variant::ARRAY;
+ if (p_args[i]->get_type() != Variant::ARRAY)
+ arg_expected = Variant::ARRAY;
} break;
-
}
- if (arg_expected!=Variant::NIL) {
- r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
- r_error.argument=i;
- r_error.expected=arg_expected;
- valid=false;
+ if (arg_expected != Variant::NIL) {
+ r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+ r_error.argument = i;
+ r_error.expected = arg_expected;
+ valid = false;
break;
-
}
-
}
if (!valid)
continue;
-
- method=&E->get();
+ method = &E->get();
break;
-
}
if (!method)
return true; //no version convinces
+ r_error.error = Variant::CallError::CALL_OK;
-
- r_error.error=Variant::CallError::CALL_OK;
-
- jvalue *argv=NULL;
+ jvalue *argv = NULL;
if (method->param_types.size()) {
- argv=(jvalue*)alloca( sizeof(jvalue)*method->param_types.size() );
+ argv = (jvalue *)alloca(sizeof(jvalue) * method->param_types.size());
}
List<jobject> to_free;
- for(int i=0;i<method->param_types.size();i++) {
+ for (int i = 0; i < method->param_types.size(); i++) {
- switch(method->param_types[i]) {
- case ARG_TYPE_VOID: {
+ switch (method->param_types[i]) {
+ case ARG_TYPE_VOID: {
//can't happen
- argv[i].l=NULL; //I hope this works
+ argv[i].l = NULL; //I hope this works
} break;
case ARG_TYPE_BOOLEAN: {
- argv[i].z=*p_args[i];
+ argv[i].z = *p_args[i];
} break;
case ARG_TYPE_BYTE: {
- argv[i].b=*p_args[i];
+ argv[i].b = *p_args[i];
} break;
case ARG_TYPE_CHAR: {
- argv[i].c=*p_args[i];
+ argv[i].c = *p_args[i];
} break;
case ARG_TYPE_SHORT: {
- argv[i].s=*p_args[i];
+ argv[i].s = *p_args[i];
} break;
case ARG_TYPE_INT: {
- argv[i].i=*p_args[i];
+ argv[i].i = *p_args[i];
} break;
case ARG_TYPE_LONG: {
- argv[i].j=*p_args[i];
+ argv[i].j = *p_args[i];
} break;
case ARG_TYPE_FLOAT: {
- argv[i].f=*p_args[i];
+ argv[i].f = *p_args[i];
} break;
case ARG_TYPE_DOUBLE: {
- argv[i].d=*p_args[i];
+ argv[i].d = *p_args[i];
} break;
- case ARG_NUMBER_CLASS_BIT|ARG_TYPE_BOOLEAN: {
+ case ARG_NUMBER_CLASS_BIT | ARG_TYPE_BOOLEAN: {
jclass bclass = env->FindClass("java/lang/Boolean");
jmethodID ctor = env->GetMethodID(bclass, "<init>", "(Z)V");
jvalue val;
@@ -215,7 +206,7 @@ bool JavaClass::_call_method(JavaObject* p_instance,const StringName& p_method,c
argv[i].l = obj;
to_free.push_back(obj);
} break;
- case ARG_NUMBER_CLASS_BIT|ARG_TYPE_BYTE: {
+ case ARG_NUMBER_CLASS_BIT | ARG_TYPE_BYTE: {
jclass bclass = env->FindClass("java/lang/Byte");
jmethodID ctor = env->GetMethodID(bclass, "<init>", "(B)V");
jvalue val;
@@ -224,7 +215,7 @@ bool JavaClass::_call_method(JavaObject* p_instance,const StringName& p_method,c
argv[i].l = obj;
to_free.push_back(obj);
} break;
- case ARG_NUMBER_CLASS_BIT|ARG_TYPE_CHAR: {
+ case ARG_NUMBER_CLASS_BIT | ARG_TYPE_CHAR: {
jclass bclass = env->FindClass("java/lang/Character");
jmethodID ctor = env->GetMethodID(bclass, "<init>", "(C)V");
jvalue val;
@@ -233,7 +224,7 @@ bool JavaClass::_call_method(JavaObject* p_instance,const StringName& p_method,c
argv[i].l = obj;
to_free.push_back(obj);
} break;
- case ARG_NUMBER_CLASS_BIT|ARG_TYPE_SHORT: {
+ case ARG_NUMBER_CLASS_BIT | ARG_TYPE_SHORT: {
jclass bclass = env->FindClass("java/lang/Short");
jmethodID ctor = env->GetMethodID(bclass, "<init>", "(S)V");
jvalue val;
@@ -242,7 +233,7 @@ bool JavaClass::_call_method(JavaObject* p_instance,const StringName& p_method,c
argv[i].l = obj;
to_free.push_back(obj);
} break;
- case ARG_NUMBER_CLASS_BIT|ARG_TYPE_INT: {
+ case ARG_NUMBER_CLASS_BIT | ARG_TYPE_INT: {
jclass bclass = env->FindClass("java/lang/Integer");
jmethodID ctor = env->GetMethodID(bclass, "<init>", "(I)V");
jvalue val;
@@ -251,7 +242,7 @@ bool JavaClass::_call_method(JavaObject* p_instance,const StringName& p_method,c
argv[i].l = obj;
to_free.push_back(obj);
} break;
- case ARG_NUMBER_CLASS_BIT|ARG_TYPE_LONG: {
+ case ARG_NUMBER_CLASS_BIT | ARG_TYPE_LONG: {
jclass bclass = env->FindClass("java/lang/Long");
jmethodID ctor = env->GetMethodID(bclass, "<init>", "(J)V");
jvalue val;
@@ -260,7 +251,7 @@ bool JavaClass::_call_method(JavaObject* p_instance,const StringName& p_method,c
argv[i].l = obj;
to_free.push_back(obj);
} break;
- case ARG_NUMBER_CLASS_BIT|ARG_TYPE_FLOAT: {
+ case ARG_NUMBER_CLASS_BIT | ARG_TYPE_FLOAT: {
jclass bclass = env->FindClass("java/lang/Float");
jmethodID ctor = env->GetMethodID(bclass, "<init>", "(F)V");
jvalue val;
@@ -269,7 +260,7 @@ bool JavaClass::_call_method(JavaObject* p_instance,const StringName& p_method,c
argv[i].l = obj;
to_free.push_back(obj);
} break;
- case ARG_NUMBER_CLASS_BIT|ARG_TYPE_DOUBLE: {
+ case ARG_NUMBER_CLASS_BIT | ARG_TYPE_DOUBLE: {
jclass bclass = env->FindClass("java/lang/Double");
jmethodID ctor = env->GetMethodID(bclass, "<init>", "(D)V");
jvalue val;
@@ -281,217 +272,214 @@ bool JavaClass::_call_method(JavaObject* p_instance,const StringName& p_method,c
case ARG_TYPE_STRING: {
String s = *p_args[i];
jstring jStr = env->NewStringUTF(s.utf8().get_data());
- argv[i].l=jStr;
+ argv[i].l = jStr;
to_free.push_back(jStr);
} break;
case ARG_TYPE_CLASS: {
- Ref<JavaObject> jo=*p_args[i];
+ Ref<JavaObject> jo = *p_args[i];
if (jo.is_valid()) {
- argv[i].l=jo->instance;
+ argv[i].l = jo->instance;
} else {
- argv[i].l=NULL; //I hope this works
+ argv[i].l = NULL; //I hope this works
}
} break;
- case ARG_ARRAY_BIT|ARG_TYPE_BOOLEAN: {
+ case ARG_ARRAY_BIT | ARG_TYPE_BOOLEAN: {
Array arr = *p_args[i];
jbooleanArray a = env->NewBooleanArray(arr.size());
- for(int j=0;j<arr.size();j++) {
+ for (int j = 0; j < arr.size(); j++) {
jboolean val = arr[j];
- env->SetBooleanArrayRegion(a,j,1,&val);
+ env->SetBooleanArrayRegion(a, j, 1, &val);
}
- argv[i].l=a;
+ argv[i].l = a;
to_free.push_back(a);
} break;
- case ARG_ARRAY_BIT|ARG_TYPE_BYTE: {
+ case ARG_ARRAY_BIT | ARG_TYPE_BYTE: {
Array arr = *p_args[i];
jbyteArray a = env->NewByteArray(arr.size());
- for(int j=0;j<arr.size();j++) {
+ for (int j = 0; j < arr.size(); j++) {
jbyte val = arr[j];
- env->SetByteArrayRegion(a,j,1,&val);
+ env->SetByteArrayRegion(a, j, 1, &val);
}
- argv[i].l=a;
+ argv[i].l = a;
to_free.push_back(a);
-
} break;
- case ARG_ARRAY_BIT|ARG_TYPE_CHAR: {
+ case ARG_ARRAY_BIT | ARG_TYPE_CHAR: {
Array arr = *p_args[i];
jcharArray a = env->NewCharArray(arr.size());
- for(int j=0;j<arr.size();j++) {
+ for (int j = 0; j < arr.size(); j++) {
jchar val = arr[j];
- env->SetCharArrayRegion(a,j,1,&val);
+ env->SetCharArrayRegion(a, j, 1, &val);
}
- argv[i].l=a;
+ argv[i].l = a;
to_free.push_back(a);
} break;
- case ARG_ARRAY_BIT|ARG_TYPE_SHORT: {
+ case ARG_ARRAY_BIT | ARG_TYPE_SHORT: {
Array arr = *p_args[i];
jshortArray a = env->NewShortArray(arr.size());
- for(int j=0;j<arr.size();j++) {
+ for (int j = 0; j < arr.size(); j++) {
jshort val = arr[j];
- env->SetShortArrayRegion(a,j,1,&val);
+ env->SetShortArrayRegion(a, j, 1, &val);
}
- argv[i].l=a;
+ argv[i].l = a;
to_free.push_back(a);
} break;
- case ARG_ARRAY_BIT|ARG_TYPE_INT: {
+ case ARG_ARRAY_BIT | ARG_TYPE_INT: {
Array arr = *p_args[i];
jintArray a = env->NewIntArray(arr.size());
- for(int j=0;j<arr.size();j++) {
+ for (int j = 0; j < arr.size(); j++) {
jint val = arr[j];
- env->SetIntArrayRegion(a,j,1,&val);
+ env->SetIntArrayRegion(a, j, 1, &val);
}
- argv[i].l=a;
+ argv[i].l = a;
to_free.push_back(a);
} break;
- case ARG_ARRAY_BIT|ARG_TYPE_LONG: {
+ case ARG_ARRAY_BIT | ARG_TYPE_LONG: {
Array arr = *p_args[i];
jlongArray a = env->NewLongArray(arr.size());
- for(int j=0;j<arr.size();j++) {
+ for (int j = 0; j < arr.size(); j++) {
jlong val = arr[j];
- env->SetLongArrayRegion(a,j,1,&val);
+ env->SetLongArrayRegion(a, j, 1, &val);
}
- argv[i].l=a;
+ argv[i].l = a;
to_free.push_back(a);
} break;
- case ARG_ARRAY_BIT|ARG_TYPE_FLOAT: {
+ case ARG_ARRAY_BIT | ARG_TYPE_FLOAT: {
Array arr = *p_args[i];
jfloatArray a = env->NewFloatArray(arr.size());
- for(int j=0;j<arr.size();j++) {
+ for (int j = 0; j < arr.size(); j++) {
jfloat val = arr[j];
- env->SetFloatArrayRegion(a,j,1,&val);
+ env->SetFloatArrayRegion(a, j, 1, &val);
}
- argv[i].l=a;
+ argv[i].l = a;
to_free.push_back(a);
-
} break;
- case ARG_ARRAY_BIT|ARG_TYPE_DOUBLE: {
+ case ARG_ARRAY_BIT | ARG_TYPE_DOUBLE: {
Array arr = *p_args[i];
jdoubleArray a = env->NewDoubleArray(arr.size());
- for(int j=0;j<arr.size();j++) {
+ for (int j = 0; j < arr.size(); j++) {
jdouble val = arr[j];
- env->SetDoubleArrayRegion(a,j,1,&val);
+ env->SetDoubleArrayRegion(a, j, 1, &val);
}
- argv[i].l=a;
+ argv[i].l = a;
to_free.push_back(a);
} break;
- case ARG_ARRAY_BIT|ARG_TYPE_STRING: {
+ case ARG_ARRAY_BIT | ARG_TYPE_STRING: {
Array arr = *p_args[i];
- jobjectArray a = env->NewObjectArray(arr.size(),env->FindClass("java/lang/String"),NULL);
- for(int j=0;j<arr.size();j++) {
+ jobjectArray a = env->NewObjectArray(arr.size(), env->FindClass("java/lang/String"), NULL);
+ for (int j = 0; j < arr.size(); j++) {
String s = arr[j];
jstring jStr = env->NewStringUTF(s.utf8().get_data());
- env->SetObjectArrayElement(a,j,jStr);
+ env->SetObjectArrayElement(a, j, jStr);
to_free.push_back(jStr);
}
- argv[i].l=a;
+ argv[i].l = a;
to_free.push_back(a);
} break;
- case ARG_ARRAY_BIT|ARG_TYPE_CLASS: {
+ case ARG_ARRAY_BIT | ARG_TYPE_CLASS: {
- argv[i].l=NULL;
+ argv[i].l = NULL;
} break;
}
}
- r_error.error=Variant::CallError::CALL_OK;
- bool success=true;
-
- switch(method->return_type) {
+ r_error.error = Variant::CallError::CALL_OK;
+ bool success = true;
+ switch (method->return_type) {
case ARG_TYPE_VOID: {
if (method->_static) {
- env->CallStaticVoidMethodA(_class,method->method,argv);
+ env->CallStaticVoidMethodA(_class, method->method, argv);
} else {
- env->CallVoidMethodA(p_instance->instance,method->method,argv);
+ env->CallVoidMethodA(p_instance->instance, method->method, argv);
}
- ret=Variant();
+ ret = Variant();
} break;
case ARG_TYPE_BOOLEAN: {
if (method->_static) {
- ret=env->CallStaticBooleanMethodA(_class,method->method,argv);
+ ret = env->CallStaticBooleanMethodA(_class, method->method, argv);
} else {
- ret=env->CallBooleanMethodA(p_instance->instance,method->method,argv);
+ ret = env->CallBooleanMethodA(p_instance->instance, method->method, argv);
}
} break;
case ARG_TYPE_BYTE: {
if (method->_static) {
- ret=env->CallStaticByteMethodA(_class,method->method,argv);
+ ret = env->CallStaticByteMethodA(_class, method->method, argv);
} else {
- ret=env->CallByteMethodA(p_instance->instance,method->method,argv);
+ ret = env->CallByteMethodA(p_instance->instance, method->method, argv);
}
} break;
case ARG_TYPE_CHAR: {
if (method->_static) {
- ret=env->CallStaticCharMethodA(_class,method->method,argv);
+ ret = env->CallStaticCharMethodA(_class, method->method, argv);
} else {
- ret=env->CallCharMethodA(p_instance->instance,method->method,argv);
+ ret = env->CallCharMethodA(p_instance->instance, method->method, argv);
}
} break;
case ARG_TYPE_SHORT: {
if (method->_static) {
- ret=env->CallStaticShortMethodA(_class,method->method,argv);
+ ret = env->CallStaticShortMethodA(_class, method->method, argv);
} else {
- ret=env->CallShortMethodA(p_instance->instance,method->method,argv);
+ ret = env->CallShortMethodA(p_instance->instance, method->method, argv);
}
} break;
case ARG_TYPE_INT: {
if (method->_static) {
- ret=env->CallStaticIntMethodA(_class,method->method,argv);
+ ret = env->CallStaticIntMethodA(_class, method->method, argv);
} else {
- ret=env->CallIntMethodA(p_instance->instance,method->method,argv);
+ ret = env->CallIntMethodA(p_instance->instance, method->method, argv);
}
} break;
case ARG_TYPE_LONG: {
if (method->_static) {
- ret=env->CallStaticLongMethodA(_class,method->method,argv);
+ ret = env->CallStaticLongMethodA(_class, method->method, argv);
} else {
- ret=env->CallLongMethodA(p_instance->instance,method->method,argv);
+ ret = env->CallLongMethodA(p_instance->instance, method->method, argv);
}
} break;
case ARG_TYPE_FLOAT: {
if (method->_static) {
- ret=env->CallStaticFloatMethodA(_class,method->method,argv);
+ ret = env->CallStaticFloatMethodA(_class, method->method, argv);
} else {
- ret=env->CallFloatMethodA(p_instance->instance,method->method,argv);
+ ret = env->CallFloatMethodA(p_instance->instance, method->method, argv);
}
} break;
case ARG_TYPE_DOUBLE: {
if (method->_static) {
- ret=env->CallStaticDoubleMethodA(_class,method->method,argv);
+ ret = env->CallStaticDoubleMethodA(_class, method->method, argv);
} else {
- ret=env->CallDoubleMethodA(p_instance->instance,method->method,argv);
+ ret = env->CallDoubleMethodA(p_instance->instance, method->method, argv);
}
} break;
@@ -499,375 +487,366 @@ bool JavaClass::_call_method(JavaObject* p_instance,const StringName& p_method,c
jobject obj;
if (method->_static) {
- obj=env->CallStaticObjectMethodA(_class,method->method,argv);
+ obj = env->CallStaticObjectMethodA(_class, method->method, argv);
} else {
- obj=env->CallObjectMethodA(p_instance->instance,method->method,argv);
+ obj = env->CallObjectMethodA(p_instance->instance, method->method, argv);
}
if (!obj) {
- ret=Variant();
+ ret = Variant();
} else {
- if (!_convert_object_to_variant(env, obj, ret,method->return_type)) {
- ret=Variant();
- r_error.error=Variant::CallError::CALL_ERROR_INVALID_METHOD;
- success=false;
+ if (!_convert_object_to_variant(env, obj, ret, method->return_type)) {
+ ret = Variant();
+ r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
+ success = false;
}
env->DeleteLocalRef(obj);
}
} break;
-
}
- for(List<jobject>::Element *E=to_free.front();E;E=E->next()) {
+ for (List<jobject>::Element *E = to_free.front(); E; E = E->next()) {
env->DeleteLocalRef(E->get());
}
return success;
}
-Variant JavaClass::call(const StringName& p_method,const Variant** p_args,int p_argcount,Variant::CallError &r_error) {
+Variant JavaClass::call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error) {
Variant ret;
- bool found = _call_method(NULL,p_method,p_args,p_argcount,r_error,ret);
+ bool found = _call_method(NULL, p_method, p_args, p_argcount, r_error, ret);
if (found) {
return ret;
}
- return Reference::call(p_method,p_args,p_argcount,r_error);
+ return Reference::call(p_method, p_args, p_argcount, r_error);
}
JavaClass::JavaClass() {
-
}
/////////////////////
-Variant JavaObject::call(const StringName& p_method,const Variant** p_args,int p_argcount,Variant::CallError &r_error){
+Variant JavaObject::call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error) {
return Variant();
}
-JavaObject::JavaObject(const Ref<JavaClass>& p_base,jobject *p_instance) {
-
+JavaObject::JavaObject(const Ref<JavaClass> &p_base, jobject *p_instance) {
}
-JavaObject::~JavaObject(){
-
+JavaObject::~JavaObject() {
}
-
////////////////////
void JavaClassWrapper::_bind_methods() {
- ClassDB::bind_method(D_METHOD("wrap:JavaClass","name"),&JavaClassWrapper::wrap);
+ ClassDB::bind_method(D_METHOD("wrap:JavaClass", "name"), &JavaClassWrapper::wrap);
}
-
-bool JavaClassWrapper::_get_type_sig(JNIEnv *env,jobject obj,uint32_t& sig,String&strsig) {
+bool JavaClassWrapper::_get_type_sig(JNIEnv *env, jobject obj, uint32_t &sig, String &strsig) {
jstring name2 = (jstring)env->CallObjectMethod(obj, Class_getName);
- String str_type = env->GetStringUTFChars( name2, NULL );
- print_line("name: "+str_type);
+ String str_type = env->GetStringUTFChars(name2, NULL);
+ print_line("name: " + str_type);
env->DeleteLocalRef(name2);
- uint32_t t=0;
+ uint32_t t = 0;
if (str_type.begins_with("[")) {
- t=JavaClass::ARG_ARRAY_BIT;
- strsig="[";
- str_type=str_type.substr(1,str_type.length()-1);
+ t = JavaClass::ARG_ARRAY_BIT;
+ strsig = "[";
+ str_type = str_type.substr(1, str_type.length() - 1);
if (str_type.begins_with("[")) {
- print_line("Nested arrays not supported for type: "+str_type);
+ print_line("Nested arrays not supported for type: " + str_type);
return false;
}
if (str_type.begins_with("L")) {
- str_type=str_type.substr(1,str_type.length()-2); //ok it's a class
+ str_type = str_type.substr(1, str_type.length() - 2); //ok it's a class
}
}
- if (str_type=="void" || str_type=="V") {
- t|=JavaClass::ARG_TYPE_VOID;
- strsig+="V";
- } else if (str_type=="boolean" || str_type=="Z") {
- t|=JavaClass::ARG_TYPE_BOOLEAN;
- strsig+="Z";
- } else if (str_type=="byte" || str_type=="B") {
- t|=JavaClass::ARG_TYPE_BYTE;
- strsig+="B";
- } else if (str_type=="char" || str_type=="C") {
- t|=JavaClass::ARG_TYPE_CHAR;
- strsig+="C";
- } else if (str_type=="short" || str_type=="S") {
- t|=JavaClass::ARG_TYPE_SHORT;
- strsig+="S";
- } else if (str_type=="int" || str_type=="I") {
- t|=JavaClass::ARG_TYPE_INT;
- strsig+="I";
- } else if (str_type=="long" || str_type=="J") {
- t|=JavaClass::ARG_TYPE_LONG;
- strsig+="J";
- } else if (str_type=="float" || str_type=="F") {
- t|=JavaClass::ARG_TYPE_FLOAT;
- strsig+="F";
- } else if (str_type=="double" || str_type=="D") {
- t|=JavaClass::ARG_TYPE_DOUBLE;
- strsig+="D";
- } else if (str_type=="java.lang.String") {
- t|=JavaClass::ARG_TYPE_STRING;
- strsig+="Ljava/lang/String;";
- } else if (str_type=="java.lang.Boolean") {
- t|=JavaClass::ARG_TYPE_BOOLEAN|JavaClass::ARG_NUMBER_CLASS_BIT;
- strsig+="Ljava/lang/Boolean;";
- } else if (str_type=="java.lang.Byte") {
- t|=JavaClass::ARG_TYPE_BYTE|JavaClass::ARG_NUMBER_CLASS_BIT;
- strsig+="Ljava/lang/Byte;";
- } else if (str_type=="java.lang.Character") {
- t|=JavaClass::ARG_TYPE_CHAR|JavaClass::ARG_NUMBER_CLASS_BIT;
- strsig+="Ljava/lang/Character;";
- } else if (str_type=="java.lang.Short") {
- t|=JavaClass::ARG_TYPE_SHORT|JavaClass::ARG_NUMBER_CLASS_BIT;
- strsig+="Ljava/lang/Short;";
- } else if (str_type=="java.lang.Integer") {
- t|=JavaClass::ARG_TYPE_INT|JavaClass::ARG_NUMBER_CLASS_BIT;
- strsig+="Ljava/lang/Integer;";
- } else if (str_type=="java.lang.Long") {
- t|=JavaClass::ARG_TYPE_LONG|JavaClass::ARG_NUMBER_CLASS_BIT;
- strsig+="Ljava/lang/Long;";
- } else if (str_type=="java.lang.Float") {
- t|=JavaClass::ARG_TYPE_FLOAT|JavaClass::ARG_NUMBER_CLASS_BIT;
- strsig+="Ljava/lang/Float;";
- } else if (str_type=="java.lang.Double") {
- t|=JavaClass::ARG_TYPE_DOUBLE|JavaClass::ARG_NUMBER_CLASS_BIT;
- strsig+="Ljava/lang/Double;";
+ if (str_type == "void" || str_type == "V") {
+ t |= JavaClass::ARG_TYPE_VOID;
+ strsig += "V";
+ } else if (str_type == "boolean" || str_type == "Z") {
+ t |= JavaClass::ARG_TYPE_BOOLEAN;
+ strsig += "Z";
+ } else if (str_type == "byte" || str_type == "B") {
+ t |= JavaClass::ARG_TYPE_BYTE;
+ strsig += "B";
+ } else if (str_type == "char" || str_type == "C") {
+ t |= JavaClass::ARG_TYPE_CHAR;
+ strsig += "C";
+ } else if (str_type == "short" || str_type == "S") {
+ t |= JavaClass::ARG_TYPE_SHORT;
+ strsig += "S";
+ } else if (str_type == "int" || str_type == "I") {
+ t |= JavaClass::ARG_TYPE_INT;
+ strsig += "I";
+ } else if (str_type == "long" || str_type == "J") {
+ t |= JavaClass::ARG_TYPE_LONG;
+ strsig += "J";
+ } else if (str_type == "float" || str_type == "F") {
+ t |= JavaClass::ARG_TYPE_FLOAT;
+ strsig += "F";
+ } else if (str_type == "double" || str_type == "D") {
+ t |= JavaClass::ARG_TYPE_DOUBLE;
+ strsig += "D";
+ } else if (str_type == "java.lang.String") {
+ t |= JavaClass::ARG_TYPE_STRING;
+ strsig += "Ljava/lang/String;";
+ } else if (str_type == "java.lang.Boolean") {
+ t |= JavaClass::ARG_TYPE_BOOLEAN | JavaClass::ARG_NUMBER_CLASS_BIT;
+ strsig += "Ljava/lang/Boolean;";
+ } else if (str_type == "java.lang.Byte") {
+ t |= JavaClass::ARG_TYPE_BYTE | JavaClass::ARG_NUMBER_CLASS_BIT;
+ strsig += "Ljava/lang/Byte;";
+ } else if (str_type == "java.lang.Character") {
+ t |= JavaClass::ARG_TYPE_CHAR | JavaClass::ARG_NUMBER_CLASS_BIT;
+ strsig += "Ljava/lang/Character;";
+ } else if (str_type == "java.lang.Short") {
+ t |= JavaClass::ARG_TYPE_SHORT | JavaClass::ARG_NUMBER_CLASS_BIT;
+ strsig += "Ljava/lang/Short;";
+ } else if (str_type == "java.lang.Integer") {
+ t |= JavaClass::ARG_TYPE_INT | JavaClass::ARG_NUMBER_CLASS_BIT;
+ strsig += "Ljava/lang/Integer;";
+ } else if (str_type == "java.lang.Long") {
+ t |= JavaClass::ARG_TYPE_LONG | JavaClass::ARG_NUMBER_CLASS_BIT;
+ strsig += "Ljava/lang/Long;";
+ } else if (str_type == "java.lang.Float") {
+ t |= JavaClass::ARG_TYPE_FLOAT | JavaClass::ARG_NUMBER_CLASS_BIT;
+ strsig += "Ljava/lang/Float;";
+ } else if (str_type == "java.lang.Double") {
+ t |= JavaClass::ARG_TYPE_DOUBLE | JavaClass::ARG_NUMBER_CLASS_BIT;
+ strsig += "Ljava/lang/Double;";
} else {
//a class likely
- strsig+="L"+str_type.replace(".","/")+";";
- t|=JavaClass::ARG_TYPE_CLASS;
+ strsig += "L" + str_type.replace(".", "/") + ";";
+ t |= JavaClass::ARG_TYPE_CLASS;
}
- sig=t;
-
+ sig = t;
return true;
-
}
-bool JavaClass::_convert_object_to_variant(JNIEnv * env, jobject obj, Variant& var,uint32_t p_sig) {
+bool JavaClass::_convert_object_to_variant(JNIEnv *env, jobject obj, Variant &var, uint32_t p_sig) {
if (!obj) {
- var=Variant(); //seems null is just null...
+ var = Variant(); //seems null is just null...
return true;
}
-
- switch(p_sig) {
+ switch (p_sig) {
case ARG_TYPE_VOID: {
return Variant();
} break;
- case ARG_TYPE_BOOLEAN|ARG_NUMBER_CLASS_BIT: {
+ case ARG_TYPE_BOOLEAN | ARG_NUMBER_CLASS_BIT: {
var = env->CallBooleanMethod(obj, JavaClassWrapper::singleton->Boolean_booleanValue);
return true;
} break;
- case ARG_TYPE_BYTE|ARG_NUMBER_CLASS_BIT: {
+ case ARG_TYPE_BYTE | ARG_NUMBER_CLASS_BIT: {
var = env->CallByteMethod(obj, JavaClassWrapper::singleton->Byte_byteValue);
return true;
} break;
- case ARG_TYPE_CHAR|ARG_NUMBER_CLASS_BIT: {
+ case ARG_TYPE_CHAR | ARG_NUMBER_CLASS_BIT: {
var = env->CallCharMethod(obj, JavaClassWrapper::singleton->Character_characterValue);
return true;
} break;
- case ARG_TYPE_SHORT|ARG_NUMBER_CLASS_BIT: {
+ case ARG_TYPE_SHORT | ARG_NUMBER_CLASS_BIT: {
var = env->CallShortMethod(obj, JavaClassWrapper::singleton->Short_shortValue);
return true;
} break;
- case ARG_TYPE_INT|ARG_NUMBER_CLASS_BIT: {
+ case ARG_TYPE_INT | ARG_NUMBER_CLASS_BIT: {
var = env->CallIntMethod(obj, JavaClassWrapper::singleton->Integer_integerValue);
return true;
} break;
- case ARG_TYPE_LONG|ARG_NUMBER_CLASS_BIT: {
+ case ARG_TYPE_LONG | ARG_NUMBER_CLASS_BIT: {
var = env->CallLongMethod(obj, JavaClassWrapper::singleton->Long_longValue);
return true;
} break;
- case ARG_TYPE_FLOAT|ARG_NUMBER_CLASS_BIT: {
+ case ARG_TYPE_FLOAT | ARG_NUMBER_CLASS_BIT: {
var = env->CallFloatMethod(obj, JavaClassWrapper::singleton->Float_floatValue);
return true;
} break;
- case ARG_TYPE_DOUBLE|ARG_NUMBER_CLASS_BIT: {
+ case ARG_TYPE_DOUBLE | ARG_NUMBER_CLASS_BIT: {
var = env->CallDoubleMethod(obj, JavaClassWrapper::singleton->Double_doubleValue);
return true;
} break;
case ARG_TYPE_STRING: {
- var = String::utf8(env->GetStringUTFChars( (jstring)obj, NULL ));
+ var = String::utf8(env->GetStringUTFChars((jstring)obj, NULL));
return true;
} break;
case ARG_TYPE_CLASS: {
return false;
} break;
- case ARG_ARRAY_BIT|ARG_TYPE_VOID: {
+ case ARG_ARRAY_BIT | ARG_TYPE_VOID: {
var = Array(); // ?
return true;
} break;
- case ARG_ARRAY_BIT|ARG_TYPE_BOOLEAN: {
+ case ARG_ARRAY_BIT | ARG_TYPE_BOOLEAN: {
Array ret;
jobjectArray arr = (jobjectArray)obj;
int count = env->GetArrayLength(arr);
- for (int i=0; i<count; i++) {
+ for (int i = 0; i < count; i++) {
jboolean val;
- env->GetBooleanArrayRegion((jbooleanArray)arr,0,1,&val);
+ env->GetBooleanArrayRegion((jbooleanArray)arr, 0, 1, &val);
ret.push_back(val);
}
- var=ret;
+ var = ret;
return true;
} break;
- case ARG_ARRAY_BIT|ARG_TYPE_BYTE: {
+ case ARG_ARRAY_BIT | ARG_TYPE_BYTE: {
Array ret;
jobjectArray arr = (jobjectArray)obj;
int count = env->GetArrayLength(arr);
- for (int i=0; i<count; i++) {
+ for (int i = 0; i < count; i++) {
jbyte val;
- env->GetByteArrayRegion((jbyteArray)arr,0,1,&val);
+ env->GetByteArrayRegion((jbyteArray)arr, 0, 1, &val);
ret.push_back(val);
}
- var=ret;
+ var = ret;
return true;
} break;
- case ARG_ARRAY_BIT|ARG_TYPE_CHAR: {
+ case ARG_ARRAY_BIT | ARG_TYPE_CHAR: {
Array ret;
jobjectArray arr = (jobjectArray)obj;
int count = env->GetArrayLength(arr);
- for (int i=0; i<count; i++) {
+ for (int i = 0; i < count; i++) {
jchar val;
- env->GetCharArrayRegion((jcharArray)arr,0,1,&val);
+ env->GetCharArrayRegion((jcharArray)arr, 0, 1, &val);
ret.push_back(val);
}
- var=ret;
+ var = ret;
return true;
} break;
- case ARG_ARRAY_BIT|ARG_TYPE_SHORT: {
+ case ARG_ARRAY_BIT | ARG_TYPE_SHORT: {
Array ret;
jobjectArray arr = (jobjectArray)obj;
int count = env->GetArrayLength(arr);
- for (int i=0; i<count; i++) {
+ for (int i = 0; i < count; i++) {
jshort val;
- env->GetShortArrayRegion((jshortArray)arr,0,1,&val);
+ env->GetShortArrayRegion((jshortArray)arr, 0, 1, &val);
ret.push_back(val);
}
- var=ret;
+ var = ret;
return true;
} break;
- case ARG_ARRAY_BIT|ARG_TYPE_INT: {
+ case ARG_ARRAY_BIT | ARG_TYPE_INT: {
Array ret;
jobjectArray arr = (jobjectArray)obj;
int count = env->GetArrayLength(arr);
- for (int i=0; i<count; i++) {
+ for (int i = 0; i < count; i++) {
jint val;
- env->GetIntArrayRegion((jintArray)arr,0,1,&val);
+ env->GetIntArrayRegion((jintArray)arr, 0, 1, &val);
ret.push_back(val);
}
- var=ret;
+ var = ret;
return true;
} break;
- case ARG_ARRAY_BIT|ARG_TYPE_LONG: {
+ case ARG_ARRAY_BIT | ARG_TYPE_LONG: {
Array ret;
jobjectArray arr = (jobjectArray)obj;
int count = env->GetArrayLength(arr);
- for (int i=0; i<count; i++) {
+ for (int i = 0; i < count; i++) {
jlong val;
- env->GetLongArrayRegion((jlongArray)arr,0,1,&val);
+ env->GetLongArrayRegion((jlongArray)arr, 0, 1, &val);
ret.push_back(val);
}
- var=ret;
+ var = ret;
return true;
} break;
- case ARG_ARRAY_BIT|ARG_TYPE_FLOAT: {
+ case ARG_ARRAY_BIT | ARG_TYPE_FLOAT: {
Array ret;
jobjectArray arr = (jobjectArray)obj;
int count = env->GetArrayLength(arr);
- for (int i=0; i<count; i++) {
+ for (int i = 0; i < count; i++) {
jfloat val;
- env->GetFloatArrayRegion((jfloatArray)arr,0,1,&val);
+ env->GetFloatArrayRegion((jfloatArray)arr, 0, 1, &val);
ret.push_back(val);
}
- var=ret;
+ var = ret;
return true;
} break;
- case ARG_ARRAY_BIT|ARG_TYPE_DOUBLE: {
+ case ARG_ARRAY_BIT | ARG_TYPE_DOUBLE: {
Array ret;
jobjectArray arr = (jobjectArray)obj;
int count = env->GetArrayLength(arr);
- for (int i=0; i<count; i++) {
+ for (int i = 0; i < count; i++) {
jdouble val;
- env->GetDoubleArrayRegion((jdoubleArray)arr,0,1,&val);
+ env->GetDoubleArrayRegion((jdoubleArray)arr, 0, 1, &val);
ret.push_back(val);
}
- var=ret;
+ var = ret;
return true;
} break;
- case ARG_NUMBER_CLASS_BIT|ARG_ARRAY_BIT|ARG_TYPE_BOOLEAN: {
+ case ARG_NUMBER_CLASS_BIT | ARG_ARRAY_BIT | ARG_TYPE_BOOLEAN: {
Array ret;
jobjectArray arr = (jobjectArray)obj;
int count = env->GetArrayLength(arr);
- for (int i=0; i<count; i++) {
+ for (int i = 0; i < count; i++) {
jobject o = env->GetObjectArrayElement(arr, i);
if (!o)
@@ -875,23 +854,22 @@ bool JavaClass::_convert_object_to_variant(JNIEnv * env, jobject obj, Variant& v
else {
bool val = env->CallBooleanMethod(o, JavaClassWrapper::singleton->Boolean_booleanValue);
ret.push_back(val);
-
}
env->DeleteLocalRef(o);
}
- var=ret;
+ var = ret;
return true;
} break;
- case ARG_NUMBER_CLASS_BIT|ARG_ARRAY_BIT|ARG_TYPE_BYTE: {
+ case ARG_NUMBER_CLASS_BIT | ARG_ARRAY_BIT | ARG_TYPE_BYTE: {
Array ret;
jobjectArray arr = (jobjectArray)obj;
int count = env->GetArrayLength(arr);
- for (int i=0; i<count; i++) {
+ for (int i = 0; i < count; i++) {
jobject o = env->GetObjectArrayElement(arr, i);
if (!o)
@@ -899,22 +877,21 @@ bool JavaClass::_convert_object_to_variant(JNIEnv * env, jobject obj, Variant& v
else {
int val = env->CallByteMethod(o, JavaClassWrapper::singleton->Byte_byteValue);
ret.push_back(val);
-
}
env->DeleteLocalRef(o);
}
- var=ret;
+ var = ret;
return true;
} break;
- case ARG_NUMBER_CLASS_BIT|ARG_ARRAY_BIT|ARG_TYPE_CHAR: {
+ case ARG_NUMBER_CLASS_BIT | ARG_ARRAY_BIT | ARG_TYPE_CHAR: {
Array ret;
jobjectArray arr = (jobjectArray)obj;
int count = env->GetArrayLength(arr);
- for (int i=0; i<count; i++) {
+ for (int i = 0; i < count; i++) {
jobject o = env->GetObjectArrayElement(arr, i);
if (!o)
@@ -922,22 +899,21 @@ bool JavaClass::_convert_object_to_variant(JNIEnv * env, jobject obj, Variant& v
else {
int val = env->CallCharMethod(o, JavaClassWrapper::singleton->Character_characterValue);
ret.push_back(val);
-
}
env->DeleteLocalRef(o);
}
- var=ret;
+ var = ret;
return true;
} break;
- case ARG_NUMBER_CLASS_BIT|ARG_ARRAY_BIT|ARG_TYPE_SHORT: {
+ case ARG_NUMBER_CLASS_BIT | ARG_ARRAY_BIT | ARG_TYPE_SHORT: {
Array ret;
jobjectArray arr = (jobjectArray)obj;
int count = env->GetArrayLength(arr);
- for (int i=0; i<count; i++) {
+ for (int i = 0; i < count; i++) {
jobject o = env->GetObjectArrayElement(arr, i);
if (!o)
@@ -945,22 +921,21 @@ bool JavaClass::_convert_object_to_variant(JNIEnv * env, jobject obj, Variant& v
else {
int val = env->CallShortMethod(o, JavaClassWrapper::singleton->Short_shortValue);
ret.push_back(val);
-
}
env->DeleteLocalRef(o);
}
- var=ret;
+ var = ret;
return true;
} break;
- case ARG_NUMBER_CLASS_BIT|ARG_ARRAY_BIT|ARG_TYPE_INT: {
+ case ARG_NUMBER_CLASS_BIT | ARG_ARRAY_BIT | ARG_TYPE_INT: {
Array ret;
jobjectArray arr = (jobjectArray)obj;
int count = env->GetArrayLength(arr);
- for (int i=0; i<count; i++) {
+ for (int i = 0; i < count; i++) {
jobject o = env->GetObjectArrayElement(arr, i);
if (!o)
@@ -968,22 +943,21 @@ bool JavaClass::_convert_object_to_variant(JNIEnv * env, jobject obj, Variant& v
else {
int val = env->CallIntMethod(o, JavaClassWrapper::singleton->Integer_integerValue);
ret.push_back(val);
-
}
env->DeleteLocalRef(o);
}
- var=ret;
+ var = ret;
return true;
} break;
- case ARG_NUMBER_CLASS_BIT|ARG_ARRAY_BIT|ARG_TYPE_LONG: {
+ case ARG_NUMBER_CLASS_BIT | ARG_ARRAY_BIT | ARG_TYPE_LONG: {
Array ret;
jobjectArray arr = (jobjectArray)obj;
int count = env->GetArrayLength(arr);
- for (int i=0; i<count; i++) {
+ for (int i = 0; i < count; i++) {
jobject o = env->GetObjectArrayElement(arr, i);
if (!o)
@@ -991,22 +965,21 @@ bool JavaClass::_convert_object_to_variant(JNIEnv * env, jobject obj, Variant& v
else {
int64_t val = env->CallLongMethod(o, JavaClassWrapper::singleton->Long_longValue);
ret.push_back(val);
-
}
env->DeleteLocalRef(o);
}
- var=ret;
+ var = ret;
return true;
} break;
- case ARG_NUMBER_CLASS_BIT|ARG_ARRAY_BIT|ARG_TYPE_FLOAT: {
+ case ARG_NUMBER_CLASS_BIT | ARG_ARRAY_BIT | ARG_TYPE_FLOAT: {
Array ret;
jobjectArray arr = (jobjectArray)obj;
int count = env->GetArrayLength(arr);
- for (int i=0; i<count; i++) {
+ for (int i = 0; i < count; i++) {
jobject o = env->GetObjectArrayElement(arr, i);
if (!o)
@@ -1014,21 +987,20 @@ bool JavaClass::_convert_object_to_variant(JNIEnv * env, jobject obj, Variant& v
else {
float val = env->CallFloatMethod(o, JavaClassWrapper::singleton->Float_floatValue);
ret.push_back(val);
-
}
env->DeleteLocalRef(o);
}
- var=ret;
+ var = ret;
return true;
} break;
- case ARG_NUMBER_CLASS_BIT|ARG_ARRAY_BIT|ARG_TYPE_DOUBLE: {
+ case ARG_NUMBER_CLASS_BIT | ARG_ARRAY_BIT | ARG_TYPE_DOUBLE: {
Array ret;
jobjectArray arr = (jobjectArray)obj;
int count = env->GetArrayLength(arr);
- for (int i=0; i<count; i++) {
+ for (int i = 0; i < count; i++) {
jobject o = env->GetObjectArrayElement(arr, i);
if (!o)
@@ -1036,58 +1008,53 @@ bool JavaClass::_convert_object_to_variant(JNIEnv * env, jobject obj, Variant& v
else {
double val = env->CallDoubleMethod(o, JavaClassWrapper::singleton->Double_doubleValue);
ret.push_back(val);
-
}
env->DeleteLocalRef(o);
}
- var=ret;
+ var = ret;
return true;
} break;
- case ARG_ARRAY_BIT|ARG_TYPE_STRING: {
+ case ARG_ARRAY_BIT | ARG_TYPE_STRING: {
Array ret;
jobjectArray arr = (jobjectArray)obj;
int count = env->GetArrayLength(arr);
- for (int i=0; i<count; i++) {
+ for (int i = 0; i < count; i++) {
jobject o = env->GetObjectArrayElement(arr, i);
if (!o)
ret.push_back(Variant());
else {
- String val = String::utf8(env->GetStringUTFChars( (jstring)o, NULL ));
+ String val = String::utf8(env->GetStringUTFChars((jstring)o, NULL));
ret.push_back(val);
-
}
env->DeleteLocalRef(o);
}
- var=ret;
+ var = ret;
return true;
} break;
- case ARG_ARRAY_BIT|ARG_TYPE_CLASS: {
+ case ARG_ARRAY_BIT | ARG_TYPE_CLASS: {
} break;
}
return false;
-
}
-
-Ref<JavaClass> JavaClassWrapper::wrap(const String& p_class) {
+Ref<JavaClass> JavaClassWrapper::wrap(const String &p_class) {
if (class_cache.has(p_class))
return class_cache[p_class];
-
JNIEnv *env = ThreadAndroid::get_env();
jclass bclass = env->FindClass(p_class.utf8().get_data());
- ERR_FAIL_COND_V(!bclass,Ref<JavaClass>());
+ ERR_FAIL_COND_V(!bclass, Ref<JavaClass>());
//jmethodID getDeclaredMethods = env->GetMethodID(bclass,"getDeclaredMethods", "()[Ljava/lang/reflect/Method;");
@@ -1095,130 +1062,121 @@ Ref<JavaClass> JavaClassWrapper::wrap(const String& p_class) {
jobjectArray methods = (jobjectArray)env->CallObjectMethod(bclass, getDeclaredMethods);
- ERR_FAIL_COND_V(!methods,Ref<JavaClass>());
+ ERR_FAIL_COND_V(!methods, Ref<JavaClass>());
-
- Ref<JavaClass> java_class = memnew( JavaClass );
+ Ref<JavaClass> java_class = memnew(JavaClass);
int count = env->GetArrayLength(methods);
- for (int i=0; i<count; i++) {
+ for (int i = 0; i < count; i++) {
jobject obj = env->GetObjectArrayElement(methods, i);
ERR_CONTINUE(!obj);
-
jstring name = (jstring)env->CallObjectMethod(obj, getName);
- String str_method = env->GetStringUTFChars( name, NULL );
+ String str_method = env->GetStringUTFChars(name, NULL);
env->DeleteLocalRef(name);
Vector<String> params;
- jint mods = env->CallIntMethod(obj,getModifiers);
+ jint mods = env->CallIntMethod(obj, getModifiers);
- if (!(mods&0x0001)) {
+ if (!(mods & 0x0001)) {
env->DeleteLocalRef(obj);
continue; //not public bye
}
-
-
jobjectArray param_types = (jobjectArray)env->CallObjectMethod(obj, getParameterTypes);
- int count2=env->GetArrayLength(param_types);
+ int count2 = env->GetArrayLength(param_types);
if (!java_class->methods.has(str_method)) {
- java_class->methods[str_method]=List<JavaClass::MethodInfo>();
+ java_class->methods[str_method] = List<JavaClass::MethodInfo>();
}
JavaClass::MethodInfo mi;
- mi._static = (mods&0x8)!=0;
- bool valid=true;
- String signature="(";
+ mi._static = (mods & 0x8) != 0;
+ bool valid = true;
+ String signature = "(";
- for(int j=0;j<count2;j++) {
+ for (int j = 0; j < count2; j++) {
jobject obj2 = env->GetObjectArrayElement(param_types, j);
String strsig;
- uint32_t sig=0;
- if (!_get_type_sig(env,obj2,sig,strsig)) {
- valid=false;
+ uint32_t sig = 0;
+ if (!_get_type_sig(env, obj2, sig, strsig)) {
+ valid = false;
env->DeleteLocalRef(obj2);
break;
}
- signature+=strsig;
+ signature += strsig;
mi.param_types.push_back(sig);
mi.param_sigs.push_back(strsig);
env->DeleteLocalRef(obj2);
-
}
if (!valid) {
- print_line("Method Can't be bound (unsupported arguments): "+p_class+"::"+str_method);
+ print_line("Method Can't be bound (unsupported arguments): " + p_class + "::" + str_method);
env->DeleteLocalRef(obj);
env->DeleteLocalRef(param_types);
continue;
}
- signature+=")";
+ signature += ")";
jobject return_type = (jobject)env->CallObjectMethod(obj, getReturnType);
-
String strsig;
- uint32_t sig=0;
- if (!_get_type_sig(env,return_type,sig,strsig)) {
- print_line("Method Can't be bound (unsupported return type): "+p_class+"::"+str_method);
+ uint32_t sig = 0;
+ if (!_get_type_sig(env, return_type, sig, strsig)) {
+ print_line("Method Can't be bound (unsupported return type): " + p_class + "::" + str_method);
env->DeleteLocalRef(obj);
env->DeleteLocalRef(param_types);
env->DeleteLocalRef(return_type);
continue;
}
- signature+=strsig;
- mi.return_type=sig;
+ signature += strsig;
+ mi.return_type = sig;
- print_line("METHOD: "+str_method+" SIG: "+signature+" static: "+itos(mi._static));
+ print_line("METHOD: " + str_method + " SIG: " + signature + " static: " + itos(mi._static));
- bool discard=false;
+ bool discard = false;
- for(List<JavaClass::MethodInfo>::Element *E=java_class->methods[str_method].front();E;E=E->next()) {
+ for (List<JavaClass::MethodInfo>::Element *E = java_class->methods[str_method].front(); E; E = E->next()) {
- float new_likeliness=0;
- float existing_likeliness=0;
+ float new_likeliness = 0;
+ float existing_likeliness = 0;
- if (E->get().param_types.size()!=mi.param_types.size())
+ if (E->get().param_types.size() != mi.param_types.size())
continue;
- bool valid=true;
- for(int j=0;j<E->get().param_types.size();j++) {
+ bool valid = true;
+ for (int j = 0; j < E->get().param_types.size(); j++) {
Variant::Type _new;
float new_l;
Variant::Type existing;
float existing_l;
- JavaClass::_convert_to_variant_type(E->get().param_types[j],existing,existing_l);
- JavaClass::_convert_to_variant_type(mi.param_types[j],_new,new_l);
- if (_new!=existing) {
- valid=false;
+ JavaClass::_convert_to_variant_type(E->get().param_types[j], existing, existing_l);
+ JavaClass::_convert_to_variant_type(mi.param_types[j], _new, new_l);
+ if (_new != existing) {
+ valid = false;
break;
}
- new_likeliness+=new_l;
- existing_likeliness=existing_l;
-
+ new_likeliness += new_l;
+ existing_likeliness = existing_l;
}
if (!valid)
continue;
- if (new_likeliness>existing_likeliness) {
+ if (new_likeliness > existing_likeliness) {
java_class->methods[str_method].erase(E);
print_line("replace old");
break;
} else {
- discard=true;
+ discard = true;
print_line("old is better");
}
-
-
}
if (!discard) {
@@ -1236,12 +1194,8 @@ Ref<JavaClass> JavaClassWrapper::wrap(const String& p_class) {
env->DeleteLocalRef(param_types);
env->DeleteLocalRef(return_type);
-
-
-
//args[i] = _jobject_to_variant(env, obj);
//print_line("\targ"+itos(i)+": "+Variant::get_type_name(args[i].get_type()));
-
};
env->DeleteLocalRef(methods);
@@ -1250,33 +1204,32 @@ Ref<JavaClass> JavaClassWrapper::wrap(const String& p_class) {
count = env->GetArrayLength(fields);
- for (int i=0; i<count; i++) {
+ for (int i = 0; i < count; i++) {
jobject obj = env->GetObjectArrayElement(fields, i);
ERR_CONTINUE(!obj);
jstring name = (jstring)env->CallObjectMethod(obj, Field_getName);
- String str_field = env->GetStringUTFChars( name, NULL );
+ String str_field = env->GetStringUTFChars(name, NULL);
env->DeleteLocalRef(name);
- print_line("FIELD: "+str_field);
- int mods = env->CallIntMethod(obj,Field_getModifiers);
- if ((mods&0x8) && (mods&0x10) && (mods&0x1)) { //static final public!
+ print_line("FIELD: " + str_field);
+ int mods = env->CallIntMethod(obj, Field_getModifiers);
+ if ((mods & 0x8) && (mods & 0x10) && (mods & 0x1)) { //static final public!
- jobject objc = env->CallObjectMethod(obj, Field_get,NULL);
+ jobject objc = env->CallObjectMethod(obj, Field_get, NULL);
if (objc) {
-
uint32_t sig;
String strsig;
jclass cl = env->GetObjectClass(objc);
- if (JavaClassWrapper::_get_type_sig(env,cl,sig,strsig)) {
+ if (JavaClassWrapper::_get_type_sig(env, cl, sig, strsig)) {
- if ((sig&JavaClass::ARG_TYPE_MASK)<=JavaClass::ARG_TYPE_STRING) {
+ if ((sig & JavaClass::ARG_TYPE_MASK) <= JavaClass::ARG_TYPE_STRING) {
Variant value;
- if (JavaClass::_convert_object_to_variant(env,objc,value,sig)) {
+ if (JavaClass::_convert_object_to_variant(env, objc, value, sig)) {
- java_class->constant_map[str_field]=value;
+ java_class->constant_map[str_field] = value;
}
}
}
@@ -1284,49 +1237,46 @@ Ref<JavaClass> JavaClassWrapper::wrap(const String& p_class) {
env->DeleteLocalRef(cl);
}
-
env->DeleteLocalRef(objc);
-
}
env->DeleteLocalRef(obj);
}
env->DeleteLocalRef(fields);
-
return Ref<JavaClass>();
}
-JavaClassWrapper *JavaClassWrapper::singleton=NULL;
+JavaClassWrapper *JavaClassWrapper::singleton = NULL;
JavaClassWrapper::JavaClassWrapper(jobject p_activity) {
- singleton=this;
+ singleton = this;
JNIEnv *env = ThreadAndroid::get_env();
jclass activityClass = env->FindClass("org/godotengine/godot/Godot");
- jmethodID getClassLoader = env->GetMethodID(activityClass,"getClassLoader", "()Ljava/lang/ClassLoader;");
+ jmethodID getClassLoader = env->GetMethodID(activityClass, "getClassLoader", "()Ljava/lang/ClassLoader;");
classLoader = env->CallObjectMethod(p_activity, getClassLoader);
- classLoader=(jclass)env->NewGlobalRef(classLoader);
+ classLoader = (jclass)env->NewGlobalRef(classLoader);
jclass classLoaderClass = env->FindClass("java/lang/ClassLoader");
findClass = env->GetMethodID(classLoaderClass, "loadClass", "(Ljava/lang/String;)Ljava/lang/Class;");
jclass bclass = env->FindClass("java/lang/Class");
- getDeclaredMethods = env->GetMethodID(bclass,"getDeclaredMethods", "()[Ljava/lang/reflect/Method;");
- getFields = env->GetMethodID(bclass,"getFields", "()[Ljava/lang/reflect/Field;");
- Class_getName = env->GetMethodID(bclass,"getName", "()Ljava/lang/String;");
+ getDeclaredMethods = env->GetMethodID(bclass, "getDeclaredMethods", "()[Ljava/lang/reflect/Method;");
+ getFields = env->GetMethodID(bclass, "getFields", "()[Ljava/lang/reflect/Field;");
+ Class_getName = env->GetMethodID(bclass, "getName", "()Ljava/lang/String;");
//
bclass = env->FindClass("java/lang/reflect/Method");
- getParameterTypes = env->GetMethodID(bclass,"getParameterTypes", "()[Ljava/lang/Class;");
- getReturnType = env->GetMethodID(bclass,"getReturnType", "()Ljava/lang/Class;");
- getName = env->GetMethodID(bclass,"getName", "()Ljava/lang/String;");
- getModifiers = env->GetMethodID(bclass,"getModifiers", "()I");
+ getParameterTypes = env->GetMethodID(bclass, "getParameterTypes", "()[Ljava/lang/Class;");
+ getReturnType = env->GetMethodID(bclass, "getReturnType", "()Ljava/lang/Class;");
+ getName = env->GetMethodID(bclass, "getName", "()Ljava/lang/String;");
+ getModifiers = env->GetMethodID(bclass, "getModifiers", "()I");
///
bclass = env->FindClass("java/lang/reflect/Field");
- Field_getName = env->GetMethodID(bclass,"getName", "()Ljava/lang/String;");
- Field_getModifiers = env->GetMethodID(bclass,"getModifiers", "()I");
- Field_get = env->GetMethodID(bclass,"get", "(Ljava/lang/Object;)Ljava/lang/Object;");
+ Field_getName = env->GetMethodID(bclass, "getName", "()Ljava/lang/String;");
+ Field_getModifiers = env->GetMethodID(bclass, "getModifiers", "()I");
+ Field_get = env->GetMethodID(bclass, "get", "(Ljava/lang/Object;)Ljava/lang/Object;");
// each
bclass = env->FindClass("java/lang/Boolean");
Boolean_booleanValue = env->GetMethodID(bclass, "booleanValue", "()Z");
@@ -1351,5 +1301,4 @@ JavaClassWrapper::JavaClassWrapper(jobject p_activity) {
bclass = env->FindClass("java/lang/Double");
Double_doubleValue = env->GetMethodID(bclass, "doubleValue", "()D");
-
}
diff --git a/platform/android/java_class_wrapper.h b/platform/android/java_class_wrapper.h
index f0156563b..dcc997344 100644
--- a/platform/android/java_class_wrapper.h
+++ b/platform/android/java_class_wrapper.h
@@ -30,14 +30,14 @@
#define JAVA_CLASS_WRAPPER_H
#include "reference.h"
-#include <jni.h>
#include <android/log.h>
+#include <jni.h>
class JavaObject;
class JavaClass : public Reference {
- GDCLASS(JavaClass,Reference);
+ GDCLASS(JavaClass, Reference);
enum ArgumentType {
@@ -52,13 +52,12 @@ class JavaClass : public Reference {
ARG_TYPE_DOUBLE,
ARG_TYPE_STRING, //special case
ARG_TYPE_CLASS,
- ARG_ARRAY_BIT=1<<16,
- ARG_NUMBER_CLASS_BIT=1<<17,
- ARG_TYPE_MASK=(1<<16)-1
+ ARG_ARRAY_BIT = 1 << 16,
+ ARG_NUMBER_CLASS_BIT = 1 << 17,
+ ARG_TYPE_MASK = (1 << 16) - 1
};
-
- Map<StringName,Variant> constant_map;
+ Map<StringName, Variant> constant_map;
struct MethodInfo {
@@ -67,94 +66,126 @@ class JavaClass : public Reference {
Vector<StringName> param_sigs;
uint32_t return_type;
jmethodID method;
-
};
- _FORCE_INLINE_ static void _convert_to_variant_type(int p_sig, Variant::Type& r_type, float& likelyhood) {
+ _FORCE_INLINE_ static void _convert_to_variant_type(int p_sig, Variant::Type &r_type, float &likelyhood) {
- likelyhood=1.0;
- r_type=Variant::NIL;
+ likelyhood = 1.0;
+ r_type = Variant::NIL;
- switch(p_sig) {
+ switch (p_sig) {
- case ARG_TYPE_VOID: r_type=Variant::NIL; break;
- case ARG_TYPE_BOOLEAN|ARG_NUMBER_CLASS_BIT:
- case ARG_TYPE_BOOLEAN: r_type=Variant::BOOL; break;
- case ARG_TYPE_BYTE|ARG_NUMBER_CLASS_BIT:
- case ARG_TYPE_BYTE: r_type=Variant::INT; likelyhood=0.1; break;
- case ARG_TYPE_CHAR|ARG_NUMBER_CLASS_BIT:
- case ARG_TYPE_CHAR: r_type=Variant::INT; likelyhood=0.2; break;
- case ARG_TYPE_SHORT|ARG_NUMBER_CLASS_BIT:
- case ARG_TYPE_SHORT: r_type=Variant::INT; likelyhood=0.3; break;
- case ARG_TYPE_INT|ARG_NUMBER_CLASS_BIT:
- case ARG_TYPE_INT: r_type=Variant::INT; likelyhood=1.0; break;
- case ARG_TYPE_LONG|ARG_NUMBER_CLASS_BIT:
- case ARG_TYPE_LONG: r_type=Variant::INT; likelyhood=0.5; break;
- case ARG_TYPE_FLOAT|ARG_NUMBER_CLASS_BIT:
- case ARG_TYPE_FLOAT: r_type=Variant::REAL; likelyhood=1.0; break;
- case ARG_TYPE_DOUBLE|ARG_NUMBER_CLASS_BIT:
- case ARG_TYPE_DOUBLE: r_type=Variant::REAL; likelyhood=0.5; break;
- case ARG_TYPE_STRING: r_type=Variant::STRING; break;
- case ARG_TYPE_CLASS: r_type=Variant::OBJECT; break;
- case ARG_ARRAY_BIT|ARG_TYPE_VOID: r_type=Variant::NIL; break;
- case ARG_ARRAY_BIT|ARG_TYPE_BOOLEAN: r_type=Variant::ARRAY; break;
- case ARG_ARRAY_BIT|ARG_TYPE_BYTE: r_type=Variant::POOL_BYTE_ARRAY; likelyhood=1.0; break;
- case ARG_ARRAY_BIT|ARG_TYPE_CHAR: r_type=Variant::POOL_BYTE_ARRAY; likelyhood=0.5; break;
- case ARG_ARRAY_BIT|ARG_TYPE_SHORT: r_type=Variant::POOL_INT_ARRAY; likelyhood=0.3; break;
- case ARG_ARRAY_BIT|ARG_TYPE_INT: r_type=Variant::POOL_INT_ARRAY; likelyhood=1.0; break;
- case ARG_ARRAY_BIT|ARG_TYPE_LONG: r_type=Variant::POOL_INT_ARRAY; likelyhood=0.5; break;
- case ARG_ARRAY_BIT|ARG_TYPE_FLOAT: r_type=Variant::POOL_REAL_ARRAY; likelyhood=1.0; break;
- case ARG_ARRAY_BIT|ARG_TYPE_DOUBLE: r_type=Variant::POOL_REAL_ARRAY; likelyhood=0.5; break;
- case ARG_ARRAY_BIT|ARG_TYPE_STRING: r_type=Variant::POOL_STRING_ARRAY; break;
- case ARG_ARRAY_BIT|ARG_TYPE_CLASS: r_type=Variant::ARRAY; break;
+ case ARG_TYPE_VOID: r_type = Variant::NIL; break;
+ case ARG_TYPE_BOOLEAN | ARG_NUMBER_CLASS_BIT:
+ case ARG_TYPE_BOOLEAN: r_type = Variant::BOOL; break;
+ case ARG_TYPE_BYTE | ARG_NUMBER_CLASS_BIT:
+ case ARG_TYPE_BYTE:
+ r_type = Variant::INT;
+ likelyhood = 0.1;
+ break;
+ case ARG_TYPE_CHAR | ARG_NUMBER_CLASS_BIT:
+ case ARG_TYPE_CHAR:
+ r_type = Variant::INT;
+ likelyhood = 0.2;
+ break;
+ case ARG_TYPE_SHORT | ARG_NUMBER_CLASS_BIT:
+ case ARG_TYPE_SHORT:
+ r_type = Variant::INT;
+ likelyhood = 0.3;
+ break;
+ case ARG_TYPE_INT | ARG_NUMBER_CLASS_BIT:
+ case ARG_TYPE_INT:
+ r_type = Variant::INT;
+ likelyhood = 1.0;
+ break;
+ case ARG_TYPE_LONG | ARG_NUMBER_CLASS_BIT:
+ case ARG_TYPE_LONG:
+ r_type = Variant::INT;
+ likelyhood = 0.5;
+ break;
+ case ARG_TYPE_FLOAT | ARG_NUMBER_CLASS_BIT:
+ case ARG_TYPE_FLOAT:
+ r_type = Variant::REAL;
+ likelyhood = 1.0;
+ break;
+ case ARG_TYPE_DOUBLE | ARG_NUMBER_CLASS_BIT:
+ case ARG_TYPE_DOUBLE:
+ r_type = Variant::REAL;
+ likelyhood = 0.5;
+ break;
+ case ARG_TYPE_STRING: r_type = Variant::STRING; break;
+ case ARG_TYPE_CLASS: r_type = Variant::OBJECT; break;
+ case ARG_ARRAY_BIT | ARG_TYPE_VOID: r_type = Variant::NIL; break;
+ case ARG_ARRAY_BIT | ARG_TYPE_BOOLEAN: r_type = Variant::ARRAY; break;
+ case ARG_ARRAY_BIT | ARG_TYPE_BYTE:
+ r_type = Variant::POOL_BYTE_ARRAY;
+ likelyhood = 1.0;
+ break;
+ case ARG_ARRAY_BIT | ARG_TYPE_CHAR:
+ r_type = Variant::POOL_BYTE_ARRAY;
+ likelyhood = 0.5;
+ break;
+ case ARG_ARRAY_BIT | ARG_TYPE_SHORT:
+ r_type = Variant::POOL_INT_ARRAY;
+ likelyhood = 0.3;
+ break;
+ case ARG_ARRAY_BIT | ARG_TYPE_INT:
+ r_type = Variant::POOL_INT_ARRAY;
+ likelyhood = 1.0;
+ break;
+ case ARG_ARRAY_BIT | ARG_TYPE_LONG:
+ r_type = Variant::POOL_INT_ARRAY;
+ likelyhood = 0.5;
+ break;
+ case ARG_ARRAY_BIT | ARG_TYPE_FLOAT:
+ r_type = Variant::POOL_REAL_ARRAY;
+ likelyhood = 1.0;
+ break;
+ case ARG_ARRAY_BIT | ARG_TYPE_DOUBLE:
+ r_type = Variant::POOL_REAL_ARRAY;
+ likelyhood = 0.5;
+ break;
+ case ARG_ARRAY_BIT | ARG_TYPE_STRING: r_type = Variant::POOL_STRING_ARRAY; break;
+ case ARG_ARRAY_BIT | ARG_TYPE_CLASS: r_type = Variant::ARRAY; break;
}
}
- _FORCE_INLINE_ static bool _convert_object_to_variant(JNIEnv * env, jobject obj, Variant& var,uint32_t p_sig);
+ _FORCE_INLINE_ static bool _convert_object_to_variant(JNIEnv *env, jobject obj, Variant &var, uint32_t p_sig);
+ bool _call_method(JavaObject *p_instance, const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error, Variant &ret);
-
- bool _call_method(JavaObject* p_instance,const StringName& p_method,const Variant** p_args,int p_argcount,Variant::CallError &r_error,Variant& ret);
-
-friend class JavaClassWrapper;
- Map<StringName,List<MethodInfo> > methods;
+ friend class JavaClassWrapper;
+ Map<StringName, List<MethodInfo> > methods;
jclass _class;
public:
-
- virtual Variant call(const StringName& p_method,const Variant** p_args,int p_argcount,Variant::CallError &r_error);
+ virtual Variant call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error);
JavaClass();
-
};
-
class JavaObject : public Reference {
- GDCLASS(JavaObject,Reference);
+ GDCLASS(JavaObject, Reference);
Ref<JavaClass> base_class;
-friend class JavaClass;
+ friend class JavaClass;
jobject instance;
public:
+ virtual Variant call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error);
- virtual Variant call(const StringName& p_method,const Variant** p_args,int p_argcount,Variant::CallError &r_error);
-
- JavaObject(const Ref<JavaClass>& p_base,jobject *p_instance);
+ JavaObject(const Ref<JavaClass> &p_base, jobject *p_instance);
~JavaObject();
-
};
-
class JavaClassWrapper : public Object {
- GDCLASS(JavaClassWrapper,Object);
+ GDCLASS(JavaClassWrapper, Object);
-
- Map<String,Ref<JavaClass> > class_cache;
-friend class JavaClass;
+ Map<String, Ref<JavaClass> > class_cache;
+ friend class JavaClass;
jclass activityClass;
jmethodID findClass;
jmethodID getDeclaredMethods;
@@ -177,20 +208,19 @@ friend class JavaClass;
jmethodID Double_doubleValue;
jobject classLoader;
- bool _get_type_sig(JNIEnv *env, jobject obj, uint32_t& sig, String&strsig);
+ bool _get_type_sig(JNIEnv *env, jobject obj, uint32_t &sig, String &strsig);
static JavaClassWrapper *singleton;
protected:
-
static void _bind_methods();
-public:
+public:
static JavaClassWrapper *get_singleton() { return singleton; }
- Ref<JavaClass> wrap(const String& p_class);
+ Ref<JavaClass> wrap(const String &p_class);
- JavaClassWrapper(jobject p_activity=NULL);
+ JavaClassWrapper(jobject p_activity = NULL);
};
#endif // JAVA_CLASS_WRAPPER_H
diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp
index 41558cf86..4016b4443 100644
--- a/platform/android/java_glue.cpp
+++ b/platform/android/java_glue.cpp
@@ -29,38 +29,35 @@
#ifndef ANDROID_NATIVE_ACTIVITY
#include "java_glue.h"
-#include "os_android.h"
-#include "main/main.h"
-#include <unistd.h>
-#include "file_access_jandroid.h"
-#include "file_access_android.h"
-#include "dir_access_jandroid.h"
+#include "android/asset_manager_jni.h"
#include "audio_driver_jandroid.h"
-#include "global_config.h"
-#include "thread_jandroid.h"
#include "core/os/keyboard.h"
+#include "dir_access_jandroid.h"
+#include "file_access_android.h"
+#include "file_access_jandroid.h"
+#include "global_config.h"
#include "java_class_wrapper.h"
-#include "android/asset_manager_jni.h"
#include "main/input_default.h"
+#include "main/main.h"
+#include "os_android.h"
+#include "thread_jandroid.h"
+#include <unistd.h>
-static JavaClassWrapper *java_class_wrapper=NULL;
-static OS_Android *os_android=NULL;
-
+static JavaClassWrapper *java_class_wrapper = NULL;
+static OS_Android *os_android = NULL;
struct jvalret {
jobject obj;
jvalue val;
- jvalret() { obj=NULL; }
-
-
+ jvalret() { obj = NULL; }
};
-jvalret _variant_to_jvalue(JNIEnv *env, Variant::Type p_type, const Variant* p_arg, bool force_jobject = false) {
+jvalret _variant_to_jvalue(JNIEnv *env, Variant::Type p_type, const Variant *p_arg, bool force_jobject = false) {
jvalret v;
- switch(p_type) {
+ switch (p_type) {
case Variant::BOOL: {
@@ -71,11 +68,10 @@ jvalret _variant_to_jvalue(JNIEnv *env, Variant::Type p_type, const Variant* p_a
val.z = (bool)(*p_arg);
jobject obj = env->NewObjectA(bclass, ctor, &val);
v.val.l = obj;
- v.obj=obj;
+ v.obj = obj;
env->DeleteLocalRef(bclass);
} else {
- v.val.z=*p_arg;
-
+ v.val.z = *p_arg;
};
} break;
case Variant::INT: {
@@ -88,12 +84,11 @@ jvalret _variant_to_jvalue(JNIEnv *env, Variant::Type p_type, const Variant* p_a
val.i = (int)(*p_arg);
jobject obj = env->NewObjectA(bclass, ctor, &val);
v.val.l = obj;
- v.obj=obj;
+ v.obj = obj;
env->DeleteLocalRef(bclass);
} else {
- v.val.i=*p_arg;
-
+ v.val.i = *p_arg;
};
} break;
case Variant::REAL: {
@@ -106,33 +101,33 @@ jvalret _variant_to_jvalue(JNIEnv *env, Variant::Type p_type, const Variant* p_a
val.d = (double)(*p_arg);
jobject obj = env->NewObjectA(bclass, ctor, &val);
v.val.l = obj;
- v.obj=obj;
+ v.obj = obj;
env->DeleteLocalRef(bclass);
} else {
- v.val.f=*p_arg;
+ v.val.f = *p_arg;
};
} break;
case Variant::STRING: {
String s = *p_arg;
jstring jStr = env->NewStringUTF(s.utf8().get_data());
- v.val.l=jStr;
- v.obj=jStr;
+ v.val.l = jStr;
+ v.obj = jStr;
} break;
case Variant::POOL_STRING_ARRAY: {
PoolVector<String> sarray = *p_arg;
- jobjectArray arr = env->NewObjectArray(sarray.size(),env->FindClass("java/lang/String"),env->NewStringUTF(""));
+ jobjectArray arr = env->NewObjectArray(sarray.size(), env->FindClass("java/lang/String"), env->NewStringUTF(""));
- for(int j=0;j<sarray.size();j++) {
+ for (int j = 0; j < sarray.size(); j++) {
- jstring str = env->NewStringUTF( sarray[j].utf8().get_data() );
- env->SetObjectArrayElement(arr,j,str);
+ jstring str = env->NewStringUTF(sarray[j].utf8().get_data());
+ env->SetObjectArrayElement(arr, j, str);
env->DeleteLocalRef(str);
}
- v.val.l=arr;
- v.obj=arr;
+ v.val.l = arr;
+ v.obj = arr;
} break;
@@ -146,7 +141,7 @@ jvalret _variant_to_jvalue(JNIEnv *env, Variant::Type p_type, const Variant* p_a
Array keys = dict.keys();
jobjectArray jkeys = env->NewObjectArray(keys.size(), env->FindClass("java/lang/String"), env->NewStringUTF(""));
- for (int j=0; j<keys.size(); j++) {
+ for (int j = 0; j < keys.size(); j++) {
jstring str = env->NewStringUTF(String(keys[j]).utf8().get_data());
env->SetObjectArrayElement(jkeys, j, str);
env->DeleteLocalRef(str);
@@ -160,7 +155,7 @@ jvalret _variant_to_jvalue(JNIEnv *env, Variant::Type p_type, const Variant* p_a
jobjectArray jvalues = env->NewObjectArray(keys.size(), env->FindClass("java/lang/Object"), NULL);
- for (int j=0; j<keys.size(); j++) {
+ for (int j = 0; j < keys.size(); j++) {
Variant var = dict[keys[j]];
jvalret v = _variant_to_jvalue(env, var.get_type(), &var, true);
env->SetObjectArrayElement(jvalues, j, v.val.l);
@@ -176,7 +171,7 @@ jvalret _variant_to_jvalue(JNIEnv *env, Variant::Type p_type, const Variant* p_a
env->DeleteLocalRef(dclass);
v.val.l = jdict;
- v.obj=jdict;
+ v.obj = jdict;
} break;
case Variant::POOL_INT_ARRAY: {
@@ -184,18 +179,18 @@ jvalret _variant_to_jvalue(JNIEnv *env, Variant::Type p_type, const Variant* p_a
PoolVector<int> array = *p_arg;
jintArray arr = env->NewIntArray(array.size());
PoolVector<int>::Read r = array.read();
- env->SetIntArrayRegion(arr,0,array.size(),r.ptr());
- v.val.l=arr;
- v.obj=arr;
+ env->SetIntArrayRegion(arr, 0, array.size(), r.ptr());
+ v.val.l = arr;
+ v.obj = arr;
} break;
case Variant::POOL_BYTE_ARRAY: {
PoolVector<uint8_t> array = *p_arg;
jbyteArray arr = env->NewByteArray(array.size());
PoolVector<uint8_t>::Read r = array.read();
- env->SetByteArrayRegion(arr,0,array.size(),reinterpret_cast<const signed char*>(r.ptr()));
- v.val.l=arr;
- v.obj=arr;
+ env->SetByteArrayRegion(arr, 0, array.size(), reinterpret_cast<const signed char *>(r.ptr()));
+ v.val.l = arr;
+ v.obj = arr;
} break;
case Variant::POOL_REAL_ARRAY: {
@@ -203,57 +198,53 @@ jvalret _variant_to_jvalue(JNIEnv *env, Variant::Type p_type, const Variant* p_a
PoolVector<float> array = *p_arg;
jfloatArray arr = env->NewFloatArray(array.size());
PoolVector<float>::Read r = array.read();
- env->SetFloatArrayRegion(arr,0,array.size(),r.ptr());
- v.val.l=arr;
- v.obj=arr;
+ env->SetFloatArrayRegion(arr, 0, array.size(), r.ptr());
+ v.val.l = arr;
+ v.obj = arr;
} break;
default: {
v.val.i = 0;
} break;
-
}
return v;
}
-String _get_class_name(JNIEnv * env, jclass cls, bool* array) {
+String _get_class_name(JNIEnv *env, jclass cls, bool *array) {
jclass cclass = env->FindClass("java/lang/Class");
jmethodID getName = env->GetMethodID(cclass, "getName", "()Ljava/lang/String;");
- jstring clsName=(jstring) env->CallObjectMethod(cls, getName);
+ jstring clsName = (jstring)env->CallObjectMethod(cls, getName);
if (array) {
jmethodID isArray = env->GetMethodID(cclass, "isArray", "()Z");
jboolean isarr = env->CallBooleanMethod(cls, isArray);
(*array) = isarr ? true : false;
}
- String name = env->GetStringUTFChars( clsName, NULL );
+ String name = env->GetStringUTFChars(clsName, NULL);
env->DeleteLocalRef(clsName);
return name;
-
}
-
-Variant _jobject_to_variant(JNIEnv * env, jobject obj) {
+Variant _jobject_to_variant(JNIEnv *env, jobject obj) {
if (obj == NULL) {
return Variant();
}
-
+
jclass c = env->GetObjectClass(obj);
bool array;
String name = _get_class_name(env, c, &array);
//print_line("name is " + name + ", array "+Variant(array));
- print_line("ARGNAME: "+name);
+ print_line("ARGNAME: " + name);
if (name == "java.lang.String") {
- return String::utf8(env->GetStringUTFChars( (jstring)obj, NULL ));
+ return String::utf8(env->GetStringUTFChars((jstring)obj, NULL));
};
-
if (name == "[Ljava.lang.String;") {
jobjectArray arr = (jobjectArray)obj;
@@ -261,11 +252,10 @@ Variant _jobject_to_variant(JNIEnv * env, jobject obj) {
//print_line("String array! " + String::num(stringCount));
PoolVector<String> sarr;
- for (int i=0; i<stringCount; i++) {
- jstring string = (jstring) env->GetObjectArrayElement(arr, i);
+ for (int i = 0; i < stringCount; i++) {
+ jstring string = (jstring)env->GetObjectArrayElement(arr, i);
sarr.push_back(String::utf8(env->GetStringUTFChars(string, NULL)));
env->DeleteLocalRef(string);
-
}
return sarr;
@@ -294,7 +284,7 @@ Variant _jobject_to_variant(JNIEnv * env, jobject obj) {
sarr.resize(fCount);
PoolVector<int>::Write w = sarr.write();
- env->GetIntArrayRegion(arr,0,fCount,w.ptr());
+ env->GetIntArrayRegion(arr, 0, fCount, w.ptr());
w = PoolVector<int>::Write();
return sarr;
};
@@ -307,7 +297,7 @@ Variant _jobject_to_variant(JNIEnv * env, jobject obj) {
sarr.resize(fCount);
PoolVector<uint8_t>::Write w = sarr.write();
- env->GetByteArrayRegion(arr,0,fCount,reinterpret_cast<signed char*>(w.ptr()));
+ env->GetByteArrayRegion(arr, 0, fCount, reinterpret_cast<signed char *>(w.ptr()));
w = PoolVector<uint8_t>::Write();
return sarr;
};
@@ -329,12 +319,11 @@ Variant _jobject_to_variant(JNIEnv * env, jobject obj) {
PoolRealArray::Write w = sarr.write();
- for (int i=0; i<fCount; i++) {
+ for (int i = 0; i < fCount; i++) {
double n;
env->GetDoubleArrayRegion(arr, i, 1, &n);
w.ptr()[i] = n;
-
};
return sarr;
};
@@ -346,38 +335,34 @@ Variant _jobject_to_variant(JNIEnv * env, jobject obj) {
PoolRealArray sarr;
sarr.resize(fCount);
-
PoolRealArray::Write w = sarr.write();
- for (int i=0; i<fCount; i++) {
+ for (int i = 0; i < fCount; i++) {
float n;
env->GetFloatArrayRegion(arr, i, 1, &n);
w.ptr()[i] = n;
-
};
return sarr;
};
-
if (name == "[Ljava.lang.Object;") {
jobjectArray arr = (jobjectArray)obj;
int objCount = env->GetArrayLength(arr);
Array varr(true);
- for (int i=0; i<objCount; i++) {
+ for (int i = 0; i < objCount; i++) {
jobject jobj = env->GetObjectArrayElement(arr, i);
Variant v = _jobject_to_variant(env, jobj);
varr.push_back(v);
env->DeleteLocalRef(jobj);
-
}
return varr;
};
- if (name == "java.util.HashMap" || name == "org.godotengine.godot.Dictionary") {
+ if (name == "java.util.HashMap" || name == "org.godotengine.godot.Dictionary") {
Dictionary ret(true);
jclass oclass = c;
@@ -394,12 +379,11 @@ Variant _jobject_to_variant(JNIEnv * env, jobject obj) {
env->DeleteLocalRef(arr);
//print_line("adding " + String::num(keys.size()) + " to Dictionary!");
- for (int i=0; i<keys.size(); i++) {
+ for (int i = 0; i < keys.size(); i++) {
ret[keys[i]] = vals[i];
};
-
return ret;
};
@@ -410,84 +394,77 @@ Variant _jobject_to_variant(JNIEnv * env, jobject obj) {
class JNISingleton : public Object {
- GDCLASS( JNISingleton, Object );
-
+ GDCLASS(JNISingleton, Object);
struct MethodData {
-
jmethodID method;
Variant::Type ret_type;
Vector<Variant::Type> argtypes;
};
jobject instance;
- Map<StringName,MethodData> method_map;
+ Map<StringName, MethodData> method_map;
public:
-
- virtual Variant call(const StringName& p_method,const Variant** p_args,int p_argcount,Variant::CallError &r_error) {
+ virtual Variant call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error) {
//print_line("attempt to call "+String(p_method));
- ERR_FAIL_COND_V(!instance,Variant());
+ ERR_FAIL_COND_V(!instance, Variant());
- r_error.error=Variant::CallError::CALL_OK;
+ r_error.error = Variant::CallError::CALL_OK;
- Map<StringName,MethodData >::Element *E=method_map.find(p_method);
+ Map<StringName, MethodData>::Element *E = method_map.find(p_method);
if (!E) {
print_line("no exists");
- r_error.error=Variant::CallError::CALL_ERROR_INVALID_METHOD;
+ r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
return Variant();
}
-
-
int ac = E->get().argtypes.size();
- if (ac<p_argcount) {
+ if (ac < p_argcount) {
print_line("fewargs");
- r_error.error=Variant::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
- r_error.argument=ac;
+ r_error.error = Variant::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
+ r_error.argument = ac;
return Variant();
}
- if (ac>p_argcount) {
+ if (ac > p_argcount) {
print_line("manyargs");
- r_error.error=Variant::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS;
- r_error.argument=ac;
+ r_error.error = Variant::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS;
+ r_error.argument = ac;
return Variant();
}
+ for (int i = 0; i < p_argcount; i++) {
- for(int i=0;i<p_argcount;i++) {
+ if (!Variant::can_convert(p_args[i]->get_type(), E->get().argtypes[i])) {
- if (!Variant::can_convert(p_args[i]->get_type(),E->get().argtypes[i])) {
-
- r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
- r_error.argument=i;
- r_error.expected=E->get().argtypes[i];
+ r_error.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+ r_error.argument = i;
+ r_error.expected = E->get().argtypes[i];
}
}
-
- jvalue *v=NULL;
+ jvalue *v = NULL;
if (p_argcount) {
- v=(jvalue*)alloca( sizeof(jvalue)*p_argcount );
+ v = (jvalue *)alloca(sizeof(jvalue) * p_argcount);
}
JNIEnv *env = ThreadAndroid::get_env();
int res = env->PushLocalFrame(16);
- ERR_FAIL_COND_V(res!=0,Variant());
+ ERR_FAIL_COND_V(res != 0, Variant());
//print_line("argcount "+String::num(p_argcount));
List<jobject> to_erase;
- for(int i=0;i<p_argcount;i++) {
+ for (int i = 0; i < p_argcount; i++) {
jvalret vr = _variant_to_jvalue(env, E->get().argtypes[i], p_args[i]);
v[i] = vr.val;
@@ -499,37 +476,36 @@ public:
Variant ret;
- switch(E->get().ret_type) {
+ switch (E->get().ret_type) {
case Variant::NIL: {
-
//print_line("call void");
- env->CallVoidMethodA(instance,E->get().method,v);
+ env->CallVoidMethodA(instance, E->get().method, v);
} break;
case Variant::BOOL: {
- ret = env->CallBooleanMethodA(instance,E->get().method,v)==JNI_TRUE;
+ ret = env->CallBooleanMethodA(instance, E->get().method, v) == JNI_TRUE;
//print_line("call bool");
} break;
case Variant::INT: {
- ret = env->CallIntMethodA(instance,E->get().method,v);
+ ret = env->CallIntMethodA(instance, E->get().method, v);
//print_line("call int");
} break;
case Variant::REAL: {
- ret = env->CallFloatMethodA(instance,E->get().method,v);
+ ret = env->CallFloatMethodA(instance, E->get().method, v);
} break;
case Variant::STRING: {
- jobject o = env->CallObjectMethodA(instance,E->get().method,v);
+ jobject o = env->CallObjectMethodA(instance, E->get().method, v);
ret = String::utf8(env->GetStringUTFChars((jstring)o, NULL));
env->DeleteLocalRef(o);
} break;
case Variant::POOL_STRING_ARRAY: {
- jobjectArray arr = (jobjectArray)env->CallObjectMethodA(instance,E->get().method,v);
+ jobjectArray arr = (jobjectArray)env->CallObjectMethodA(instance, E->get().method, v);
ret = _jobject_to_variant(env, arr);
@@ -537,30 +513,30 @@ public:
} break;
case Variant::POOL_INT_ARRAY: {
- jintArray arr = (jintArray)env->CallObjectMethodA(instance,E->get().method,v);
+ jintArray arr = (jintArray)env->CallObjectMethodA(instance, E->get().method, v);
int fCount = env->GetArrayLength(arr);
PoolVector<int> sarr;
sarr.resize(fCount);
PoolVector<int>::Write w = sarr.write();
- env->GetIntArrayRegion(arr,0,fCount,w.ptr());
+ env->GetIntArrayRegion(arr, 0, fCount, w.ptr());
w = PoolVector<int>::Write();
- ret=sarr;
+ ret = sarr;
env->DeleteLocalRef(arr);
} break;
case Variant::POOL_REAL_ARRAY: {
- jfloatArray arr = (jfloatArray)env->CallObjectMethodA(instance,E->get().method,v);
+ jfloatArray arr = (jfloatArray)env->CallObjectMethodA(instance, E->get().method, v);
int fCount = env->GetArrayLength(arr);
PoolVector<float> sarr;
sarr.resize(fCount);
PoolVector<float>::Write w = sarr.write();
- env->GetFloatArrayRegion(arr,0,fCount,w.ptr());
+ env->GetFloatArrayRegion(arr, 0, fCount, w.ptr());
w = PoolVector<float>::Write();
- ret=sarr;
+ ret = sarr;
env->DeleteLocalRef(arr);
} break;
@@ -574,7 +550,6 @@ public:
} break;
default: {
-
print_line("failure..");
env->PopLocalFrame(NULL);
ERR_FAIL_V(Variant());
@@ -592,42 +567,35 @@ public:
return ret;
}
-
jobject get_instance() const {
return instance;
}
void set_instance(jobject p_instance) {
- instance=p_instance;
+ instance = p_instance;
}
-
- void add_method(const StringName& p_name, jmethodID p_method,const Vector<Variant::Type>& p_args, Variant::Type p_ret_type) {
+ void add_method(const StringName &p_name, jmethodID p_method, const Vector<Variant::Type> &p_args, Variant::Type p_ret_type) {
MethodData md;
- md.method=p_method;
- md.argtypes=p_args;
- md.ret_type=p_ret_type;
- method_map[p_name]=md;
-
+ md.method = p_method;
+ md.argtypes = p_args;
+ md.ret_type = p_ret_type;
+ method_map[p_name] = md;
}
-
JNISingleton() {
- instance=NULL;
-
+ instance = NULL;
}
-
};
-
struct TST {
int a;
TST() {
- a=5;
+ a = 5;
}
};
@@ -643,114 +611,111 @@ struct JAndroidPointerEvent {
static List<JAndroidPointerEvent> pointer_events;
static List<InputEvent> key_events;
static List<OS_Android::JoypadEvent> joy_events;
-static bool initialized=false;
-static Mutex *input_mutex=NULL;
-static Mutex *suspend_mutex=NULL;
-static int step=0;
-static bool resized=false;
-static bool resized_reload=false;
-static bool go_back_request=false;
+static bool initialized = false;
+static Mutex *input_mutex = NULL;
+static Mutex *suspend_mutex = NULL;
+static int step = 0;
+static bool resized = false;
+static bool resized_reload = false;
+static bool go_back_request = false;
static Size2 new_size;
static Vector3 accelerometer;
static Vector3 magnetometer;
static Vector3 gyroscope;
-static HashMap<String,JNISingleton*> jni_singletons;
+static HashMap<String, JNISingleton *> jni_singletons;
static jobject godot_io;
static Vector<int> joy_device_ids;
-typedef void (*GFXInitFunc)(void *ud,bool gl2);
+typedef void (*GFXInitFunc)(void *ud, bool gl2);
-static jmethodID _on_video_init=0;
+static jmethodID _on_video_init = 0;
static jobject _godot_instance;
-static jmethodID _openURI=0;
-static jmethodID _getDataDir=0;
-static jmethodID _getLocale=0;
-static jmethodID _getModel=0;
-static jmethodID _getScreenDPI=0;
-static jmethodID _showKeyboard=0;
-static jmethodID _hideKeyboard=0;
-static jmethodID _setScreenOrientation=0;
-static jmethodID _getUniqueID=0;
-static jmethodID _getSystemDir=0;
-static jmethodID _playVideo=0;
-static jmethodID _isVideoPlaying=0;
-static jmethodID _pauseVideo=0;
-static jmethodID _stopVideo=0;
-static jmethodID _setKeepScreenOn=0;
-static jmethodID _alertDialog=0;
-
-static void _gfx_init_func(void* ud, bool gl2) {
+static jmethodID _openURI = 0;
+static jmethodID _getDataDir = 0;
+static jmethodID _getLocale = 0;
+static jmethodID _getModel = 0;
+static jmethodID _getScreenDPI = 0;
+static jmethodID _showKeyboard = 0;
+static jmethodID _hideKeyboard = 0;
+static jmethodID _setScreenOrientation = 0;
+static jmethodID _getUniqueID = 0;
+static jmethodID _getSystemDir = 0;
+static jmethodID _playVideo = 0;
+static jmethodID _isVideoPlaying = 0;
+static jmethodID _pauseVideo = 0;
+static jmethodID _stopVideo = 0;
+static jmethodID _setKeepScreenOn = 0;
+static jmethodID _alertDialog = 0;
+static void _gfx_init_func(void *ud, bool gl2) {
}
-
-static int _open_uri(const String& p_uri) {
+static int _open_uri(const String &p_uri) {
JNIEnv *env = ThreadAndroid::get_env();
jstring jStr = env->NewStringUTF(p_uri.utf8().get_data());
- return env->CallIntMethod(godot_io,_openURI,jStr) ;
+ return env->CallIntMethod(godot_io, _openURI, jStr);
}
static String _get_data_dir() {
JNIEnv *env = ThreadAndroid::get_env();
- jstring s =(jstring)env->CallObjectMethod(godot_io,_getDataDir);
- return String(env->GetStringUTFChars( s, NULL ));
+ jstring s = (jstring)env->CallObjectMethod(godot_io, _getDataDir);
+ return String(env->GetStringUTFChars(s, NULL));
}
static String _get_locale() {
JNIEnv *env = ThreadAndroid::get_env();
- jstring s =(jstring)env->CallObjectMethod(godot_io,_getLocale);
- return String(env->GetStringUTFChars( s, NULL ));
+ jstring s = (jstring)env->CallObjectMethod(godot_io, _getLocale);
+ return String(env->GetStringUTFChars(s, NULL));
}
static String _get_model() {
- JNIEnv *env = ThreadAndroid::get_env();
- jstring s =(jstring)env->CallObjectMethod(godot_io,_getModel);
- return String(env->GetStringUTFChars( s, NULL ));
+ JNIEnv *env = ThreadAndroid::get_env();
+ jstring s = (jstring)env->CallObjectMethod(godot_io, _getModel);
+ return String(env->GetStringUTFChars(s, NULL));
}
static int _get_screen_dpi() {
JNIEnv *env = ThreadAndroid::get_env();
- return env->CallIntMethod(godot_io,_getScreenDPI);
+ return env->CallIntMethod(godot_io, _getScreenDPI);
}
static String _get_unique_id() {
- JNIEnv *env = ThreadAndroid::get_env();
- jstring s =(jstring)env->CallObjectMethod(godot_io,_getUniqueID);
- return String(env->GetStringUTFChars( s, NULL ));
+ JNIEnv *env = ThreadAndroid::get_env();
+ jstring s = (jstring)env->CallObjectMethod(godot_io, _getUniqueID);
+ return String(env->GetStringUTFChars(s, NULL));
}
-static void _show_vk(const String& p_existing) {
+static void _show_vk(const String &p_existing) {
- JNIEnv* env = ThreadAndroid::get_env();
+ JNIEnv *env = ThreadAndroid::get_env();
jstring jStr = env->NewStringUTF(p_existing.utf8().get_data());
env->CallVoidMethod(godot_io, _showKeyboard, jStr);
}
static void _set_screen_orient(int p_orient) {
- JNIEnv* env = ThreadAndroid::get_env();
- env->CallVoidMethod(godot_io, _setScreenOrientation, p_orient );
+ JNIEnv *env = ThreadAndroid::get_env();
+ env->CallVoidMethod(godot_io, _setScreenOrientation, p_orient);
}
static String _get_system_dir(int p_dir) {
JNIEnv *env = ThreadAndroid::get_env();
- jstring s =(jstring)env->CallObjectMethod(godot_io,_getSystemDir,p_dir);
- return String(env->GetStringUTFChars( s, NULL ));
+ jstring s = (jstring)env->CallObjectMethod(godot_io, _getSystemDir, p_dir);
+ return String(env->GetStringUTFChars(s, NULL));
}
-
static void _hide_vk() {
- JNIEnv* env = ThreadAndroid::get_env();
+ JNIEnv *env = ThreadAndroid::get_env();
env->CallVoidMethod(godot_io, _hideKeyboard);
}
@@ -759,52 +724,50 @@ static void _hide_vk() {
// virtual void native_video_pause();
// virtual void native_video_stop();
-static void _play_video(const String& p_path) {
-
+static void _play_video(const String &p_path) {
}
static bool _is_video_playing() {
- JNIEnv* env = ThreadAndroid::get_env();
+ JNIEnv *env = ThreadAndroid::get_env();
return env->CallBooleanMethod(godot_io, _isVideoPlaying);
//return false;
}
static void _pause_video() {
- JNIEnv* env = ThreadAndroid::get_env();
+ JNIEnv *env = ThreadAndroid::get_env();
env->CallVoidMethod(godot_io, _pauseVideo);
}
static void _stop_video() {
- JNIEnv* env = ThreadAndroid::get_env();
+ JNIEnv *env = ThreadAndroid::get_env();
env->CallVoidMethod(godot_io, _stopVideo);
}
static void _set_keep_screen_on(bool p_enabled) {
- JNIEnv* env = ThreadAndroid::get_env();
+ JNIEnv *env = ThreadAndroid::get_env();
env->CallVoidMethod(_godot_instance, _setKeepScreenOn, p_enabled);
}
-static void _alert(const String& p_message, const String& p_title) {
- JNIEnv* env = ThreadAndroid::get_env();
+static void _alert(const String &p_message, const String &p_title) {
+ JNIEnv *env = ThreadAndroid::get_env();
jstring jStrMessage = env->NewStringUTF(p_message.utf8().get_data());
jstring jStrTitle = env->NewStringUTF(p_title.utf8().get_data());
env->CallVoidMethod(_godot_instance, _alertDialog, jStrMessage, jStrTitle);
}
-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);
+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);
- initialized=true;
+ initialized = true;
JavaVM *jvm;
env->GetJavaVM(&jvm);
- _godot_instance=env->NewGlobalRef(activity);
+ _godot_instance = env->NewGlobalRef(activity);
//_godot_instance=activity;
- __android_log_print(ANDROID_LOG_INFO,"godot","***************** HELLO FROM JNI!!!!!!!!");
+ __android_log_print(ANDROID_LOG_INFO, "godot", "***************** HELLO FROM JNI!!!!!!!!");
{
//setup IO Object
@@ -812,41 +775,41 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_initialize(JNIEnv * e
jclass cls = env->FindClass("org/godotengine/godot/Godot");
if (cls) {
- cls=(jclass)env->NewGlobalRef(cls);
- __android_log_print(ANDROID_LOG_INFO,"godot","*******CLASS FOUND!!!");
+ cls = (jclass)env->NewGlobalRef(cls);
+ __android_log_print(ANDROID_LOG_INFO, "godot", "*******CLASS FOUND!!!");
}
- __android_log_print(ANDROID_LOG_INFO,"godot","STEP2, %p",cls);
+ __android_log_print(ANDROID_LOG_INFO, "godot", "STEP2, %p", cls);
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);
+ __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);
jobject gob = env->NewGlobalRef(ob);
- __android_log_print(ANDROID_LOG_INFO,"godot","STEP4.5, %p",gob);
- godot_io=gob;
+ __android_log_print(ANDROID_LOG_INFO, "godot", "STEP4.5, %p", gob);
+ godot_io = gob;
_on_video_init = env->GetMethodID(cls, "onVideoInit", "(Z)V");
- _setKeepScreenOn = env->GetMethodID(cls,"setKeepScreenOn","(Z)V");
- _alertDialog = env->GetMethodID(cls,"alert","(Ljava/lang/String;Ljava/lang/String;)V");
+ _setKeepScreenOn = env->GetMethodID(cls, "setKeepScreenOn", "(Z)V");
+ _alertDialog = env->GetMethodID(cls, "alert", "(Ljava/lang/String;Ljava/lang/String;)V");
jclass clsio = env->FindClass("org/godotengine/godot/Godot");
if (cls) {
jclass c = env->GetObjectClass(gob);
- _openURI = env->GetMethodID(c,"openURI","(Ljava/lang/String;)I");
- _getDataDir = env->GetMethodID(c,"getDataDir","()Ljava/lang/String;");
- _getLocale = env->GetMethodID(c,"getLocale","()Ljava/lang/String;");
- _getModel = env->GetMethodID(c,"getModel","()Ljava/lang/String;");
- _getScreenDPI = env->GetMethodID(c, "getScreenDPI","()I");
- _getUniqueID = env->GetMethodID(c,"getUniqueID","()Ljava/lang/String;");
- _showKeyboard = env->GetMethodID(c,"showKeyboard","(Ljava/lang/String;)V");
- _hideKeyboard = env->GetMethodID(c,"hideKeyboard","()V");
- _setScreenOrientation = env->GetMethodID(c,"setScreenOrientation","(I)V");
- _getSystemDir = env->GetMethodID(c,"getSystemDir","(I)Ljava/lang/String;");
- _playVideo = env->GetMethodID(c,"playVideo","(Ljava/lang/String;)V");
- _isVideoPlaying = env->GetMethodID(c,"isVideoPlaying","()Z");
- _pauseVideo = env->GetMethodID(c,"pauseVideo","()V");
- _stopVideo = env->GetMethodID(c,"stopVideo","()V");
+ _openURI = env->GetMethodID(c, "openURI", "(Ljava/lang/String;)I");
+ _getDataDir = env->GetMethodID(c, "getDataDir", "()Ljava/lang/String;");
+ _getLocale = env->GetMethodID(c, "getLocale", "()Ljava/lang/String;");
+ _getModel = env->GetMethodID(c, "getModel", "()Ljava/lang/String;");
+ _getScreenDPI = env->GetMethodID(c, "getScreenDPI", "()I");
+ _getUniqueID = env->GetMethodID(c, "getUniqueID", "()Ljava/lang/String;");
+ _showKeyboard = env->GetMethodID(c, "showKeyboard", "(Ljava/lang/String;)V");
+ _hideKeyboard = env->GetMethodID(c, "hideKeyboard", "()V");
+ _setScreenOrientation = env->GetMethodID(c, "setScreenOrientation", "(I)V");
+ _getSystemDir = env->GetMethodID(c, "getSystemDir", "(I)Ljava/lang/String;");
+ _playVideo = env->GetMethodID(c, "playVideo", "(Ljava/lang/String;)V");
+ _isVideoPlaying = env->GetMethodID(c, "isVideoPlaying", "()Z");
+ _pauseVideo = env->GetMethodID(c, "pauseVideo", "()V");
+ _stopVideo = env->GetMethodID(c, "stopVideo", "()V");
}
ThreadAndroid::make_default(jvm);
@@ -856,89 +819,84 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_initialize(JNIEnv * e
jobject amgr = env->NewGlobalRef(p_asset_manager);
- FileAccessAndroid::asset_manager=AAssetManager_fromJava(env,amgr);
+ FileAccessAndroid::asset_manager = AAssetManager_fromJava(env, amgr);
#endif
DirAccessJAndroid::setup(gob);
AudioDriverAndroid::setup(gob);
}
-
- const char ** cmdline=NULL;
- int cmdlen=0;
- bool use_apk_expansion=false;
+ const char **cmdline = NULL;
+ int cmdlen = 0;
+ bool use_apk_expansion = false;
if (p_cmdline) {
cmdlen = env->GetArrayLength(p_cmdline);
if (cmdlen) {
- cmdline = (const char**)malloc((env->GetArrayLength(p_cmdline)+1)*sizeof(const char*));
- cmdline[cmdlen]=NULL;
+ cmdline = (const char **)malloc((env->GetArrayLength(p_cmdline) + 1) * sizeof(const char *));
+ cmdline[cmdlen] = NULL;
- for (int i=0; i<cmdlen; i++) {
+ for (int i = 0; i < cmdlen; i++) {
- jstring string = (jstring) env->GetObjectArrayElement(p_cmdline, i);
+ jstring string = (jstring)env->GetObjectArrayElement(p_cmdline, i);
const char *rawString = env->GetStringUTFChars(string, 0);
if (!rawString) {
- __android_log_print(ANDROID_LOG_INFO,"godot","cmdline arg %i is null\n",i);
+ __android_log_print(ANDROID_LOG_INFO, "godot", "cmdline arg %i is null\n", i);
} else {
//__android_log_print(ANDROID_LOG_INFO,"godot","cmdline arg %i is: %s\n",i,rawString);
- if (strcmp(rawString,"-main_pack")==0)
- use_apk_expansion=true;
+ if (strcmp(rawString, "-main_pack") == 0)
+ use_apk_expansion = true;
}
- cmdline[i]=rawString;
+ cmdline[i] = rawString;
}
}
}
- __android_log_print(ANDROID_LOG_INFO,"godot","CMDLINE LEN %i - APK EXPANSION %I\n",cmdlen,int(use_apk_expansion));
+ __android_log_print(ANDROID_LOG_INFO, "godot", "CMDLINE LEN %i - APK EXPANSION %I\n", cmdlen, int(use_apk_expansion));
- os_android = new OS_Android(_gfx_init_func,env,_open_uri,_get_data_dir,_get_locale, _get_model, _get_screen_dpi, _show_vk, _hide_vk,_set_screen_orient,_get_unique_id, _get_system_dir, _play_video,_is_video_playing, _pause_video, _stop_video, _set_keep_screen_on, _alert, use_apk_expansion);
+ os_android = new OS_Android(_gfx_init_func, env, _open_uri, _get_data_dir, _get_locale, _get_model, _get_screen_dpi, _show_vk, _hide_vk, _set_screen_orient, _get_unique_id, _get_system_dir, _play_video, _is_video_playing, _pause_video, _stop_video, _set_keep_screen_on, _alert, use_apk_expansion);
os_android->set_need_reload_hooks(p_need_reload_hook);
char wd[500];
- getcwd(wd,500);
+ getcwd(wd, 500);
- __android_log_print(ANDROID_LOG_INFO,"godot","test construction %i\n",tst.a);
- __android_log_print(ANDROID_LOG_INFO,"godot","running from dir %s\n",wd);
-
- __android_log_print(ANDROID_LOG_INFO,"godot","**SETUP");
+ __android_log_print(ANDROID_LOG_INFO, "godot", "test construction %i\n", tst.a);
+ __android_log_print(ANDROID_LOG_INFO, "godot", "running from dir %s\n", wd);
+ __android_log_print(ANDROID_LOG_INFO, "godot", "**SETUP");
#if 0
char *args[]={"-test","render",NULL};
__android_log_print(ANDROID_LOG_INFO,"godot","pre asdasd setup...");
Error err = Main::setup("apk",2,args,false);
#else
- Error err = Main::setup("apk",cmdlen,(char**)cmdline,false);
+ Error err = Main::setup("apk", cmdlen, (char **)cmdline, false);
#endif
- if (err!=OK) {
- __android_log_print(ANDROID_LOG_INFO,"godot","*****UNABLE TO SETUP");
+ if (err != OK) {
+ __android_log_print(ANDROID_LOG_INFO, "godot", "*****UNABLE TO SETUP");
return; //should exit instead and print the error
}
- __android_log_print(ANDROID_LOG_INFO,"godot","*****SETUP OK");
+ __android_log_print(ANDROID_LOG_INFO, "godot", "*****SETUP OK");
//video driver is determined here, because once initialized, it cant be changed
String vd = GlobalConfig::get_singleton()->get("display/driver");
+ env->CallVoidMethod(_godot_instance, _on_video_init, (jboolean) true);
- env->CallVoidMethod(_godot_instance, _on_video_init, (jboolean)true);
-
- __android_log_print(ANDROID_LOG_INFO,"godot","**START");
-
- input_mutex=Mutex::create();
- suspend_mutex=Mutex::create();
-
+ __android_log_print(ANDROID_LOG_INFO, "godot", "**START");
+ input_mutex = Mutex::create();
+ suspend_mutex = Mutex::create();
}
-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_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);
+ __android_log_print(ANDROID_LOG_INFO, "godot", "^_^_^_^_^ resize %lld, %i, %i\n", Thread::get_caller_ID(), width, height);
if (os_android)
- os_android->set_display_size(Size2(width,height));
+ os_android->set_display_size(Size2(width, height));
/*input_mutex->lock();
resized=true;
@@ -946,12 +904,11 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_resize(JNIEnv * env,
resized_reload=true;
new_size=Size2(width,height);
input_mutex->unlock();*/
-
}
-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_newcontext(JNIEnv *env, jobject obj, bool p_32_bits) {
- __android_log_print(ANDROID_LOG_INFO,"godot","^_^_^_^_^ newcontext %lld\n",Thread::get_caller_ID());
+ __android_log_print(ANDROID_LOG_INFO, "godot", "^_^_^_^_^ newcontext %lld\n", Thread::get_caller_ID());
if (os_android) {
os_android->set_context_is_16_bits(!p_32_bits);
@@ -961,24 +918,21 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_newcontext(JNIEnv * e
os_android->reload_gfx();
}
-
}
-
-JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_back(JNIEnv * env, jobject obj) {
+JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_back(JNIEnv *env, jobject obj) {
input_mutex->lock();
- go_back_request=true;
+ go_back_request = true;
input_mutex->unlock();
-
}
static void _initialize_java_modules() {
String modules = GlobalConfig::get_singleton()->get("android/modules");
- Vector<String> mods = modules.split(",",false);
- print_line("ANDROID MODULES : " + modules);
- __android_log_print(ANDROID_LOG_INFO,"godot","mod count: %i",mods.size());
+ Vector<String> mods = modules.split(",", false);
+ print_line("ANDROID MODULES : " + modules);
+ __android_log_print(ANDROID_LOG_INFO, "godot", "mod count: %i", mods.size());
if (mods.size()) {
@@ -986,7 +940,7 @@ static void _initialize_java_modules() {
jclass activityClass = env->FindClass("org/godotengine/godot/Godot");
- jmethodID getClassLoader = env->GetMethodID(activityClass,"getClassLoader", "()Ljava/lang/ClassLoader;");
+ jmethodID getClassLoader = env->GetMethodID(activityClass, "getClassLoader", "()Ljava/lang/ClassLoader;");
jobject cls = env->CallObjectMethod(_godot_instance, getClassLoader);
//cls=env->NewGlobalRef(cls);
@@ -996,52 +950,43 @@ static void _initialize_java_modules() {
jmethodID findClass = env->GetMethodID(classLoader, "loadClass", "(Ljava/lang/String;)Ljava/lang/Class;");
- for (int i=0;i<mods.size();i++) {
+ for (int i = 0; i < mods.size(); i++) {
String m = mods[i];
//jclass singletonClass = env->FindClass(m.utf8().get_data());
- print_line("LOADING MODULE: "+m);
+ print_line("LOADING MODULE: " + m);
jstring strClassName = env->NewStringUTF(m.utf8().get_data());
jclass singletonClass = (jclass)env->CallObjectMethod(cls, findClass, strClassName);
if (!singletonClass) {
- ERR_EXPLAIN("Couldn't find singleton for class: "+m);
+ ERR_EXPLAIN("Couldn't find singleton for class: " + m);
ERR_CONTINUE(!singletonClass);
}
//singletonClass=(jclass)env->NewGlobalRef(singletonClass);
- __android_log_print(ANDROID_LOG_INFO,"godot","****^*^*?^*^*class data %x",singletonClass);
+ __android_log_print(ANDROID_LOG_INFO, "godot", "****^*^*?^*^*class data %x", singletonClass);
jmethodID initialize = env->GetStaticMethodID(singletonClass, "initialize", "(Landroid/app/Activity;)Lorg/godotengine/godot/Godot$SingletonBase;");
if (!initialize) {
- ERR_EXPLAIN("Couldn't find proper initialize function 'public static Godot.SingletonBase Class::initialize(Activity p_activity)' initializer for singleton class: "+m);
+ ERR_EXPLAIN("Couldn't find proper initialize function 'public static Godot.SingletonBase Class::initialize(Activity p_activity)' initializer for singleton class: " + m);
ERR_CONTINUE(!initialize);
-
}
- jobject obj = env->CallStaticObjectMethod(singletonClass,initialize,_godot_instance);
- __android_log_print(ANDROID_LOG_INFO,"godot","****^*^*?^*^*class instance %x",obj);
+ jobject obj = env->CallStaticObjectMethod(singletonClass, initialize, _godot_instance);
+ __android_log_print(ANDROID_LOG_INFO, "godot", "****^*^*?^*^*class instance %x", obj);
jobject gob = env->NewGlobalRef(obj);
-
-
}
-
}
-
}
-
-JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv * env, jobject obj)
-{
-
+JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv *env, jobject obj) {
ThreadAndroid::setup_thread();
//__android_log_print(ANDROID_LOG_INFO,"godot","**STEP EVENT! - %p-%i\n",env,Thread::get_caller_ID());
-
suspend_mutex->lock();
input_mutex->lock();
//first time step happens, initialize
@@ -1049,8 +994,8 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv * env, jo
// ugly hack to initialize the rest of the engine
// because of the way android forces you to do everything with threads
- java_class_wrapper = memnew( JavaClassWrapper(_godot_instance ));
- GlobalConfig::get_singleton()->add_singleton(GlobalConfig::Singleton("JavaClassWrapper",java_class_wrapper));
+ java_class_wrapper = memnew(JavaClassWrapper(_godot_instance));
+ GlobalConfig::get_singleton()->add_singleton(GlobalConfig::Singleton("JavaClassWrapper", java_class_wrapper));
_initialize_java_modules();
Main::setup2();
@@ -1071,10 +1016,10 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv * env, jo
++step;
}
- while(pointer_events.size()) {
+ while (pointer_events.size()) {
- JAndroidPointerEvent jpe=pointer_events.front()->get();
- os_android->process_touch(jpe.what,jpe.pointer,jpe.points);
+ JAndroidPointerEvent jpe = pointer_events.front()->get();
+ os_android->process_touch(jpe.what, jpe.pointer, jpe.points);
pointer_events.pop_front();
}
@@ -1098,10 +1043,9 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv * env, jo
if (go_back_request) {
os_android->main_loop_request_go_back();
- go_back_request=false;
+ go_back_request = false;
}
-
input_mutex->unlock();
os_android->process_accelerometer(accelerometer);
@@ -1110,41 +1054,36 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv * env, jo
os_android->process_gyroscope(gyroscope);
- if (os_android->main_loop_iterate()==true) {
+ if (os_android->main_loop_iterate() == true) {
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());
-
+ __android_log_print(ANDROID_LOG_INFO, "godot", "**FINISH REQUEST!!! - %p-%i\n", env, Thread::get_caller_ID());
}
suspend_mutex->unlock();
-
}
-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_touch(JNIEnv *env, jobject obj, jint ev, jint pointer, jint count, jintArray positions) {
//__android_log_print(ANDROID_LOG_INFO,"godot","**TOUCH EVENT! - %p-%i\n",env,Thread::get_caller_ID());
-
Vector<OS_Android::TouchPos> points;
- for(int i=0;i<count;i++) {
+ for (int i = 0; i < count; i++) {
jint p[3];
- env->GetIntArrayRegion(positions,i*3,3,p);
+ env->GetIntArrayRegion(positions, i * 3, 3, p);
OS_Android::TouchPos tp;
- tp.pos=Point2(p[1],p[2]);
- tp.id=p[0];
+ tp.pos = Point2(p[1], p[2]);
+ tp.id = p[0];
points.push_back(tp);
}
JAndroidPointerEvent jpe;
- jpe.pointer=pointer;
- jpe.points=points;
- jpe.what=ev;
+ jpe.pointer = pointer;
+ jpe.points = points;
+ jpe.what = ev;
input_mutex->lock();
@@ -1155,127 +1094,126 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_touch(JNIEnv * env, j
if (os_android)
os_android->process_touch(ev,pointer,points);
*/
-
}
/*
* Android Key codes.
*/
enum {
- AKEYCODE_UNKNOWN = 0,
- AKEYCODE_SOFT_LEFT = 1,
- AKEYCODE_SOFT_RIGHT = 2,
- AKEYCODE_HOME = 3,
- AKEYCODE_BACK = 4,
- AKEYCODE_CALL = 5,
- AKEYCODE_ENDCALL = 6,
- AKEYCODE_0 = 7,
- AKEYCODE_1 = 8,
- AKEYCODE_2 = 9,
- AKEYCODE_3 = 10,
- AKEYCODE_4 = 11,
- AKEYCODE_5 = 12,
- AKEYCODE_6 = 13,
- AKEYCODE_7 = 14,
- AKEYCODE_8 = 15,
- AKEYCODE_9 = 16,
- AKEYCODE_STAR = 17,
- AKEYCODE_POUND = 18,
- AKEYCODE_DPAD_UP = 19,
- AKEYCODE_DPAD_DOWN = 20,
- AKEYCODE_DPAD_LEFT = 21,
- AKEYCODE_DPAD_RIGHT = 22,
- AKEYCODE_DPAD_CENTER = 23,
- AKEYCODE_VOLUME_UP = 24,
- AKEYCODE_VOLUME_DOWN = 25,
- AKEYCODE_POWER = 26,
- AKEYCODE_CAMERA = 27,
- AKEYCODE_CLEAR = 28,
- AKEYCODE_A = 29,
- AKEYCODE_B = 30,
- AKEYCODE_C = 31,
- AKEYCODE_D = 32,
- AKEYCODE_E = 33,
- AKEYCODE_F = 34,
- AKEYCODE_G = 35,
- AKEYCODE_H = 36,
- AKEYCODE_I = 37,
- AKEYCODE_J = 38,
- AKEYCODE_K = 39,
- AKEYCODE_L = 40,
- AKEYCODE_M = 41,
- AKEYCODE_N = 42,
- AKEYCODE_O = 43,
- AKEYCODE_P = 44,
- AKEYCODE_Q = 45,
- AKEYCODE_R = 46,
- AKEYCODE_S = 47,
- AKEYCODE_T = 48,
- AKEYCODE_U = 49,
- AKEYCODE_V = 50,
- AKEYCODE_W = 51,
- AKEYCODE_X = 52,
- AKEYCODE_Y = 53,
- AKEYCODE_Z = 54,
- AKEYCODE_COMMA = 55,
- AKEYCODE_PERIOD = 56,
- AKEYCODE_ALT_LEFT = 57,
- AKEYCODE_ALT_RIGHT = 58,
- AKEYCODE_SHIFT_LEFT = 59,
- AKEYCODE_SHIFT_RIGHT = 60,
- AKEYCODE_TAB = 61,
- AKEYCODE_SPACE = 62,
- AKEYCODE_SYM = 63,
- AKEYCODE_EXPLORER = 64,
- AKEYCODE_ENVELOPE = 65,
- AKEYCODE_ENTER = 66,
- AKEYCODE_DEL = 67,
- AKEYCODE_GRAVE = 68,
- AKEYCODE_MINUS = 69,
- AKEYCODE_EQUALS = 70,
- AKEYCODE_LEFT_BRACKET = 71,
- AKEYCODE_RIGHT_BRACKET = 72,
- AKEYCODE_BACKSLASH = 73,
- AKEYCODE_SEMICOLON = 74,
- AKEYCODE_APOSTROPHE = 75,
- AKEYCODE_SLASH = 76,
- AKEYCODE_AT = 77,
- AKEYCODE_NUM = 78,
- AKEYCODE_HEADSETHOOK = 79,
- AKEYCODE_FOCUS = 80, // *Camera* focus
- AKEYCODE_PLUS = 81,
- AKEYCODE_MENU = 82,
- AKEYCODE_NOTIFICATION = 83,
- AKEYCODE_SEARCH = 84,
- AKEYCODE_MEDIA_PLAY_PAUSE= 85,
- AKEYCODE_MEDIA_STOP = 86,
- AKEYCODE_MEDIA_NEXT = 87,
- AKEYCODE_MEDIA_PREVIOUS = 88,
- AKEYCODE_MEDIA_REWIND = 89,
- AKEYCODE_MEDIA_FAST_FORWARD = 90,
- AKEYCODE_MUTE = 91,
- AKEYCODE_PAGE_UP = 92,
- AKEYCODE_PAGE_DOWN = 93,
- AKEYCODE_PICTSYMBOLS = 94,
- AKEYCODE_SWITCH_CHARSET = 95,
- AKEYCODE_BUTTON_A = 96,
- AKEYCODE_BUTTON_B = 97,
- AKEYCODE_BUTTON_C = 98,
- AKEYCODE_BUTTON_X = 99,
- AKEYCODE_BUTTON_Y = 100,
- AKEYCODE_BUTTON_Z = 101,
- AKEYCODE_BUTTON_L1 = 102,
- AKEYCODE_BUTTON_R1 = 103,
- AKEYCODE_BUTTON_L2 = 104,
- AKEYCODE_BUTTON_R2 = 105,
- AKEYCODE_BUTTON_THUMBL = 106,
- AKEYCODE_BUTTON_THUMBR = 107,
- AKEYCODE_BUTTON_START = 108,
- AKEYCODE_BUTTON_SELECT = 109,
- AKEYCODE_BUTTON_MODE = 110,
+ AKEYCODE_UNKNOWN = 0,
+ AKEYCODE_SOFT_LEFT = 1,
+ AKEYCODE_SOFT_RIGHT = 2,
+ AKEYCODE_HOME = 3,
+ AKEYCODE_BACK = 4,
+ AKEYCODE_CALL = 5,
+ AKEYCODE_ENDCALL = 6,
+ AKEYCODE_0 = 7,
+ AKEYCODE_1 = 8,
+ AKEYCODE_2 = 9,
+ AKEYCODE_3 = 10,
+ AKEYCODE_4 = 11,
+ AKEYCODE_5 = 12,
+ AKEYCODE_6 = 13,
+ AKEYCODE_7 = 14,
+ AKEYCODE_8 = 15,
+ AKEYCODE_9 = 16,
+ AKEYCODE_STAR = 17,
+ AKEYCODE_POUND = 18,
+ AKEYCODE_DPAD_UP = 19,
+ AKEYCODE_DPAD_DOWN = 20,
+ AKEYCODE_DPAD_LEFT = 21,
+ AKEYCODE_DPAD_RIGHT = 22,
+ AKEYCODE_DPAD_CENTER = 23,
+ AKEYCODE_VOLUME_UP = 24,
+ AKEYCODE_VOLUME_DOWN = 25,
+ AKEYCODE_POWER = 26,
+ AKEYCODE_CAMERA = 27,
+ AKEYCODE_CLEAR = 28,
+ AKEYCODE_A = 29,
+ AKEYCODE_B = 30,
+ AKEYCODE_C = 31,
+ AKEYCODE_D = 32,
+ AKEYCODE_E = 33,
+ AKEYCODE_F = 34,
+ AKEYCODE_G = 35,
+ AKEYCODE_H = 36,
+ AKEYCODE_I = 37,
+ AKEYCODE_J = 38,
+ AKEYCODE_K = 39,
+ AKEYCODE_L = 40,
+ AKEYCODE_M = 41,
+ AKEYCODE_N = 42,
+ AKEYCODE_O = 43,
+ AKEYCODE_P = 44,
+ AKEYCODE_Q = 45,
+ AKEYCODE_R = 46,
+ AKEYCODE_S = 47,
+ AKEYCODE_T = 48,
+ AKEYCODE_U = 49,
+ AKEYCODE_V = 50,
+ AKEYCODE_W = 51,
+ AKEYCODE_X = 52,
+ AKEYCODE_Y = 53,
+ AKEYCODE_Z = 54,
+ AKEYCODE_COMMA = 55,
+ AKEYCODE_PERIOD = 56,
+ AKEYCODE_ALT_LEFT = 57,
+ AKEYCODE_ALT_RIGHT = 58,
+ AKEYCODE_SHIFT_LEFT = 59,
+ AKEYCODE_SHIFT_RIGHT = 60,
+ AKEYCODE_TAB = 61,
+ AKEYCODE_SPACE = 62,
+ AKEYCODE_SYM = 63,
+ AKEYCODE_EXPLORER = 64,
+ AKEYCODE_ENVELOPE = 65,
+ AKEYCODE_ENTER = 66,
+ AKEYCODE_DEL = 67,
+ AKEYCODE_GRAVE = 68,
+ AKEYCODE_MINUS = 69,
+ AKEYCODE_EQUALS = 70,
+ AKEYCODE_LEFT_BRACKET = 71,
+ AKEYCODE_RIGHT_BRACKET = 72,
+ AKEYCODE_BACKSLASH = 73,
+ AKEYCODE_SEMICOLON = 74,
+ AKEYCODE_APOSTROPHE = 75,
+ AKEYCODE_SLASH = 76,
+ AKEYCODE_AT = 77,
+ AKEYCODE_NUM = 78,
+ AKEYCODE_HEADSETHOOK = 79,
+ AKEYCODE_FOCUS = 80, // *Camera* focus
+ AKEYCODE_PLUS = 81,
+ AKEYCODE_MENU = 82,
+ AKEYCODE_NOTIFICATION = 83,
+ AKEYCODE_SEARCH = 84,
+ AKEYCODE_MEDIA_PLAY_PAUSE = 85,
+ AKEYCODE_MEDIA_STOP = 86,
+ AKEYCODE_MEDIA_NEXT = 87,
+ AKEYCODE_MEDIA_PREVIOUS = 88,
+ AKEYCODE_MEDIA_REWIND = 89,
+ AKEYCODE_MEDIA_FAST_FORWARD = 90,
+ AKEYCODE_MUTE = 91,
+ AKEYCODE_PAGE_UP = 92,
+ AKEYCODE_PAGE_DOWN = 93,
+ AKEYCODE_PICTSYMBOLS = 94,
+ AKEYCODE_SWITCH_CHARSET = 95,
+ AKEYCODE_BUTTON_A = 96,
+ AKEYCODE_BUTTON_B = 97,
+ AKEYCODE_BUTTON_C = 98,
+ AKEYCODE_BUTTON_X = 99,
+ AKEYCODE_BUTTON_Y = 100,
+ AKEYCODE_BUTTON_Z = 101,
+ AKEYCODE_BUTTON_L1 = 102,
+ AKEYCODE_BUTTON_R1 = 103,
+ AKEYCODE_BUTTON_L2 = 104,
+ AKEYCODE_BUTTON_R2 = 105,
+ AKEYCODE_BUTTON_THUMBL = 106,
+ AKEYCODE_BUTTON_THUMBR = 107,
+ AKEYCODE_BUTTON_START = 108,
+ AKEYCODE_BUTTON_SELECT = 109,
+ AKEYCODE_BUTTON_MODE = 110,
- // NOTE: If you add a new keycode here you must also add it to several other files.
- // Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list.
+ // NOTE: If you add a new keycode here you must also add it to several other files.
+ // Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list.
};
struct _WinTranslatePair {
@@ -1284,96 +1222,96 @@ struct _WinTranslatePair {
unsigned int keycode;
};
-
-static _WinTranslatePair _ak_to_keycode[]={
-{ KEY_TAB, AKEYCODE_TAB },
-{ KEY_ENTER, AKEYCODE_ENTER },
-{ KEY_SHIFT, AKEYCODE_SHIFT_LEFT },
-{ KEY_SHIFT, AKEYCODE_SHIFT_RIGHT },
-{ KEY_ALT, AKEYCODE_ALT_LEFT },
-{ KEY_ALT, AKEYCODE_ALT_RIGHT },
-{ KEY_MENU, AKEYCODE_MENU },
-{ KEY_PAUSE, AKEYCODE_MEDIA_PLAY_PAUSE },
-{ KEY_ESCAPE, AKEYCODE_BACK },
-{ KEY_SPACE, AKEYCODE_SPACE },
-{ KEY_PAGEUP, AKEYCODE_PAGE_UP },
-{ KEY_PAGEDOWN, AKEYCODE_PAGE_DOWN },
-{ KEY_HOME, AKEYCODE_HOME },//(0x24)
-{ KEY_LEFT, AKEYCODE_DPAD_LEFT },
-{ KEY_UP, AKEYCODE_DPAD_UP },
-{ KEY_RIGHT, AKEYCODE_DPAD_RIGHT },
-{ KEY_DOWN, AKEYCODE_DPAD_DOWN},
-{ KEY_PERIODCENTERED, AKEYCODE_DPAD_CENTER },
-{ KEY_BACKSPACE, AKEYCODE_DEL},
-{ KEY_0, AKEYCODE_0 },////0 key
-{ KEY_1, AKEYCODE_1 },////1 key
-{ KEY_2, AKEYCODE_2 },////2 key
-{ KEY_3, AKEYCODE_3 },////3 key
-{ KEY_4, AKEYCODE_4 },////4 key
-{ KEY_5, AKEYCODE_5 },////5 key
-{ KEY_6, AKEYCODE_6 },////6 key
-{ KEY_7, AKEYCODE_7 },////7 key
-{ KEY_8, AKEYCODE_8 },////8 key
-{ KEY_9, AKEYCODE_9 },////9 key
-{ KEY_A, AKEYCODE_A },////A key
-{ KEY_B, AKEYCODE_B },////B key
-{ KEY_C, AKEYCODE_C },////C key
-{ KEY_D, AKEYCODE_D },////D key
-{ KEY_E, AKEYCODE_E },////E key
-{ KEY_F, AKEYCODE_F },////F key
-{ KEY_G, AKEYCODE_G },////G key
-{ KEY_H, AKEYCODE_H },////H key
-{ KEY_I, AKEYCODE_I },////I key
-{ KEY_J, AKEYCODE_J },////J key
-{ KEY_K, AKEYCODE_K },////K key
-{ KEY_L, AKEYCODE_L },////L key
-{ KEY_M, AKEYCODE_M },////M key
-{ KEY_N, AKEYCODE_N },////N key
-{ KEY_O, AKEYCODE_O },////O key
-{ KEY_P, AKEYCODE_P },////P key
-{ KEY_Q, AKEYCODE_Q },////Q key
-{ KEY_R, AKEYCODE_R },////R key
-{ KEY_S, AKEYCODE_S },////S key
-{ KEY_T, AKEYCODE_T },////T key
-{ KEY_U, AKEYCODE_U },////U key
-{ KEY_V, AKEYCODE_V },////V key
-{ KEY_W, AKEYCODE_W },////W key
-{ KEY_X, AKEYCODE_X },////X key
-{ KEY_Y, AKEYCODE_Y },////Y key
-{ KEY_Z, AKEYCODE_Z },////Z key
-{ KEY_HOMEPAGE, AKEYCODE_EXPLORER},
-{ KEY_LAUNCH0, AKEYCODE_BUTTON_A},
-{ KEY_LAUNCH1, AKEYCODE_BUTTON_B},
-{ KEY_LAUNCH2, AKEYCODE_BUTTON_C},
-{ KEY_LAUNCH3, AKEYCODE_BUTTON_X},
-{ KEY_LAUNCH4, AKEYCODE_BUTTON_Y},
-{ KEY_LAUNCH5, AKEYCODE_BUTTON_Z},
-{ KEY_LAUNCH6, AKEYCODE_BUTTON_L1},
-{ KEY_LAUNCH7, AKEYCODE_BUTTON_R1},
-{ KEY_LAUNCH8, AKEYCODE_BUTTON_L2},
-{ KEY_LAUNCH9, AKEYCODE_BUTTON_R2},
-{ KEY_LAUNCHA, AKEYCODE_BUTTON_THUMBL},
-{ KEY_LAUNCHB, AKEYCODE_BUTTON_THUMBR},
-{ KEY_LAUNCHC, AKEYCODE_BUTTON_START},
-{ KEY_LAUNCHD, AKEYCODE_BUTTON_SELECT},
-{ KEY_LAUNCHE, AKEYCODE_BUTTON_MODE},
-{ KEY_VOLUMEMUTE, AKEYCODE_MUTE},
-{ KEY_VOLUMEDOWN, AKEYCODE_VOLUME_DOWN},
-{ KEY_VOLUMEUP, AKEYCODE_VOLUME_UP},
-{ KEY_BACK, AKEYCODE_MEDIA_REWIND },
-{ KEY_FORWARD, AKEYCODE_MEDIA_FAST_FORWARD },
-{ KEY_MEDIANEXT, AKEYCODE_MEDIA_NEXT },
-{ KEY_MEDIAPREVIOUS, AKEYCODE_MEDIA_PREVIOUS },
-{ KEY_MEDIASTOP, AKEYCODE_MEDIA_STOP },
-{ KEY_PLUS, AKEYCODE_PLUS },
-{ KEY_EQUAL, AKEYCODE_EQUALS},// the '+' key
-{ KEY_COMMA, AKEYCODE_COMMA},// the ',' key
-{ KEY_MINUS, AKEYCODE_MINUS},// the '-' key
-{ KEY_SLASH, AKEYCODE_SLASH},// the '/?' key
-{ KEY_BACKSLASH, AKEYCODE_BACKSLASH},
-{ KEY_BRACKETLEFT, AKEYCODE_LEFT_BRACKET},
-{ KEY_BRACKETRIGHT, AKEYCODE_RIGHT_BRACKET},
-{ KEY_UNKNOWN, 0} };
+static _WinTranslatePair _ak_to_keycode[] = {
+ { KEY_TAB, AKEYCODE_TAB },
+ { KEY_ENTER, AKEYCODE_ENTER },
+ { KEY_SHIFT, AKEYCODE_SHIFT_LEFT },
+ { KEY_SHIFT, AKEYCODE_SHIFT_RIGHT },
+ { KEY_ALT, AKEYCODE_ALT_LEFT },
+ { KEY_ALT, AKEYCODE_ALT_RIGHT },
+ { KEY_MENU, AKEYCODE_MENU },
+ { KEY_PAUSE, AKEYCODE_MEDIA_PLAY_PAUSE },
+ { KEY_ESCAPE, AKEYCODE_BACK },
+ { KEY_SPACE, AKEYCODE_SPACE },
+ { KEY_PAGEUP, AKEYCODE_PAGE_UP },
+ { KEY_PAGEDOWN, AKEYCODE_PAGE_DOWN },
+ { KEY_HOME, AKEYCODE_HOME }, //(0x24)
+ { KEY_LEFT, AKEYCODE_DPAD_LEFT },
+ { KEY_UP, AKEYCODE_DPAD_UP },
+ { KEY_RIGHT, AKEYCODE_DPAD_RIGHT },
+ { KEY_DOWN, AKEYCODE_DPAD_DOWN },
+ { KEY_PERIODCENTERED, AKEYCODE_DPAD_CENTER },
+ { KEY_BACKSPACE, AKEYCODE_DEL },
+ { KEY_0, AKEYCODE_0 }, ////0 key
+ { KEY_1, AKEYCODE_1 }, ////1 key
+ { KEY_2, AKEYCODE_2 }, ////2 key
+ { KEY_3, AKEYCODE_3 }, ////3 key
+ { KEY_4, AKEYCODE_4 }, ////4 key
+ { KEY_5, AKEYCODE_5 }, ////5 key
+ { KEY_6, AKEYCODE_6 }, ////6 key
+ { KEY_7, AKEYCODE_7 }, ////7 key
+ { KEY_8, AKEYCODE_8 }, ////8 key
+ { KEY_9, AKEYCODE_9 }, ////9 key
+ { KEY_A, AKEYCODE_A }, ////A key
+ { KEY_B, AKEYCODE_B }, ////B key
+ { KEY_C, AKEYCODE_C }, ////C key
+ { KEY_D, AKEYCODE_D }, ////D key
+ { KEY_E, AKEYCODE_E }, ////E key
+ { KEY_F, AKEYCODE_F }, ////F key
+ { KEY_G, AKEYCODE_G }, ////G key
+ { KEY_H, AKEYCODE_H }, ////H key
+ { KEY_I, AKEYCODE_I }, ////I key
+ { KEY_J, AKEYCODE_J }, ////J key
+ { KEY_K, AKEYCODE_K }, ////K key
+ { KEY_L, AKEYCODE_L }, ////L key
+ { KEY_M, AKEYCODE_M }, ////M key
+ { KEY_N, AKEYCODE_N }, ////N key
+ { KEY_O, AKEYCODE_O }, ////O key
+ { KEY_P, AKEYCODE_P }, ////P key
+ { KEY_Q, AKEYCODE_Q }, ////Q key
+ { KEY_R, AKEYCODE_R }, ////R key
+ { KEY_S, AKEYCODE_S }, ////S key
+ { KEY_T, AKEYCODE_T }, ////T key
+ { KEY_U, AKEYCODE_U }, ////U key
+ { KEY_V, AKEYCODE_V }, ////V key
+ { KEY_W, AKEYCODE_W }, ////W key
+ { KEY_X, AKEYCODE_X }, ////X key
+ { KEY_Y, AKEYCODE_Y }, ////Y key
+ { KEY_Z, AKEYCODE_Z }, ////Z key
+ { KEY_HOMEPAGE, AKEYCODE_EXPLORER },
+ { KEY_LAUNCH0, AKEYCODE_BUTTON_A },
+ { KEY_LAUNCH1, AKEYCODE_BUTTON_B },
+ { KEY_LAUNCH2, AKEYCODE_BUTTON_C },
+ { KEY_LAUNCH3, AKEYCODE_BUTTON_X },
+ { KEY_LAUNCH4, AKEYCODE_BUTTON_Y },
+ { KEY_LAUNCH5, AKEYCODE_BUTTON_Z },
+ { KEY_LAUNCH6, AKEYCODE_BUTTON_L1 },
+ { KEY_LAUNCH7, AKEYCODE_BUTTON_R1 },
+ { KEY_LAUNCH8, AKEYCODE_BUTTON_L2 },
+ { KEY_LAUNCH9, AKEYCODE_BUTTON_R2 },
+ { KEY_LAUNCHA, AKEYCODE_BUTTON_THUMBL },
+ { KEY_LAUNCHB, AKEYCODE_BUTTON_THUMBR },
+ { KEY_LAUNCHC, AKEYCODE_BUTTON_START },
+ { KEY_LAUNCHD, AKEYCODE_BUTTON_SELECT },
+ { KEY_LAUNCHE, AKEYCODE_BUTTON_MODE },
+ { KEY_VOLUMEMUTE, AKEYCODE_MUTE },
+ { KEY_VOLUMEDOWN, AKEYCODE_VOLUME_DOWN },
+ { KEY_VOLUMEUP, AKEYCODE_VOLUME_UP },
+ { KEY_BACK, AKEYCODE_MEDIA_REWIND },
+ { KEY_FORWARD, AKEYCODE_MEDIA_FAST_FORWARD },
+ { KEY_MEDIANEXT, AKEYCODE_MEDIA_NEXT },
+ { KEY_MEDIAPREVIOUS, AKEYCODE_MEDIA_PREVIOUS },
+ { KEY_MEDIASTOP, AKEYCODE_MEDIA_STOP },
+ { KEY_PLUS, AKEYCODE_PLUS },
+ { KEY_EQUAL, AKEYCODE_EQUALS }, // the '+' key
+ { KEY_COMMA, AKEYCODE_COMMA }, // the ',' key
+ { KEY_MINUS, AKEYCODE_MINUS }, // the '-' key
+ { KEY_SLASH, AKEYCODE_SLASH }, // the '/?' key
+ { KEY_BACKSLASH, AKEYCODE_BACKSLASH },
+ { KEY_BRACKETLEFT, AKEYCODE_LEFT_BRACKET },
+ { KEY_BRACKETRIGHT, AKEYCODE_RIGHT_BRACKET },
+ { KEY_UNKNOWN, 0 }
+};
/*
TODO: map these android key:
AKEYCODE_SOFT_LEFT = 1,
@@ -1401,20 +1339,19 @@ TODO: map these android key:
*/
static unsigned int android_get_keysym(unsigned int p_code) {
- for(int i=0;_ak_to_keycode[i].keysym!=KEY_UNKNOWN;i++) {
+ for (int i = 0; _ak_to_keycode[i].keysym != KEY_UNKNOWN; i++) {
- if (_ak_to_keycode[i].keycode==p_code) {
+ if (_ak_to_keycode[i].keycode == p_code) {
//print_line("outcode: " + _ak_to_keycode[i].keysym);
return _ak_to_keycode[i].keysym;
}
}
-
return KEY_UNKNOWN;
}
-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_joybutton(JNIEnv *env, jobject obj, jint p_device, jint p_button, jboolean p_pressed) {
OS_Android::JoypadEvent jevent;
jevent.device = p_device;
@@ -1427,7 +1364,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joybutton(JNIEnv * en
input_mutex->unlock();
}
-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_joyaxis(JNIEnv *env, jobject obj, jint p_device, jint p_axis, jfloat p_value) {
OS_Android::JoypadEvent jevent;
jevent.device = p_device;
@@ -1440,18 +1377,22 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyaxis(JNIEnv * env,
input_mutex->unlock();
}
-JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyhat(JNIEnv * env, jobject obj, jint p_device, jint p_hat_x, jint p_hat_y) {
+JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyhat(JNIEnv *env, jobject obj, jint p_device, jint p_hat_x, jint p_hat_y) {
OS_Android::JoypadEvent jevent;
jevent.device = p_device;
jevent.type = OS_Android::JOY_EVENT_HAT;
int hat = 0;
if (p_hat_x != 0) {
- if (p_hat_x < 0) hat |= InputDefault::HAT_MASK_LEFT;
- else hat |= InputDefault::HAT_MASK_RIGHT;
+ if (p_hat_x < 0)
+ hat |= InputDefault::HAT_MASK_LEFT;
+ else
+ hat |= InputDefault::HAT_MASK_RIGHT;
}
if (p_hat_y != 0) {
- if (p_hat_y < 0) hat |= InputDefault::HAT_MASK_UP;
- else hat |= InputDefault::HAT_MASK_DOWN;
+ if (p_hat_y < 0)
+ hat |= InputDefault::HAT_MASK_UP;
+ else
+ hat |= InputDefault::HAT_MASK_DOWN;
}
jevent.hat = hat;
input_mutex->lock();
@@ -1459,14 +1400,14 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyhat(JNIEnv * env,
input_mutex->unlock();
}
-JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyconnectionchanged(JNIEnv * env, jobject obj, jint p_device, jboolean p_connected, jstring p_name) {
+JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyconnectionchanged(JNIEnv *env, jobject obj, jint p_device, jboolean p_connected, jstring p_name) {
if (os_android) {
- String name = env->GetStringUTFChars( p_name, NULL );
+ String name = env->GetStringUTFChars(p_name, NULL);
os_android->joy_connection_changed(p_device, p_connected, name);
}
}
-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_key(JNIEnv *env, jobject obj, jint p_scancode, jint p_unicode_char, jboolean p_pressed) {
InputEvent ievent;
ievent.type = InputEvent::KEY;
@@ -1479,56 +1420,51 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_key(JNIEnv * env, job
print_line("Scancode: " + String::num(p_scancode) + ":" + String::num(ievent.key.scancode) + " Unicode: " + String::num(val));
- ievent.key.mod.shift=false;
- ievent.key.mod.alt=false;
- ievent.key.mod.control=false;
- ievent.key.echo=false;
+ ievent.key.mod.shift = false;
+ ievent.key.mod.alt = false;
+ ievent.key.mod.control = false;
+ ievent.key.echo = false;
- if (val == '\n')
- {
+ if (val == '\n') {
ievent.key.scancode = KEY_ENTER;
- }else if (val == 61448) {
+ } else if (val == 61448) {
ievent.key.scancode = KEY_BACKSPACE;
ievent.key.unicode = KEY_BACKSPACE;
} else if (val == 61453) {
ievent.key.scancode = KEY_ENTER;
ievent.key.unicode = KEY_ENTER;
- } else if (p_scancode==4) {
+ } else if (p_scancode == 4) {
- go_back_request=true;
- }
+ go_back_request = true;
+ }
input_mutex->lock();
key_events.push_back(ievent);
input_mutex->unlock();
}
-
-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_accelerometer(JNIEnv *env, jobject obj, jfloat x, jfloat y, jfloat z) {
input_mutex->lock();
- accelerometer=Vector3(x,y,z);
+ accelerometer = Vector3(x, y, z);
input_mutex->unlock();
-
}
-JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_magnetometer(JNIEnv * env, jobject obj, jfloat x, jfloat y, jfloat z) {
+JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_magnetometer(JNIEnv *env, jobject obj, jfloat x, jfloat y, jfloat z) {
input_mutex->lock();
- magnetometer=Vector3(x,y,z);
+ magnetometer = Vector3(x, y, z);
input_mutex->unlock();
-
}
-JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_gyroscope(JNIEnv * env, jobject obj, jfloat x, jfloat y, jfloat z) {
+JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_gyroscope(JNIEnv *env, jobject obj, jfloat x, jfloat y, jfloat z) {
input_mutex->lock();
- gyroscope=Vector3(x,y,z);
+ gyroscope = Vector3(x, y, z);
input_mutex->unlock();
-
}
-JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_focusin(JNIEnv * env, jobject obj){
+JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_focusin(JNIEnv *env, jobject obj) {
if (!suspend_mutex)
return;
@@ -1540,7 +1476,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_focusin(JNIEnv * env,
suspend_mutex->unlock();
}
-JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_focusout(JNIEnv * env, jobject obj){
+JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_focusout(JNIEnv *env, jobject obj) {
if (!suspend_mutex)
return;
@@ -1550,58 +1486,50 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_focusout(JNIEnv * env
os_android->main_loop_focusout();
suspend_mutex->unlock();
-
}
-
-
-JNIEXPORT void JNICALL Java_org_godotengine_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);
-
-
}
+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_singleton(JNIEnv * env, jobject obj, jstring name,jobject p_object){
-
- String singname = env->GetStringUTFChars( name, NULL );
- JNISingleton *s = memnew( JNISingleton );
+ String singname = env->GetStringUTFChars(name, NULL);
+ JNISingleton *s = memnew(JNISingleton);
s->set_instance(env->NewGlobalRef(p_object));
- jni_singletons[singname]=s;
-
- GlobalConfig::get_singleton()->add_singleton(GlobalConfig::Singleton(singname,s));
- GlobalConfig::get_singleton()->set(singname,s);
+ jni_singletons[singname] = s;
+ GlobalConfig::get_singleton()->add_singleton(GlobalConfig::Singleton(singname, s));
+ GlobalConfig::get_singleton()->set(singname, s);
}
-
-static Variant::Type get_jni_type(const String& p_type) {
+static Variant::Type get_jni_type(const String &p_type) {
static struct {
const char *name;
Variant::Type type;
- } _type_to_vtype[]={
- {"void",Variant::NIL},
- {"boolean",Variant::BOOL},
- {"int",Variant::INT},
- {"float",Variant::REAL},
- {"double", Variant::REAL},
- {"java.lang.String",Variant::STRING},
- {"[I",Variant::POOL_INT_ARRAY},
- {"[B",Variant::POOL_BYTE_ARRAY},
- {"[F",Variant::POOL_REAL_ARRAY},
- {"[Ljava.lang.String;",Variant::POOL_STRING_ARRAY},
- {"org.godotengine.godot.Dictionary", Variant::DICTIONARY},
- {NULL,Variant::NIL}
+ } _type_to_vtype[] = {
+ { "void", Variant::NIL },
+ { "boolean", Variant::BOOL },
+ { "int", Variant::INT },
+ { "float", Variant::REAL },
+ { "double", Variant::REAL },
+ { "java.lang.String", Variant::STRING },
+ { "[I", Variant::POOL_INT_ARRAY },
+ { "[B", Variant::POOL_BYTE_ARRAY },
+ { "[F", Variant::POOL_REAL_ARRAY },
+ { "[Ljava.lang.String;", Variant::POOL_STRING_ARRAY },
+ { "org.godotengine.godot.Dictionary", Variant::DICTIONARY },
+ { NULL, Variant::NIL }
};
- int idx=0;
+ int idx = 0;
while (_type_to_vtype[idx].name) {
- if (p_type==_type_to_vtype[idx].name)
+ if (p_type == _type_to_vtype[idx].name)
return _type_to_vtype[idx].type;
idx++;
@@ -1610,145 +1538,131 @@ static Variant::Type get_jni_type(const String& p_type) {
return Variant::NIL;
}
-
-static const char* get_jni_sig(const String& p_type) {
-
+static const char *get_jni_sig(const String &p_type) {
static struct {
const char *name;
const char *sig;
- } _type_to_vtype[]={
- {"void","V"},
- {"boolean","Z"},
- {"int","I"},
- {"float","F"},
- {"double","D"},
- {"java.lang.String","Ljava/lang/String;"},
- {"org.godotengine.godot.Dictionary", "Lorg/godotengine/godot/Dictionary;"},
- {"[I","[I"},
- {"[B","[B"},
- {"[F","[F"},
- {"[Ljava.lang.String;","[Ljava/lang/String;"},
- {NULL,"V"}
+ } _type_to_vtype[] = {
+ { "void", "V" },
+ { "boolean", "Z" },
+ { "int", "I" },
+ { "float", "F" },
+ { "double", "D" },
+ { "java.lang.String", "Ljava/lang/String;" },
+ { "org.godotengine.godot.Dictionary", "Lorg/godotengine/godot/Dictionary;" },
+ { "[I", "[I" },
+ { "[B", "[B" },
+ { "[F", "[F" },
+ { "[Ljava.lang.String;", "[Ljava/lang/String;" },
+ { NULL, "V" }
};
- int idx=0;
+ int idx = 0;
while (_type_to_vtype[idx].name) {
- if (p_type==_type_to_vtype[idx].name)
+ if (p_type == _type_to_vtype[idx].name)
return _type_to_vtype[idx].sig;
idx++;
}
-
return "Ljava/lang/Object;";
}
-JNIEXPORT jstring JNICALL Java_org_godotengine_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 );
+ String js = env->GetStringUTFChars(path, NULL);
return env->NewStringUTF(GlobalConfig::get_singleton()->get(js).operator String().utf8().get_data());
-
-
}
+JNIEXPORT void JNICALL Java_org_godotengine_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 );
+ String singname = env->GetStringUTFChars(sname, NULL);
ERR_FAIL_COND(!jni_singletons.has(singname));
JNISingleton *s = jni_singletons.get(singname);
-
- String mname = env->GetStringUTFChars( name, NULL );
- String retval = env->GetStringUTFChars( ret, NULL );
+ String mname = env->GetStringUTFChars(name, NULL);
+ String retval = env->GetStringUTFChars(ret, NULL);
Vector<Variant::Type> types;
- String cs="(";
-
+ String cs = "(";
int stringCount = env->GetArrayLength(args);
- print_line("Singl: "+singname+" Method: "+mname+" RetVal: "+retval);
- for (int i=0; i<stringCount; i++) {
+ print_line("Singl: " + singname + " Method: " + mname + " RetVal: " + retval);
+ for (int i = 0; i < stringCount; i++) {
- jstring string = (jstring) env->GetObjectArrayElement(args, i);
+ jstring string = (jstring)env->GetObjectArrayElement(args, i);
const char *rawString = env->GetStringUTFChars(string, 0);
types.push_back(get_jni_type(String(rawString)));
- cs+=get_jni_sig(String(rawString));
+ cs += get_jni_sig(String(rawString));
}
- cs+=")";
- cs+=get_jni_sig(retval);
+ cs += ")";
+ cs += get_jni_sig(retval);
jclass cls = env->GetObjectClass(s->get_instance());
- print_line("METHOD: "+mname+" sig: "+cs);
+ print_line("METHOD: " + mname + " sig: " + cs);
jmethodID mid = env->GetMethodID(cls, mname.ascii().get_data(), cs.ascii().get_data());
if (!mid) {
- print_line("FAILED GETTING METHOID "+mname);
+ print_line("FAILED GETTING METHOID " + mname);
}
- s->add_method(mname,mid,types,get_jni_type(retval));
-
-
+ s->add_method(mname, mid, types, get_jni_type(retval));
}
-JNIEXPORT void JNICALL Java_org_godotengine_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);
+ Object *obj = ObjectDB::get_instance(ID);
ERR_FAIL_COND(!obj);
int res = env->PushLocalFrame(16);
- ERR_FAIL_COND(res!=0);
-
- String str_method = env->GetStringUTFChars( method, NULL );
+ ERR_FAIL_COND(res != 0);
+ String str_method = env->GetStringUTFChars(method, NULL);
int count = env->GetArrayLength(params);
- Variant* vlist = (Variant*)alloca(sizeof(Variant) * count);
- Variant** vptr = (Variant**)alloca(sizeof(Variant*) * count);
- for (int i=0; i<count; i++) {
+ Variant *vlist = (Variant *)alloca(sizeof(Variant) * count);
+ Variant **vptr = (Variant **)alloca(sizeof(Variant *) * count);
+ for (int i = 0; i < count; i++) {
jobject obj = env->GetObjectArrayElement(params, i);
Variant v;
if (obj)
- v=_jobject_to_variant(env, obj);
+ v = _jobject_to_variant(env, obj);
memnew_placement(&vlist[i], Variant);
vlist[i] = v;
vptr[i] = &vlist[i];
env->DeleteLocalRef(obj);
-
};
Variant::CallError err;
- obj->call(str_method, (const Variant**)vptr, count, err);
+ obj->call(str_method, (const Variant **)vptr, count, err);
// something
env->PopLocalFrame(NULL);
-
}
-JNIEXPORT void JNICALL Java_org_godotengine_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);
+ Object *obj = ObjectDB::get_instance(ID);
ERR_FAIL_COND(!obj);
int res = env->PushLocalFrame(16);
- ERR_FAIL_COND(res!=0);
+ ERR_FAIL_COND(res != 0);
- String str_method = env->GetStringUTFChars( method, NULL );
+ String str_method = env->GetStringUTFChars(method, NULL);
int count = env->GetArrayLength(params);
Variant args[VARIANT_ARG_MAX];
- //print_line("Java->GD call: "+obj->get_type()+"::"+str_method+" argc "+itos(count));
+ //print_line("Java->GD call: "+obj->get_type()+"::"+str_method+" argc "+itos(count));
- for (int i=0; i<MIN(count,VARIANT_ARG_MAX); i++) {
+ for (int i = 0; i < MIN(count, VARIANT_ARG_MAX); i++) {
jobject obj = env->GetObjectArrayElement(params, i);
if (obj)
@@ -1756,15 +1670,11 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_calldeferred(JNIEnv *
env->DeleteLocalRef(obj);
//print_line("\targ"+itos(i)+": "+Variant::get_type_name(args[i].get_type()));
-
};
-
-
- obj->call_deferred(str_method, args[0],args[1],args[2],args[3],args[4]);
+ obj->call_deferred(str_method, args[0], args[1], args[2], args[3], args[4]);
// something
env->PopLocalFrame(NULL);
-
}
//Main::cleanup();
diff --git a/platform/android/java_glue.h b/platform/android/java_glue.h
index bc4628b9d..51a203186 100644
--- a/platform/android/java_glue.h
+++ b/platform/android/java_glue.h
@@ -31,35 +31,33 @@
#ifndef JAVA_GLUE_H
#define JAVA_GLUE_H
-#include <jni.h>
#include <android/log.h>
-
+#include <jni.h>
extern "C" {
- 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_joyhat(JNIEnv * env, jobject obj, jint p_device, jint p_hat_x, jint p_hat_y);
- JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyconnectionchanged(JNIEnv * env, jobject obj, jint p_device, jboolean p_connected, jstring p_name);
- 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_magnetometer(JNIEnv * env, jobject obj, jfloat x, jfloat y, jfloat z);
- JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_gyroscope(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);
+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_joyhat(JNIEnv *env, jobject obj, jint p_device, jint p_hat_x, jint p_hat_y);
+JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyconnectionchanged(JNIEnv *env, jobject obj, jint p_device, jboolean p_connected, jstring p_name);
+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_magnetometer(JNIEnv *env, jobject obj, jfloat x, jfloat y, jfloat z);
+JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_gyroscope(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);
}
-
#endif
#endif // JAVA_GLUE_H
generated by cgit v1.2.3-70-g09d2 (git 2.52.0) at 2026-01-12 10:42:29 +0000