Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-09-20 14:32:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add extension support for argument count to ScriptInstance

Browse Source
This commit is contained in:
A Thousand Ships 2024-01-30 12:00:36 +01:00
parent da945ce626
commit 0c19d0f5a0
No known key found for this signature in database
GPG Key ID: 2033189A662F8BD7
4 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/extension/gdextension_interface.cpp
View File

@ -1302,6 +1302,7 @@ static GDExtensionScriptInstancePtr gdextension_script_instance_create(const GDE
info_3->get_property_type_func = p_info->get_property_type_func; info_3->get_property_type_func = p_info->get_property_type_func;
info_3->validate_property_func = nullptr; info_3->validate_property_func = nullptr;
info_3->has_method_func = p_info->has_method_func; info_3->has_method_func = p_info->has_method_func;
info_3->get_method_argument_count_func = nullptr;
info_3->call_func = p_info->call_func; info_3->call_func = p_info->call_func;
info_3->notification_func = nullptr; info_3->notification_func = nullptr;
info_3->to_string_func = p_info->to_string_func; info_3->to_string_func = p_info->to_string_func;
@ -1341,6 +1342,7 @@ static GDExtensionScriptInstancePtr gdextension_script_instance_create2(const GD
info_3->get_property_type_func = p_info->get_property_type_func; info_3->get_property_type_func = p_info->get_property_type_func;
info_3->validate_property_func = nullptr; info_3->validate_property_func = nullptr;
info_3->has_method_func = p_info->has_method_func; info_3->has_method_func = p_info->has_method_func;
info_3->get_method_argument_count_func = nullptr;
info_3->call_func = p_info->call_func; info_3->call_func = p_info->call_func;
info_3->notification_func = p_info->notification_func; info_3->notification_func = p_info->notification_func;
info_3->to_string_func = p_info->to_string_func; info_3->to_string_func = p_info->to_string_func;

4
core/extension/gdextension_interface.h
View File

@ -535,6 +535,8 @@ typedef void (*GDExtensionScriptInstanceFreeMethodList2)(GDExtensionScriptInstan
typedef GDExtensionBool (*GDExtensionScriptInstanceHasMethod)(GDExtensionScriptInstanceDataPtr p_instance, GDExtensionConstStringNamePtr p_name); typedef GDExtensionBool (*GDExtensionScriptInstanceHasMethod)(GDExtensionScriptInstanceDataPtr p_instance, GDExtensionConstStringNamePtr p_name);
typedef GDExtensionInt (*GDExtensionScriptInstanceGetMethodArgumentCount)(GDExtensionScriptInstanceDataPtr p_instance, GDExtensionConstStringNamePtr p_name, GDExtensionBool *r_is_valid);
typedef void (*GDExtensionScriptInstanceCall)(GDExtensionScriptInstanceDataPtr p_self, GDExtensionConstStringNamePtr p_method, const GDExtensionConstVariantPtr *p_args, GDExtensionInt p_argument_count, GDExtensionVariantPtr r_return, GDExtensionCallError *r_error); typedef void (*GDExtensionScriptInstanceCall)(GDExtensionScriptInstanceDataPtr p_self, GDExtensionConstStringNamePtr p_method, const GDExtensionConstVariantPtr *p_args, GDExtensionInt p_argument_count, GDExtensionVariantPtr r_return, GDExtensionCallError *r_error);
typedef void (*GDExtensionScriptInstanceNotification)(GDExtensionScriptInstanceDataPtr p_instance, int32_t p_what); // Deprecated. Use GDExtensionScriptInstanceNotification2 instead. typedef void (*GDExtensionScriptInstanceNotification)(GDExtensionScriptInstanceDataPtr p_instance, int32_t p_what); // Deprecated. Use GDExtensionScriptInstanceNotification2 instead.
typedef void (*GDExtensionScriptInstanceNotification2)(GDExtensionScriptInstanceDataPtr p_instance, int32_t p_what, GDExtensionBool p_reversed); typedef void (*GDExtensionScriptInstanceNotification2)(GDExtensionScriptInstanceDataPtr p_instance, int32_t p_what, GDExtensionBool p_reversed);
@ -654,6 +656,8 @@ typedef struct {
GDExtensionScriptInstanceHasMethod has_method_func; GDExtensionScriptInstanceHasMethod has_method_func;
GDExtensionScriptInstanceGetMethodArgumentCount get_method_argument_count_func;
GDExtensionScriptInstanceCall call_func; GDExtensionScriptInstanceCall call_func;
GDExtensionScriptInstanceNotification2 notification_func; GDExtensionScriptInstanceNotification2 notification_func;

9
core/object/script_language_extension.h
View File

@ -821,6 +821,14 @@ public:
} }
virtual int get_method_argument_count(const StringName &p_method, bool *r_is_valid = nullptr) const override { virtual int get_method_argument_count(const StringName &p_method, bool *r_is_valid = nullptr) const override {
if (native_info->get_method_argument_count_func) {
GDExtensionBool is_valid = 0;
GDExtensionInt ret = native_info->get_method_argument_count_func(instance, (GDExtensionStringNamePtr)&p_method, &is_valid);
if (r_is_valid) {
*r_is_valid = is_valid != 0;
}
return ret;
}
// Fallback to default. // Fallback to default.
return ScriptInstance::get_method_argument_count(p_method, r_is_valid); return ScriptInstance::get_method_argument_count(p_method, r_is_valid);
} }
@ -912,7 +920,6 @@ public:
return reinterpret_cast<ScriptLanguage *>(lang); return reinterpret_cast<ScriptLanguage *>(lang);
} }
return nullptr; return nullptr;
;
} }
virtual ~ScriptInstanceExtension() { virtual ~ScriptInstanceExtension() {
if (native_info->free_func) { if (native_info->free_func) {

1
doc/classes/ScriptExtension.xml
View File

@ -84,6 +84,7 @@
<return type="Variant" /> <return type="Variant" />
<param index="0" name="method" type="StringName" /> <param index="0" name="method" type="StringName" />
<description> <description>
Return the expected argument count for the given [param method], or [code]null[/code] if it can't be determined (which will then fall back to the default behavior).
</description> </description>
</method> </method>
<method name="_get_script_method_list" qualifiers="virtual const"> <method name="_get_script_method_list" qualifiers="virtual const">