From f8db8a3faa30b71dca33ced38be16d3f93f43e8a Mon Sep 17 00:00:00 2001 From: Rémi Verschelde Date: Sun, 19 Mar 2017 00:36:26 +0100 Subject: Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261. --- platform/android/java_class_wrapper.h | 172 ++++++++++++++++++++-------------- 1 file changed, 101 insertions(+), 71 deletions(-) (limited to 'platform/android/java_class_wrapper.h') diff --git a/platform/android/java_class_wrapper.h b/platform/android/java_class_wrapper.h index 8165d636c..5729d7c31 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 #include +#include class JavaObject; class JavaClass : public Reference { - OBJ_TYPE(JavaClass,Reference); + OBJ_TYPE(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 constant_map; + Map constant_map; struct MethodInfo { @@ -67,94 +66,126 @@ class JavaClass : public Reference { Vector 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) { - - likelyhood=1.0; - r_type=Variant::NIL; - - 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::RAW_ARRAY; likelyhood=1.0; break; - case ARG_ARRAY_BIT|ARG_TYPE_CHAR: r_type=Variant::RAW_ARRAY; likelyhood=0.5; break; - case ARG_ARRAY_BIT|ARG_TYPE_SHORT: r_type=Variant::INT_ARRAY; likelyhood=0.3; break; - case ARG_ARRAY_BIT|ARG_TYPE_INT: r_type=Variant::INT_ARRAY; likelyhood=1.0; break; - case ARG_ARRAY_BIT|ARG_TYPE_LONG: r_type=Variant::INT_ARRAY; likelyhood=0.5; break; - case ARG_ARRAY_BIT|ARG_TYPE_FLOAT: r_type=Variant::REAL_ARRAY; likelyhood=1.0; break; - case ARG_ARRAY_BIT|ARG_TYPE_DOUBLE: r_type=Variant::REAL_ARRAY; likelyhood=0.5; break; - case ARG_ARRAY_BIT|ARG_TYPE_STRING: r_type=Variant::STRING_ARRAY; break; - case ARG_ARRAY_BIT|ARG_TYPE_CLASS: r_type=Variant::ARRAY; break; + _FORCE_INLINE_ static void _convert_to_variant_type(int p_sig, Variant::Type &r_type, float &likelyhood) { + + likelyhood = 1.0; + r_type = Variant::NIL; + + 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::RAW_ARRAY; + likelyhood = 1.0; + break; + case ARG_ARRAY_BIT | ARG_TYPE_CHAR: + r_type = Variant::RAW_ARRAY; + likelyhood = 0.5; + break; + case ARG_ARRAY_BIT | ARG_TYPE_SHORT: + r_type = Variant::INT_ARRAY; + likelyhood = 0.3; + break; + case ARG_ARRAY_BIT | ARG_TYPE_INT: + r_type = Variant::INT_ARRAY; + likelyhood = 1.0; + break; + case ARG_ARRAY_BIT | ARG_TYPE_LONG: + r_type = Variant::INT_ARRAY; + likelyhood = 0.5; + break; + case ARG_ARRAY_BIT | ARG_TYPE_FLOAT: + r_type = Variant::REAL_ARRAY; + likelyhood = 1.0; + break; + case ARG_ARRAY_BIT | ARG_TYPE_DOUBLE: + r_type = Variant::REAL_ARRAY; + likelyhood = 0.5; + break; + case ARG_ARRAY_BIT | ARG_TYPE_STRING: r_type = Variant::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 > methods; + friend class JavaClassWrapper; + Map > 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 { - OBJ_TYPE(JavaObject,Reference); + OBJ_TYPE(JavaObject, Reference); Ref 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& p_base,jobject *p_instance); + JavaObject(const Ref &p_base, jobject *p_instance); ~JavaObject(); - }; - class JavaClassWrapper : public Object { - OBJ_TYPE(JavaClassWrapper,Object); + OBJ_TYPE(JavaClassWrapper, Object); - - Map > class_cache; -friend class JavaClass; + Map > 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 wrap(const String& p_class); + Ref wrap(const String &p_class); - JavaClassWrapper(jobject p_activity=NULL); + JavaClassWrapper(jobject p_activity = NULL); }; #endif // JAVA_CLASS_WRAPPER_H -- cgit v1.2.3-70-g09d2