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

Merge pull request #51910 from neikeq/csharp-callable-defval 

C#: Fix bindings generator for Callable argument default value
This commit is contained in:
Rémi Verschelde 2021-08-20 12:23:30 +02:00 committed by GitHub
parent 0168699d7a d2c3a86844
commit dc6ed31675
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3130,8 +3130,18 @@ bool BindingsGenerator::_arg_default_value_from_variant(const Variant &p_val, Ar
r_iarg.def_param_mode = ArgumentInterface::NULLABLE_VAL; r_iarg.def_param_mode = ArgumentInterface::NULLABLE_VAL;
} break; } break;
case Variant::CALLABLE: case Variant::CALLABLE:
ERR_FAIL_COND_V_MSG(r_iarg.type.cname != name_cache.type_Callable, false,
"Parameter of type '" + String(r_iarg.type.cname) + "' cannot have a default value of type '" + String(name_cache.type_Callable) + "'.");
ERR_FAIL_COND_V_MSG(!p_val.is_zero(), false,
"Parameter of type '" + String(r_iarg.type.cname) + "' can only have null/zero as the default value.");
r_iarg.default_argument = "default";
break;
case Variant::SIGNAL: case Variant::SIGNAL:
CRASH_NOW_MSG("Parameter of type '" + String(r_iarg.type.cname) + "' cannot have a default value."); ERR_FAIL_COND_V_MSG(r_iarg.type.cname != name_cache.type_Signal, false,
"Parameter of type '" + String(r_iarg.type.cname) + "' cannot have a default value of type '" + String(name_cache.type_Signal) + "'.");
ERR_FAIL_COND_V_MSG(!p_val.is_zero(), false,
"Parameter of type '" + String(r_iarg.type.cname) + "' can only have null/zero as the default value.");
r_iarg.default_argument = "default";
break; break;
default: default:
CRASH_NOW_MSG("Unexpected Variant type: " + itos(p_val.get_type())); CRASH_NOW_MSG("Unexpected Variant type: " + itos(p_val.get_type()));

2
modules/mono/editor/bindings_generator.h
View File

@ -536,6 +536,8 @@ class BindingsGenerator {
StringName type_Object = StaticCString::create("Object"); StringName type_Object = StaticCString::create("Object");
StringName type_RefCounted = StaticCString::create("RefCounted"); StringName type_RefCounted = StaticCString::create("RefCounted");
StringName type_RID = StaticCString::create("RID"); StringName type_RID = StaticCString::create("RID");
StringName type_Callable = StaticCString::create("Callable");
StringName type_Signal = StaticCString::create("Signal");
StringName type_String = StaticCString::create("String"); StringName type_String = StaticCString::create("String");
StringName type_StringName = StaticCString::create("StringName"); StringName type_StringName = StaticCString::create("StringName");
StringName type_NodePath = StaticCString::create("NodePath"); StringName type_NodePath = StaticCString::create("NodePath");

8
modules/mono/mono_gd/gd_mono_marshal.cpp
View File

@ -1686,7 +1686,9 @@ Callable managed_to_callable(const M_Callable &p_managed_callable) {
Object *target = p_managed_callable.target ? Object *target = p_managed_callable.target ?
unbox<Object *>(CACHED_FIELD(GodotObject, ptr)->get_value(p_managed_callable.target)) : unbox<Object *>(CACHED_FIELD(GodotObject, ptr)->get_value(p_managed_callable.target)) :
nullptr; nullptr;
StringName *method_ptr = unbox<StringName *>(CACHED_FIELD(StringName, ptr)->get_value(p_managed_callable.method_string_name)); StringName *method_ptr = p_managed_callable.method_string_name ?
unbox<StringName *>(CACHED_FIELD(StringName, ptr)->get_value(p_managed_callable.method_string_name)) :
nullptr;
StringName method = method_ptr ? *method_ptr : StringName(); StringName method = method_ptr ? *method_ptr : StringName();
return Callable(target, method); return Callable(target, method);
} }
@ -1732,7 +1734,9 @@ Signal managed_to_signal_info(const M_SignalInfo &p_managed_signal) {
Object *owner = p_managed_signal.owner ? Object *owner = p_managed_signal.owner ?
unbox<Object *>(CACHED_FIELD(GodotObject, ptr)->get_value(p_managed_signal.owner)) : unbox<Object *>(CACHED_FIELD(GodotObject, ptr)->get_value(p_managed_signal.owner)) :
nullptr; nullptr;
StringName *name_ptr = unbox<StringName *>(CACHED_FIELD(StringName, ptr)->get_value(p_managed_signal.name_string_name)); StringName *name_ptr = p_managed_signal.name_string_name ?
unbox<StringName *>(CACHED_FIELD(StringName, ptr)->get_value(p_managed_signal.name_string_name)) :
nullptr;
StringName name = name_ptr ? *name_ptr : StringName(); StringName name = name_ptr ? *name_ptr : StringName();
return Signal(owner, name); return Signal(owner, name);
} }