diff options
| author | Raul Santos <raulsntos@gmail.com> | 2021-10-08 10:43:36 +0200 |
|---|---|---|
| committer | Raul Santos <raulsntos@gmail.com> | 2021-10-08 18:50:21 +0200 |
| commit | 1f62d309d8fca013d5fd5f280060f2fbcdc9aef5 (patch) | |
| tree | 225b81b8f5f18eb1eacc1775fc4bc1161f2a1858 | |
| parent | 9b34442d93298c9e15f2068e2ba955c411aeb3af (diff) | |
Support arrays of StringName, NodePath and RID in mono
| -rw-r--r-- | modules/mono/mono_gd/gd_mono_marshal.cpp | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/modules/mono/mono_gd/gd_mono_marshal.cpp b/modules/mono/mono_gd/gd_mono_marshal.cpp index c9789bf270..11a31217d7 100644 --- a/modules/mono/mono_gd/gd_mono_marshal.cpp +++ b/modules/mono/mono_gd/gd_mono_marshal.cpp @@ -181,6 +181,18 @@ Variant::Type managed_to_variant_type(const ManagedType &p_type, bool *r_nil_is_ return Variant::PACKED_COLOR_ARRAY; } + if (array_type->eklass == CACHED_CLASS_RAW(StringName)) { + return Variant::ARRAY; + } + + if (array_type->eklass == CACHED_CLASS_RAW(NodePath)) { + return Variant::ARRAY; + } + + if (array_type->eklass == CACHED_CLASS_RAW(RID)) { + return Variant::ARRAY; + } + GDMonoClass *array_type_class = GDMono::get_singleton()->get_class(array_type->eklass); if (CACHED_CLASS(GodotObject)->is_assignable_from(array_type_class)) { return Variant::ARRAY; @@ -361,6 +373,18 @@ MonoArray *variant_to_mono_array(const Variant &p_var, GDMonoClass *p_type_class return PackedColorArray_to_mono_array(p_var.operator PackedColorArray()); } + if (array_type->eklass == CACHED_CLASS_RAW(StringName)) { + return Array_to_mono_array(p_var.operator Array()); + } + + if (array_type->eklass == CACHED_CLASS_RAW(NodePath)) { + return Array_to_mono_array(p_var.operator Array()); + } + + if (array_type->eklass == CACHED_CLASS_RAW(RID)) { + return Array_to_mono_array(p_var.operator Array()); + } + if (mono_class_is_assignable_from(CACHED_CLASS(GodotObject)->get_mono_ptr(), array_type->eklass)) { return Array_to_mono_array(p_var.operator ::Array(), array_type->eklass); } @@ -1118,6 +1142,18 @@ Variant mono_object_to_variant_impl(MonoObject *p_obj, const ManagedType &p_type return mono_array_to_PackedColorArray((MonoArray *)p_obj); } + if (array_type->eklass == CACHED_CLASS_RAW(StringName)) { + return mono_array_to_Array((MonoArray *)p_obj); + } + + if (array_type->eklass == CACHED_CLASS_RAW(NodePath)) { + return mono_array_to_Array((MonoArray *)p_obj); + } + + if (array_type->eklass == CACHED_CLASS_RAW(RID)) { + return mono_array_to_Array((MonoArray *)p_obj); + } + GDMonoClass *array_type_class = GDMono::get_singleton()->get_class(array_type->eklass); if (CACHED_CLASS(GodotObject)->is_assignable_from(array_type_class)) { return mono_array_to_Array((MonoArray *)p_obj); |