Merge pull request godotengine#65905 from raulsntos/dotnet/marshaling…

…-collections C#: Fix marshaling generic Godot collections
kstanki2 · Nov 30, 2022 · 5826e96 · 5826e96
2 parents d75a6b5 + 7535803
commit 5826e96
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Array.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Array.cs
@@ -474,6 +474,11 @@ internal unsafe void GetVariantBorrowElementAtUnchecked(int index, out godot_var
         }
     }
 
+    internal interface IGenericGodotArray
+    {
+        public Array UnderlyingArray { get; }
+    }
+
     /// <summary>
     /// Typed wrapper around Godot's Array class, an array of Variant
     /// typed elements allocated in the engine in C++. Useful when
@@ -487,7 +492,8 @@ public sealed class Array<[MustBeVariant] T> :
         IList<T>,
         IReadOnlyList<T>,
         ICollection<T>,
-        IEnumerable<T>
+        IEnumerable<T>,
+        IGenericGodotArray
     {
         private static godot_variant ToVariantFunc(in Array<T> godotArray) =>
             VariantUtils.CreateFromArray(godotArray);
@@ -503,6 +509,8 @@ static unsafe Array()
 
         private readonly Array _underlyingArray;
 
+        Array IGenericGodotArray.UnderlyingArray => _underlyingArray;
+
         internal ref godot_array.movable NativeValue
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]

diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Dictionary.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Dictionary.cs
@@ -344,6 +344,11 @@ public override string ToString()
         }
     }
 
+    internal interface IGenericGodotDictionary
+    {
+        public Dictionary UnderlyingDictionary { get; }
+    }
+
     /// <summary>
     /// Typed wrapper around Godot's Dictionary class, a dictionary of Variant
     /// typed elements allocated in the engine in C++. Useful when
@@ -354,7 +359,8 @@ public override string ToString()
     /// <typeparam name="TValue">The type of the dictionary's values.</typeparam>
     public class Dictionary<[MustBeVariant] TKey, [MustBeVariant] TValue> :
         IDictionary<TKey, TValue>,
-        IReadOnlyDictionary<TKey, TValue>
+        IReadOnlyDictionary<TKey, TValue>,
+        IGenericGodotDictionary
     {
         private static godot_variant ToVariantFunc(in Dictionary<TKey, TValue> godotDictionary) =>
             VariantUtils.CreateFromDictionary(godotDictionary);
@@ -370,6 +376,8 @@ static unsafe Dictionary()
 
         private readonly Dictionary _underlyingDict;
 
+        Dictionary IGenericGodotDictionary.UnderlyingDictionary => _underlyingDict;
+
         internal ref godot_dictionary.movable NativeValue
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]

diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/NativeInterop/Marshaling.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/NativeInterop/Marshaling.cs
@@ -293,6 +293,10 @@ public static godot_variant ConvertManagedObjectToVariant(object? p_obj)
                     return VariantUtils.CreateFromDictionary(godotDictionary);
                 case Collections.Array godotArray:
                     return VariantUtils.CreateFromArray(godotArray);
+                case Collections.IGenericGodotDictionary godotDictionary:
+                    return VariantUtils.CreateFromDictionary(godotDictionary.UnderlyingDictionary);
+                case Collections.IGenericGodotArray godotArray:
+                    return VariantUtils.CreateFromArray(godotArray.UnderlyingArray);
                 case Variant variant:
                     return NativeFuncs.godotsharp_variant_new_copy((godot_variant)variant.NativeVar);
             }