Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix hint_string for C# enum arrays #53637

Merged
merged 1 commit into from
Oct 15, 2021
Merged

Fix hint_string for C# enum arrays #53637

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 21 additions & 18 deletions modules/mono/mono_gd/gd_mono_marshal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,61 +139,65 @@ Variant::Type managed_to_variant_type(const ManagedType &p_type, bool *r_nil_is_

case MONO_TYPE_ARRAY:
case MONO_TYPE_SZARRAY: {
MonoArrayType *array_type = mono_type_get_array_type(p_type.type_class->get_mono_type());
MonoClass *elem_class = mono_class_get_element_class(p_type.type_class->get_mono_ptr());

if (array_type->eklass == CACHED_CLASS_RAW(MonoObject)) {
if (elem_class == CACHED_CLASS_RAW(MonoObject)) {
return Variant::ARRAY;
}

if (array_type->eklass == CACHED_CLASS_RAW(uint8_t)) {
if (elem_class == CACHED_CLASS_RAW(uint8_t)) {
return Variant::PACKED_BYTE_ARRAY;
}

if (array_type->eklass == CACHED_CLASS_RAW(int32_t)) {
if (elem_class == CACHED_CLASS_RAW(int32_t)) {
return Variant::PACKED_INT32_ARRAY;
}

if (array_type->eklass == CACHED_CLASS_RAW(int64_t)) {
if (elem_class == CACHED_CLASS_RAW(int64_t)) {
return Variant::PACKED_INT64_ARRAY;
}

if (array_type->eklass == CACHED_CLASS_RAW(float)) {
if (elem_class == CACHED_CLASS_RAW(float)) {
return Variant::PACKED_FLOAT32_ARRAY;
}

if (array_type->eklass == CACHED_CLASS_RAW(double)) {
if (elem_class == CACHED_CLASS_RAW(double)) {
return Variant::PACKED_FLOAT64_ARRAY;
}

if (array_type->eklass == CACHED_CLASS_RAW(String)) {
if (elem_class == CACHED_CLASS_RAW(String)) {
return Variant::PACKED_STRING_ARRAY;
}

if (array_type->eklass == CACHED_CLASS_RAW(Vector2)) {
if (elem_class == CACHED_CLASS_RAW(Vector2)) {
return Variant::PACKED_VECTOR2_ARRAY;
}

if (array_type->eklass == CACHED_CLASS_RAW(Vector3)) {
if (elem_class == CACHED_CLASS_RAW(Vector3)) {
return Variant::PACKED_VECTOR3_ARRAY;
}

if (array_type->eklass == CACHED_CLASS_RAW(Color)) {
if (elem_class == CACHED_CLASS_RAW(Color)) {
return Variant::PACKED_COLOR_ARRAY;
}

if (array_type->eklass == CACHED_CLASS_RAW(StringName)) {
if (elem_class == CACHED_CLASS_RAW(StringName)) {
return Variant::ARRAY;
}

if (array_type->eklass == CACHED_CLASS_RAW(NodePath)) {
if (elem_class == CACHED_CLASS_RAW(NodePath)) {
return Variant::ARRAY;
}

if (array_type->eklass == CACHED_CLASS_RAW(RID)) {
if (elem_class == CACHED_CLASS_RAW(RID)) {
return Variant::ARRAY;
}

GDMonoClass *array_type_class = GDMono::get_singleton()->get_class(array_type->eklass);
if (mono_class_is_enum(elem_class)) {
return Variant::ARRAY;
}

GDMonoClass *array_type_class = GDMono::get_singleton()->get_class(elem_class);
if (CACHED_CLASS(GodotObject)->is_assignable_from(array_type_class)) {
return Variant::ARRAY;
}
Expand Down Expand Up @@ -302,9 +306,8 @@ bool try_get_array_element_type(const ManagedType &p_array_type, ManagedType &r_
switch (p_array_type.type_encoding) {
case MONO_TYPE_ARRAY:
case MONO_TYPE_SZARRAY: {
MonoArrayType *array_type = mono_type_get_array_type(p_array_type.type_class->get_mono_type());
GDMonoClass *array_type_class = GDMono::get_singleton()->get_class(array_type->eklass);
r_elem_type = ManagedType::from_class(array_type_class);
MonoClass *elem_class = mono_class_get_element_class(p_array_type.type_class->get_mono_ptr());
r_elem_type = ManagedType::from_class(elem_class);
return true;
} break;
case MONO_TYPE_GENERICINST: {
Expand Down