Add support to Unity..Mathematics.int2

Fixes MessagePack-CSharp#1603
KonH · Oct 13, 2023 · 923d788 · 923d788
1 parent 7dcea24
commit 923d788
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 0 deletions.
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Unity/Formatters.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Unity/Formatters.cs
@@ -12,6 +12,47 @@
 
 namespace MessagePack.Unity
 {
+    public sealed class Int2Formatter : global::MessagePack.Formatters.IMessagePackFormatter<global::Unity.Mathematics.int2>
+    {
+        public void Serialize(ref MessagePackWriter writer, global::Unity.Mathematics.int2 value, global::MessagePack.MessagePackSerializerOptions options)
+        {
+            writer.WriteArrayHeader(2);
+            writer.Write(value.x);
+            writer.Write(value.y);
+        }
+
+        public global::Unity.Mathematics.int2 Deserialize(ref MessagePackReader reader, global::MessagePack.MessagePackSerializerOptions options)
+        {
+            if (reader.IsNil)
+            {
+                throw new InvalidOperationException("typecode is null, struct not supported");
+            }
+
+            var length = reader.ReadArrayHeader();
+            var x = default(int);
+            var y = default(int);
+            for (int i = 0; i < length; i++)
+            {
+                var key = i;
+                switch (key)
+                {
+                    case 0:
+                        x = reader.ReadInt32();
+                        break;
+                    case 1:
+                        y = reader.ReadInt32();
+                        break;
+                    default:
+                        reader.Skip();
+                        break;
+                }
+            }
+
+            var result = new global::Unity.Mathematics.int2(x, y);
+            return result;
+        }
+    }
+
     public sealed class Vector2Formatter : global::MessagePack.Formatters.IMessagePackFormatter<global::UnityEngine.Vector2>
     {
         public void Serialize(ref MessagePackWriter writer, global::UnityEngine.Vector2 value, global::MessagePack.MessagePackSerializerOptions options)

diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Unity/UnityResolver.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Unity/UnityResolver.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using MessagePack.Formatters;
+using Unity.Mathematics;
 using UnityEngine;
 
 namespace MessagePack.Unity
@@ -186,6 +187,9 @@ internal static class UnityResolveryResolverGetFormatterHelper
             {typeof(List<BoundsInt?>),       new ListFormatter<BoundsInt?>()},
 
 #endif
+
+            // Unity Mathematics
+            { typeof(int2), new Int2Formatter() },
         };
 
         internal static object? GetFormatter(Type t)

diff --git a/src/MessagePack.UnityShims/Shims.cs b/src/MessagePack.UnityShims/Shims.cs
@@ -514,3 +514,22 @@ public BoundsInt(Vector3Int position, Vector3Int size)
         }
     }
 }
+
+namespace Unity.Mathematics
+{
+    [MessagePackObject]
+    public struct int2
+    {
+        [Key(0)]
+        public int x;
+        [Key(1)]
+        public int y;
+
+        [SerializationConstructor]
+        public int2(int x, int y)
+        {
+            this.x = x;
+            this.y = y;
+        }
+    }
+}