refactor: move serialization into Mirage.Serialization (#700)

Move reader and writer to a Mirage.Serialization namespace

BREAKING CHANGE: NetworkReader and NetworkWriter moved to Mirage.Serialization namespace

Assets/Mirage/Components/NetworkAnimator.cs

@@ -2,6 +2,7 @@
 using UnityEngine;
 using UnityEngine.Serialization;
 using Mirage.Logging;
+using Mirage.Serialization;
 
 namespace Mirage
 {

Assets/Mirage/Components/NetworkTransformBase.cs

@@ -17,6 +17,7 @@
 //   interpolation. interpolation over time is never that good.
 //
 using UnityEngine;
+using Mirage.Serialization;
 
 namespace Mirage
 {

Assets/Mirage/Runtime/ClientObjectManager.cs

@@ -6,6 +6,7 @@
 using UnityEngine;
 using UnityEngine.Serialization;
 using Mirage.Logging;
+using Mirage.Serialization;
 
 namespace Mirage
 {

Assets/Mirage/Runtime/Collections/ISyncObject.cs

@@ -1,4 +1,5 @@
 using System;
+using Mirage.Serialization;
 
 namespace Mirage.Collections
 {

Assets/Mirage/Runtime/Collections/SyncDictionary.cs

@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using JetBrains.Annotations;
+using Mirage.Serialization;
 
 namespace Mirage.Collections
 {

Assets/Mirage/Runtime/Collections/SyncList.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using Mirage.Serialization;
 
 namespace Mirage.Collections
 {

Assets/Mirage/Runtime/Collections/SyncSet.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using Mirage.Serialization;
 
 namespace Mirage.Collections
 {

Assets/Mirage/Runtime/GameObjectSyncvar.cs

@@ -1,4 +1,5 @@
-using UnityEngine;
+using Mirage.Serialization;
+using UnityEngine;
 
 namespace Mirage
 {

Assets/Mirage/Runtime/NetworkBehaviorSyncvar.cs

@@ -1,4 +1,6 @@
-namespace Mirage
+using Mirage.Serialization;
+
+namespace Mirage
 {
 
     /// <summary>

Assets/Mirage/Runtime/NetworkBehaviour.cs

@@ -5,6 +5,7 @@
 using Mirage.RemoteCalls;
 using UnityEngine;
 using Mirage.Logging;
+using Mirage.Serialization;
 
 namespace Mirage
 {

Assets/Mirage/Runtime/NetworkIdentity.cs

@@ -6,6 +6,7 @@
 using UnityEngine.Serialization;
 using UnityEngine.Events;
 using Mirage.Logging;
+using Mirage.Serialization;
 #if UNITY_EDITOR
 using UnityEditor;
 #if UNITY_2018_3_OR_NEWER

Assets/Mirage/Runtime/NetworkIdentitySyncvar.cs

@@ -1,4 +1,6 @@
-namespace Mirage
+using Mirage.Serialization;
+
+namespace Mirage
 {
 
     /// <summary>

Assets/Mirage/Runtime/NetworkPlayer.cs

@@ -6,6 +6,7 @@
 using UnityEngine;
 using UnityEngine.Assertions;
 using Mirage.Logging;
+using Mirage.Serialization;
 
 namespace Mirage
 {

Assets/Mirage/Runtime/NetworkServer.cs

@@ -6,6 +6,7 @@
 using UnityEngine.Events;
 using UnityEngine.Serialization;
 using Mirage.Logging;
+using Mirage.Serialization;
 
 namespace Mirage
 {

Assets/Mirage/Runtime/NotifyPacket.cs

@@ -1,4 +1,6 @@
-namespace Mirage
+using Mirage.Serialization;
+
+namespace Mirage
 {
     // header for notify packet
     public struct NotifyPacket

Assets/Mirage/Runtime/RemoteCallHelper.cs

@@ -3,6 +3,7 @@
 using Cysharp.Threading.Tasks;
 using UnityEngine;
 using Mirage.Logging;
+using Mirage.Serialization;
 
 namespace Mirage.RemoteCalls
 {

Assets/Mirage/Runtime/Compression.cs → Assets/Mirage/Runtime/Serialization/Compression.cs

@@ -1,7 +1,7 @@
 using System;
 using UnityEngine;
 
-namespace Mirage
+namespace Mirage.Serialization
 {
     enum ComponentType : uint
     {

Assets/Mirage/Runtime/MessagePacker.cs → Assets/Mirage/Runtime/Serialization/MessagePacker.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Mirage
+namespace Mirage.Serialization
 {
     // message packing all in one place, instead of constructing headers in all
     // kinds of different places

Assets/Mirage/Runtime/NetworkReader.cs → Assets/Mirage/Runtime/Serialization/NetworkReader.cs

@@ -13,7 +13,7 @@
 using UnityEngine;
 using Mirage.Logging;
 
-namespace Mirage
+namespace Mirage.Serialization
 {
     /// <summary>
     /// a class that holds readers for the different types
@@ -27,20 +27,6 @@ public static class Reader<T>
         public static Func<NetworkReader, T> Read { internal get; set; }
     }
 
-    /// <summary>
-    /// An object that implements this interface can find objects by their net id
-    /// This is used by readers when trying to deserialize gameobjects
-    /// </summary>
-    public interface IObjectLocator
-    {
-        /// <summary>
-        /// Finds a network identity by id
-        /// </summary>
-        /// <param name="netId">the id of the object to find</param>
-        /// <returns>The NetworkIdentity matching the netid or null if none is found</returns>
-        NetworkIdentity this[uint netId] { get; }
-    }
-
     // Note: This class is intended to be extremely pedantic, and
     // throw exceptions whenever stuff is going slightly wrong.
     // The exceptions will be handled in NetworkServer/NetworkClient.

Assets/Mirage/Runtime/NetworkReaderPool.cs → Assets/Mirage/Runtime/Serialization/NetworkReaderPool.cs

@@ -2,7 +2,7 @@
 using UnityEngine;
 using Mirage.Logging;
 
-namespace Mirage
+namespace Mirage.Serialization
 {
     /// <summary>
     /// NetworkReader to be used with <see cref="NetworkReaderPool">NetworkReaderPool</see>

Assets/Mirage/Runtime/NetworkWriter.cs → Assets/Mirage/Runtime/Serialization/NetworkWriter.cs

@@ -4,7 +4,7 @@
 using System.Text;
 using UnityEngine;
 
-namespace Mirage
+namespace Mirage.Serialization
 {
     /// <summary>
     /// a class that holds writers for the different types

Assets/Mirage/Runtime/NetworkWriterPool.cs → Assets/Mirage/Runtime/Serialization/NetworkWriterPool.cs

@@ -2,7 +2,7 @@
 using UnityEngine;
 using Mirage.Logging;
 
-namespace Mirage
+namespace Mirage.Serialization
 {
     /// <summary>
     /// NetworkWriter to be used with <see cref="NetworkWriterPool">NetworkWriterPool</see>

Assets/Mirage/Runtime/Serialization/TypeConversion.cs

@@ -0,0 +1,47 @@
+using System.Runtime.InteropServices;
+
+namespace Mirage.Serialization
+{
+
+    /// <summary>
+    /// Converts between uint and float without allocations
+    /// </summary>
+    [StructLayout(LayoutKind.Explicit)]
+    internal struct UIntFloat
+    {
+        [FieldOffset(0)]
+        public float floatValue;
+
+        [FieldOffset(0)]
+        public uint intValue;
+    }
+
+    /// <summary>
+    /// Converts between ulong and double without allocations
+    /// </summary>
+    [StructLayout(LayoutKind.Explicit)]
+    internal struct UIntDouble
+    {
+        [FieldOffset(0)]
+        public double doubleValue;
+
+        [FieldOffset(0)]
+        public ulong longValue;
+    }
+
+    /// <summary>
+    /// Converts between ulong and decimal without allocations
+    /// </summary>
+    [StructLayout(LayoutKind.Explicit)]
+    internal struct UIntDecimal
+    {
+        [FieldOffset(0)]
+        public ulong longValue1;
+
+        [FieldOffset(8)]
+        public ulong longValue2;
+
+        [FieldOffset(0)]
+        public decimal decimalValue;
+    }
+}

Assets/Mirage/Runtime/ServerObjectManager.cs

@@ -5,6 +5,7 @@
 using UnityEngine;
 using UnityEngine.Serialization;
 using Mirage.Logging;
+using Mirage.Serialization;
 
 namespace Mirage
 {

Assets/Mirage/Runtime/Transport/PipeConnection.cs

@@ -3,6 +3,7 @@
 using System.Net;
 using System.Threading;
 using Cysharp.Threading.Tasks;
+using Mirage.Serialization;
 
 namespace Mirage
 {

Assets/Mirage/Runtime/UNetwork.cs

@@ -15,44 +15,17 @@ public static class Version
     }
 
     /// <summary>
-    /// Converts between uint and float without allocations
+    /// An object that implements this interface can find objects by their net id
+    /// This is used by readers when trying to deserialize gameobjects
     /// </summary>
-    [StructLayout(LayoutKind.Explicit)]
-    internal struct UIntFloat
+    public interface IObjectLocator
     {
-        [FieldOffset(0)]
-        public float floatValue;
-
-        [FieldOffset(0)]
-        public uint intValue;
-    }
-
-    /// <summary>
-    /// Converts between ulong and double without allocations
-    /// </summary>
-    [StructLayout(LayoutKind.Explicit)]
-    internal struct UIntDouble
-    {
-        [FieldOffset(0)]
-        public double doubleValue;
-
-        [FieldOffset(0)]
-        public ulong longValue;
+        /// <summary>
+        /// Finds a network identity by id
+        /// </summary>
+        /// <param name="netId">the id of the object to find</param>
+        /// <returns>The NetworkIdentity matching the netid or null if none is found</returns>
+        NetworkIdentity this[uint netId] { get; }
     }
 
-    /// <summary>
-    /// Converts between ulong and decimal without allocations
-    /// </summary>
-    [StructLayout(LayoutKind.Explicit)]
-    internal struct UIntDecimal
-    {
-        [FieldOffset(0)]
-        public ulong longValue1;
-
-        [FieldOffset(8)]
-        public ulong longValue2;
-
-        [FieldOffset(0)]
-        public decimal decimalValue;
-    }
 }

Assets/Mirage/Weaver/Processors/ClientRpcProcessor.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Mirage.RemoteCalls;
+using Mirage.Serialization;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 namespace Mirage.Weaver

Assets/Mirage/Weaver/Processors/ReaderWriterProcessor.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using Mirage.Serialization;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 using UnityEditor;

Assets/Mirage/Weaver/Processors/ServerRpcProcessor.cs

@@ -5,6 +5,7 @@
 using System.Reflection;
 using Cysharp.Threading.Tasks;
 using Mirage.RemoteCalls;
+using Mirage.Serialization;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 using MethodAttributes = Mono.Cecil.MethodAttributes;

Assets/Mirage/Weaver/Processors/SyncVarProcessor.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using Mirage.Serialization;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 using UnityEngine;

Assets/Mirage/Weaver/Readers.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
+using Mirage.Serialization;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 using Mono.Cecil.Rocks;

Assets/Mirage/Weaver/Writers.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
+using Mirage.Serialization;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 using Mono.Cecil.Rocks;

Assets/Tests/Editor/Compression.cs

@@ -1,6 +1,7 @@
 using NUnit.Framework;
 using UnityEngine;
 using RangeAttribute = NUnit.Framework.RangeAttribute;
+using Mirage.Serialization;
 
 namespace Mirage
 {