Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Misc improvements to the GodotPlugin API

Browse source 
- Add overload method for `GodotPlugin#emitSignal(...)`
- Allow passing `null` values as signal arguments
This commit is contained in:
Fredia Huya-Kouadio 2025-10-01 13:26:41 -07:00 • committed by Fredia Huya-Kouadio
parent caefb0f1c1
commit b9c3b1d4c0
6 changed files with 44 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

5
platform/android/api/java_class_wrapper.h
View file

@ -68,6 +68,7 @@ class JavaClass : public RefCounted {
RBMap<StringName, Variant> constant_map;
struct MethodInfo {
bool _public = false;
bool _static = false;
bool _constructor = false;
Vector<uint32_t> param_types;
@ -274,7 +275,7 @@ class JavaClassWrapper : public Object {
Ref<JavaObject> exception;
Ref<JavaClass> _wrap(const String &p_class, bool p_allow_non_public_methods_access);
Ref<JavaClass> _wrap(const String &p_class, bool p_allow_non_public_methods_access = false);
static JavaClassWrapper *singleton;
@ -293,7 +294,7 @@ public:
}
#ifdef ANDROID_ENABLED
Ref<JavaClass> wrap_jclass(jclass p_class, bool p_allow_private_methods_access = false);
Ref<JavaClass> wrap_jclass(jclass p_class, bool p_allow_non_public_methods_access = false);
#endif
JavaClassWrapper();
};

28
platform/android/api/jni_singleton.h
View file

@ -60,31 +60,15 @@ public:
}
// Check the method we're looking for is in the JNISingleton map.
// This is done because JNISingletons register methods differently than wrapped JavaClass / JavaObject to allow
// for access to private methods annotated with the @UsedByGodot annotation.
// In the future, we should remove access to private methods and require that JNISingletons' methods exposed to
// GDScript be all public, similarly to what we do for wrapped JavaClass / JavaObject methods. Doing so will
// also allow dropping and deprecating the @UsedByGodot annotation.
RBMap<StringName, MethodData>::Element *E = method_map.find(p_method);
if (E) {
if (wrapped_object.is_valid()) {
// Check that the arguments match.
int method_arg_count = E->get().argtypes.size();
if (p_argcount < method_arg_count) {
r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
} else if (p_argcount > method_arg_count) {
r_error.error = Callable::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS;
} else {
// Check the arguments are valid.
bool arguments_valid = true;
for (int i = 0; i < p_argcount; i++) {
if (!Variant::can_convert(p_args[i]->get_type(), E->get().argtypes[i])) {
arguments_valid = false;
break;
}
}
if (arguments_valid) {
return wrapped_object->callp(p_method, p_args, p_argcount, r_error);
} else {
r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
}
}
return wrapped_object->callp(p_method, p_args, p_argcount, r_error);
} else {
r_error.error = Callable::CallError::CALL_ERROR_INSTANCE_IS_NULL;
}