Merge pull request #110 from MidLevel/stream-replacement

Stream replacement

Author: TwoTenPvP

MLAPI-Editor/MLAPIProfiler.cs

@@ -37,9 +37,38 @@ GUIStyle wrapStyle
         class ProfilerContainer
         {
             public ProfilerTick[] ticks;
-        }
 
-        private void StopRecording()
+            public byte[] ToBytes()
+			{
+				MLAPI.NetworkingManagerComponents.Binary.BitStream stream = new MLAPI.NetworkingManagerComponents.Binary.BitStream();
+				BitWriter writer = new BitWriter(stream);
+				writer.WriteUInt16Packed((ushort)ticks.Length);
+
+				for (int i = 0; i < ticks.Length; i++)
+				{
+					ticks[i].SerializeToStream(stream);
+				}
+
+				return stream.ToArray();
+			}
+
+			public static ProfilerContainer FromBytes(byte[] bytes)
+			{
+				ProfilerContainer container = new ProfilerContainer();
+				MLAPI.NetworkingManagerComponents.Binary.BitStream stream = new MLAPI.NetworkingManagerComponents.Binary.BitStream(bytes);
+				BitReader reader = new BitReader(stream);
+				ushort count = reader.ReadUInt16Packed();
+				container.ticks = new ProfilerTick[count];
+                for (int i = 0; i < count; i++)
+				{
+					container.ticks[i] = ProfilerTick.FromStream(stream);
+				}
+
+				return container;
+			}
+		}
+
+		private void StopRecording()
         {
             NetworkProfiler.Stop();
         }
@@ -94,7 +123,7 @@ private void OnGUI()
                 string path = EditorUtility.OpenFilePanel("Choose a NetworkProfiler file", "", "");
                 if (!string.IsNullOrEmpty(path))
                 {
-                    ProfilerTick[] ticks = BinarySerializer.Deserialize<ProfilerContainer>(File.ReadAllBytes(path)).ticks;
+					ProfilerTick[] ticks = ProfilerContainer.FromBytes(File.ReadAllBytes(path)).ticks;
                     if (ticks.Length >= 2)
                     {
                         curve = AnimationCurve.Constant(ticks[0].EventId, ticks[(ticks.Length - 1)].EventId, 0);
@@ -130,7 +159,7 @@ private void OnGUI()
                 ProfilerTick[] ticks = new ProfilerTick[ticksInRange];
                 for (int i = min; i < max; i++) ticks[i - min] = currentTicks[i];
                 string path = EditorUtility.SaveFilePanel("Save NetworkProfiler data", "", "networkProfilerData", "");
-                if (!string.IsNullOrEmpty(path)) File.WriteAllBytes(path, BinarySerializer.Serialize(new ProfilerContainer() { ticks = ticks }));
+				if (!string.IsNullOrEmpty(path)) File.WriteAllBytes(path, new ProfilerContainer() { ticks = ticks }.ToBytes());
             }
 
             EditorGUILayout.EndHorizontal();

MLAPI-Editor/NetworkedBehaviourEditor.cs

@@ -1,5 +1,4 @@
-using MLAPI.Attributes;
-using MLAPI.Data;
+using MLAPI.Data;
 using MLAPI.MonoBehaviours.Core;
 using System;
 using System.Collections.Generic;
@@ -13,33 +12,25 @@ namespace UnityEditor
     public class NetworkedBehaviourEditor : Editor
     {
         private bool initialized;
-        private HashSet<string> syncedVarNames = new HashSet<string>();
         private List<string> networkedVarNames = new List<string>();
         private Dictionary<string, FieldInfo> networkedVarFields = new Dictionary<string, FieldInfo>();
         private Dictionary<string, object> networkedVarObjects = new Dictionary<string, object>();
-
-        private GUIContent syncedVarLabelGuiContent;
+        
         private GUIContent networkedVarLabelGuiContent;
 
         private void Init(MonoScript script)
         {
             initialized = true;
-
-            syncedVarNames.Clear();
+            
             networkedVarNames.Clear();
             networkedVarFields.Clear();
             networkedVarObjects.Clear();
 
-            syncedVarLabelGuiContent = new GUIContent("SyncedVar", "This variable has been marked with the [SyncedVar] attribute.");
             networkedVarLabelGuiContent = new GUIContent("NetworkedVar", "This variable is a NetworkedVar. It can not be serialized and can only be changed during runtime.");
 
             FieldInfo[] fields = script.GetClass().GetFields(BindingFlags.Public | BindingFlags.Instance | BindingFlags.FlattenHierarchy | BindingFlags.NonPublic);
             for (int i = 0; i < fields.Length; i++)
             {
-                Attribute[] attributes = (Attribute[])fields[i].GetCustomAttributes(typeof(SyncedVar), true);
-                if (attributes.Length > 0)
-                    syncedVarNames.Add(fields[i].Name);
-
                 Type ft = fields[i].FieldType;
                 if (ft.IsGenericType && ft.GetGenericTypeDefinition() == typeof(NetworkedVar<>))
                 {
@@ -139,28 +130,20 @@ public override void OnInspectorGUI()
             bool expanded = true;
             while (property.NextVisible(expanded))
             {
-                bool isSyncVar = syncedVarNames.Contains(property.name);
                 if (property.propertyType == SerializedPropertyType.ObjectReference)
                 {
                     if (property.name == "m_Script")
                         EditorGUI.BeginDisabledGroup(true);
 
                     EditorGUILayout.PropertyField(property, true);
-
-                    if (isSyncVar)
-                        GUILayout.Label(syncedVarLabelGuiContent, EditorStyles.miniLabel, GUILayout.Width(EditorStyles.miniLabel.CalcSize(syncedVarLabelGuiContent).x));
-
+                                   
                     if (property.name == "m_Script")
                         EditorGUI.EndDisabledGroup();
                 }
                 else
                 {
                     EditorGUILayout.BeginHorizontal();
                     EditorGUILayout.PropertyField(property, true);
-
-                    if (isSyncVar)
-                        GUILayout.Label(syncedVarLabelGuiContent, EditorStyles.miniLabel, GUILayout.Width(EditorStyles.miniLabel.CalcSize(syncedVarLabelGuiContent).x));
-
                     EditorGUILayout.EndHorizontal();
                 }
                 expanded = false;

MLAPI-Editor/NetworkedObjectEditor.cs

@@ -43,7 +43,7 @@ public override void OnInspectorGUI()
                 EditorGUILayout.LabelField("isSpawned: ", networkedObject.isSpawned.ToString(), EditorStyles.label);
                 EditorGUILayout.LabelField("isLocalPlayer: ", networkedObject.isLocalPlayer.ToString(), EditorStyles.label);
                 EditorGUILayout.LabelField("isOwner: ", networkedObject.isOwner.ToString(), EditorStyles.label);
-                EditorGUILayout.LabelField("isObjectOwner: ", networkedObject.isObjectOwner.ToString(), EditorStyles.label);
+				EditorGUILayout.LabelField("isOwnedByServer: ", networkedObject.isOwnedByServer.ToString(), EditorStyles.label);
                 EditorGUILayout.LabelField("isPoolObject: ", networkedObject.isPooledObject.ToString(), EditorStyles.label);
                 EditorGUILayout.LabelField("isPlayerObject: ", networkedObject.isPlayerObject.ToString(), EditorStyles.label);
             }

MLAPI.Tests/Data/FieldTypeTests.cs

@@ -36,9 +36,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Data\FieldTypeTests.cs" />
     <Compile Include="Test.cs" />
-    <Compile Include="NetworkingManagerComponents\Binary\BitWriterTest.cs" />
     <Compile Include="Data\HashCodeTest.cs" />
     <Compile Include="NetworkingManagerComponents\Binary\ArithmeticTest.cs" />
     <Compile Include="NetworkingManagerComponents\Binary\BitStreamTest.cs" />