Merge pull request #124 from jaglitegrann/feat/support-gameobject-networkedobject-networkedbehaviour-types-in-writter-reader

Support more types in BitWritter/BitReader

Author: TwoTenPvP

MLAPI/NetworkingManagerComponents/Binary/BitReader.cs

@@ -6,7 +6,9 @@
 using System;
 using System.IO;
 using System.Text;
+using MLAPI.Components;
 using MLAPI.Internal;
+using MLAPI.Logging;
 using UnityEngine;
 
 namespace MLAPI.Serialization
@@ -129,6 +131,49 @@ public object ReadObjectPacked(Type type)
                 return ReadCharPacked();
             if (type.IsEnum)
                 return ReadInt32Packed();
+            if (type == typeof(GameObject))
+            {
+                uint networkId = ReadUInt32Packed();
+                if (SpawnManager.SpawnedObjects.ContainsKey(networkId)) 
+                {
+                    return SpawnManager.SpawnedObjects[networkId].gameObject;
+                }
+                else 
+                {
+                    if (LogHelper.CurrentLogLevel <= LogLevel.Normal)
+                        LogHelper.LogWarning("BitReader canot find the GameObject sent in the SpawnedObjects list, it may have been destroyed. NetworkId: " + networkId.ToString());
+                    return null;
+                }
+            }
+            if (type == typeof(NetworkedObject))
+            {
+                uint networkId = ReadUInt32Packed();
+                if (SpawnManager.SpawnedObjects.ContainsKey(networkId)) 
+                {
+                    return SpawnManager.SpawnedObjects[networkId];
+                }
+                else 
+                {
+                    if (LogHelper.CurrentLogLevel <= LogLevel.Normal)
+                        LogHelper.LogWarning("BitReader canot find the NetworkedObject sent in the SpawnedObjects list, it may have been destroyed. NetworkId: " + networkId.ToString());
+                    return null;
+                }
+            }
+            if (type == typeof(NetworkedBehaviour))
+            {
+                uint networkId = ReadUInt32Packed();
+                ushort behaviourId = ReadUInt16Packed();
+                if (SpawnManager.SpawnedObjects.ContainsKey(networkId)) 
+                {
+                    return SpawnManager.SpawnedObjects[networkId].GetBehaviourAtOrderIndex(behaviourId);
+                }
+                else 
+                {
+                    if (LogHelper.CurrentLogLevel <= LogLevel.Normal)
+                        LogHelper.LogWarning("BitReader canot find the NetworkedBehaviour sent in the SpawnedObjects list, it may have been destroyed. NetworkId: " + networkId.ToString());
+                    return null;
+                }
+            }
             if (typeof(IBitWritable).IsAssignableFrom(type))
             {
                 object instance = Activator.CreateInstance(type);

MLAPI/NetworkingManagerComponents/Binary/BitWriter.cs

@@ -145,16 +145,53 @@ public void WriteObjectPacked(object value)
                 WriteCharPacked((char)value);
                 return;
             }
-            else if(value is IBitWritable)
-            {
-                ((IBitWritable)value).Write(this.sink);
-                return;
-            } 
             else if (value.GetType().IsEnum) 
             {
                 WriteInt32Packed((int)value);
                 return;
             }
+            else if (value is GameObject) 
+            {
+                if(value == null) 
+                {
+                    throw new ArgumentException("BitWriter cannot write GameObject types with a null value");
+                }
+                NetworkedObject networkedObject = ((GameObject)value).GetComponent<NetworkedObject>();
+                if(networkedObject == null) 
+                {
+                    throw new ArgumentException("BitWriter cannot write GameObject types that does not has a NetworkedObject component attached. GameObject: " + ((GameObject)value).name);
+                } 
+                else 
+                {
+                    WriteUInt32Packed(networkedObject.NetworkId);
+                }
+                return;
+            }
+            else if (value is NetworkedObject)
+            {
+                if (value == null) 
+                {
+                    throw new ArgumentException("BitWriter cannot write NetworkedObject types with a null value");
+                }
+                WriteUInt32Packed(((NetworkedObject)value).NetworkId);
+                return;
+            } 
+            else if (value is NetworkedBehaviour)
+            {
+                if(value == null) 
+                {
+                    throw new ArgumentException("BitWriter cannot write NetworkedBehaviour types with a null value");
+                }
+                WriteUInt32Packed(((NetworkedBehaviour)value).networkId);
+                WriteUInt16Packed(((NetworkedBehaviour)value).GetBehaviourId());
+                return;
+            } 
+            else if(value is IBitWritable)
+            {
+                ((IBitWritable)value).Write(this.sink);
+                return;
+            } 
+            
 
             throw new ArgumentException("BitWriter cannot write type " + value.GetType().Name);
         }