diff options
author | Ignacio Etcheverry <ignalfonsore@gmail.com> | 2020-01-19 20:02:40 +0100 |
---|---|---|
committer | Ignacio Etcheverry <ignalfonsore@gmail.com> | 2020-01-19 20:15:13 +0100 |
commit | a6105c8ea0bdae9d56d1943409d89cc71288306a (patch) | |
tree | e94ae56326809035e38d3f7bb6cdfb747e692d5c /platform/android/java_class_wrapper.h | |
parent | d11d7dfe3e15e34ba400e6b73d618abc4b8f5886 (diff) | |
download | redot-engine-a6105c8ea0bdae9d56d1943409d89cc71288306a.tar.gz |
Fix ClassDB API portability with some android and editor classes
- `EditorNavigationMeshGenerator` was being registered as part of the Core API,
even after d3f48f88bb84d22b7805ce971ac86cf1953a29fd. We must make sure to
set Editor as the current ClassDB API type before creating an instance.
- The `VisualScriptEngineSingleton.constant` property has a property hint string
that's different between tools and non-tools builds. This commit makes the
hint string to no longer be set in `_bind_methods`, and to instead set it in
`_validate_property`. This way it's ignored when calculating the API hash.
- `JavaClassWrapper` is now registered in ClassDB on all platforms,
using a dummy implementation on platforms other than Android.
This fixes API portability between Android and other platforms.
- Updated `--class-db-json` command to ignore non-virtual methods that start
with an underscore (see: 4be87c6016a5893cbde897924e540df4c988cee5).
Diffstat (limited to 'platform/android/java_class_wrapper.h')
-rw-r--r-- | platform/android/java_class_wrapper.h | 228 |
1 files changed, 0 insertions, 228 deletions
diff --git a/platform/android/java_class_wrapper.h b/platform/android/java_class_wrapper.h deleted file mode 100644 index 8075b297b0..0000000000 --- a/platform/android/java_class_wrapper.h +++ /dev/null @@ -1,228 +0,0 @@ -/*************************************************************************/ -/* java_class_wrapper.h */ -/*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/*************************************************************************/ -/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ -/* */ -/* Permission is hereby granted, free of charge, to any person obtaining */ -/* a copy of this software and associated documentation files (the */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/*************************************************************************/ - -#ifndef JAVA_CLASS_WRAPPER_H -#define JAVA_CLASS_WRAPPER_H - -#include "core/reference.h" -#include <android/log.h> -#include <jni.h> - -class JavaObject; - -class JavaClass : public Reference { - - GDCLASS(JavaClass, Reference); - - enum ArgumentType { - - ARG_TYPE_VOID, - ARG_TYPE_BOOLEAN, - ARG_TYPE_BYTE, - ARG_TYPE_CHAR, - ARG_TYPE_SHORT, - ARG_TYPE_INT, - ARG_TYPE_LONG, - ARG_TYPE_FLOAT, - 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 - }; - - Map<StringName, Variant> constant_map; - - struct MethodInfo { - - bool _static; - Vector<uint32_t> param_types; - 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 &likelihood) { - - likelihood = 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; - likelihood = 0.1; - break; - case ARG_TYPE_CHAR | ARG_NUMBER_CLASS_BIT: - case ARG_TYPE_CHAR: - r_type = Variant::INT; - likelihood = 0.2; - break; - case ARG_TYPE_SHORT | ARG_NUMBER_CLASS_BIT: - case ARG_TYPE_SHORT: - r_type = Variant::INT; - likelihood = 0.3; - break; - case ARG_TYPE_INT | ARG_NUMBER_CLASS_BIT: - case ARG_TYPE_INT: - r_type = Variant::INT; - likelihood = 1.0; - break; - case ARG_TYPE_LONG | ARG_NUMBER_CLASS_BIT: - case ARG_TYPE_LONG: - r_type = Variant::INT; - likelihood = 0.5; - break; - case ARG_TYPE_FLOAT | ARG_NUMBER_CLASS_BIT: - case ARG_TYPE_FLOAT: - r_type = Variant::REAL; - likelihood = 1.0; - break; - case ARG_TYPE_DOUBLE | ARG_NUMBER_CLASS_BIT: - case ARG_TYPE_DOUBLE: - r_type = Variant::REAL; - likelihood = 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; - likelihood = 1.0; - break; - case ARG_ARRAY_BIT | ARG_TYPE_CHAR: - r_type = Variant::POOL_BYTE_ARRAY; - likelihood = 0.5; - break; - case ARG_ARRAY_BIT | ARG_TYPE_SHORT: - r_type = Variant::POOL_INT_ARRAY; - likelihood = 0.3; - break; - case ARG_ARRAY_BIT | ARG_TYPE_INT: - r_type = Variant::POOL_INT_ARRAY; - likelihood = 1.0; - break; - case ARG_ARRAY_BIT | ARG_TYPE_LONG: - r_type = Variant::POOL_INT_ARRAY; - likelihood = 0.5; - break; - case ARG_ARRAY_BIT | ARG_TYPE_FLOAT: - r_type = Variant::POOL_REAL_ARRAY; - likelihood = 1.0; - break; - case ARG_ARRAY_BIT | ARG_TYPE_DOUBLE: - r_type = Variant::POOL_REAL_ARRAY; - likelihood = 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); - - 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; - jclass _class; - -public: - 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); - - Ref<JavaClass> base_class; - friend class JavaClass; - - jobject instance; - -public: - 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(); -}; - -class JavaClassWrapper : public Object { - - GDCLASS(JavaClassWrapper, Object); - - Map<String, Ref<JavaClass> > class_cache; - friend class JavaClass; - jclass activityClass; - jmethodID findClass; - jmethodID getDeclaredMethods; - jmethodID getFields; - jmethodID getParameterTypes; - jmethodID getReturnType; - jmethodID getModifiers; - jmethodID getName; - jmethodID Class_getName; - jmethodID Field_getName; - jmethodID Field_getModifiers; - jmethodID Field_get; - jmethodID Boolean_booleanValue; - jmethodID Byte_byteValue; - jmethodID Character_characterValue; - jmethodID Short_shortValue; - jmethodID Integer_integerValue; - jmethodID Long_longValue; - jmethodID Float_floatValue; - jmethodID Double_doubleValue; - jobject classLoader; - - bool _get_type_sig(JNIEnv *env, jobject obj, uint32_t &sig, String &strsig); - - static JavaClassWrapper *singleton; - -protected: - static void _bind_methods(); - -public: - static JavaClassWrapper *get_singleton() { return singleton; } - - Ref<JavaClass> wrap(const String &p_class); - - JavaClassWrapper(jobject p_activity = NULL); -}; - -#endif // JAVA_CLASS_WRAPPER_H |