godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #94953 from raulsntos/dotnet/signals-with-typed-arrays 

C#: Generate signal delegates with typed arrays
This commit is contained in:
Rémi Verschelde 2024-09-23 12:27:45 +02:00
parent 510bc3dc6a f3841d644e
commit c65ab71230
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/mono/editor/bindings_generator.cpp
View File

@ -2934,11 +2934,6 @@ Error BindingsGenerator::_generate_cs_method(const BindingsGenerator::TypeInterf
Error BindingsGenerator::_generate_cs_signal(const BindingsGenerator::TypeInterface &p_itype, const BindingsGenerator::SignalInterface &p_isignal, StringBuilder &p_output) { Error BindingsGenerator::_generate_cs_signal(const BindingsGenerator::TypeInterface &p_itype, const BindingsGenerator::SignalInterface &p_isignal, StringBuilder &p_output) {
String arguments_sig; String arguments_sig;
String delegate_type_params;
if (!p_isignal.arguments.is_empty()) {
delegate_type_params += "<";
}
// Retrieve information from the arguments // Retrieve information from the arguments
const ArgumentInterface &first = p_isignal.arguments.front()->get(); const ArgumentInterface &first = p_isignal.arguments.front()->get();
@ -2959,18 +2954,13 @@ Error BindingsGenerator::_generate_cs_signal(const BindingsGenerator::TypeInterf
if (&iarg != &first) { if (&iarg != &first) {
arguments_sig += ", "; arguments_sig += ", ";
delegate_type_params += ", ";
} }
arguments_sig += arg_type->cs_type; String arg_cs_type = arg_type->cs_type + _get_generic_type_parameters(*arg_type, iarg.type.generic_type_parameters);
arguments_sig += arg_cs_type;
arguments_sig += " "; arguments_sig += " ";
arguments_sig += iarg.name; arguments_sig += iarg.name;
delegate_type_params += arg_type->cs_type;
}
if (!p_isignal.arguments.is_empty()) {
delegate_type_params += ">";
} }
// Generate signal // Generate signal
@ -3019,8 +3009,14 @@ Error BindingsGenerator::_generate_cs_signal(const BindingsGenerator::TypeInterf
p_output << ", "; p_output << ", ";
} }
p_output << sformat(arg_type->cs_variant_to_managed, if (arg_type->cname == name_cache.type_Array_generic || arg_type->cname == name_cache.type_Dictionary_generic) {
"args[" + itos(idx) + "]", arg_type->cs_type, arg_type->name); String arg_cs_type = arg_type->cs_type + _get_generic_type_parameters(*arg_type, iarg.type.generic_type_parameters);
p_output << "new " << arg_cs_type << "(" << sformat(arg_type->cs_variant_to_managed, "args[" + itos(idx) + "]", arg_type->cs_type, arg_type->name) << ")";
} else {
p_output << sformat(arg_type->cs_variant_to_managed,
"args[" + itos(idx) + "]", arg_type->cs_type, arg_type->name);
}
idx++; idx++;
} }