godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge 59ab3f67d3 into 15ff450680

This commit is contained in:
Artsiom Babukh 2025-02-28 14:44:33 +01:00 committed by GitHub
parent 15ff450680 59ab3f67d3
commit bd22a14846
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/extension/gdextension.cpp
View File

@ -181,7 +181,7 @@ public:
List<PropertyInfo>::ConstIterator itr = arguments_info.begin(); List<PropertyInfo>::ConstIterator itr = arguments_info.begin();
for (uint32_t i = 0; i < p_method_info->argument_count; ++itr, ++i) { for (uint32_t i = 0; i < p_method_info->argument_count; ++itr, ++i) {
if (itr->type != (Variant::Type)p_method_info->arguments_info[i].type) { if (itr->type != (Variant::Type)p_method_info->arguments[i].type) {
return false; return false;
} }
} }
@ -209,7 +209,7 @@ public:
arguments_info.clear(); arguments_info.clear();
arguments_metadata.clear(); arguments_metadata.clear();
for (uint32_t i = 0; i < p_method_info->argument_count; i++) { for (uint32_t i = 0; i < p_method_info->argument_count; i++) {
arguments_info.push_back(PropertyInfo(p_method_info->arguments_info[i])); arguments_info.push_back(PropertyInfo(p_method_info->arguments[i]));
arguments_metadata.push_back(GodotTypeInfo::Metadata(p_method_info->arguments_metadata[i])); arguments_metadata.push_back(GodotTypeInfo::Metadata(p_method_info->arguments_metadata[i]));
} }

8
core/extension/gdextension_interface.h
View File

@ -442,19 +442,17 @@ typedef struct {
/* If `has_return_value` is false, `return_value_info` and `return_value_metadata` are ignored. /* If `has_return_value` is false, `return_value_info` and `return_value_metadata` are ignored.
* *
* @todo Consider dropping `has_return_value` and making the other two properties match `GDExtensionMethodInfo` and `GDExtensionClassVirtualMethod` for consistency in future version of this struct. * @todo Consider dropping `has_return_value` and making the other two properties match `GDExtensionMethodInfo` and `GDExtensionClassVirtualMethodInfo` for consistency in future version of this struct.
*/ */
GDExtensionBool has_return_value; GDExtensionBool has_return_value;
GDExtensionPropertyInfo *return_value_info; GDExtensionPropertyInfo *return_value_info;
GDExtensionClassMethodArgumentMetadata return_value_metadata; GDExtensionClassMethodArgumentMetadata return_value_metadata;
/* Arguments: `arguments_info` and `arguments_metadata` are array of size `argument_count`. /* Arguments: `arguments` and `arguments_metadata` are array of size `argument_count`.
* Name and hint information for the argument can be omitted in release builds. Class name should always be present if it applies. * Name and hint information for the argument can be omitted in release builds. Class name should always be present if it applies.
*
* @todo Consider renaming `arguments_info` to `arguments` for consistency in future version of this struct.
*/ */
uint32_t argument_count; uint32_t argument_count;
GDExtensionPropertyInfo *arguments_info; GDExtensionPropertyInfo *arguments;
GDExtensionClassMethodArgumentMetadata *arguments_metadata; GDExtensionClassMethodArgumentMetadata *arguments_metadata;
/* Default arguments: `default_arguments` is an array of size `default_argument_count`. */ /* Default arguments: `default_arguments` is an array of size `default_argument_count`. */