Removed networkedBehaviourId

TwoTenPvP · TwoTenPvP · commit fe88778c88e0 · 2018-03-08T09:47:57.000+01:00
diff --git a/MLAPI/MLAPI.csproj b/MLAPI/MLAPI.csproj
@@ -1,5 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -73,7 +73,6 @@
     <Compile Include="NetworkingManagerComponents\NetworkPoolManager.cs" />
     <Compile Include="NetworkingManagerComponents\NetworkSceneManager.cs" />
     <Compile Include="NetworkingManagerComponents\SpawnManager.cs" />
-    <Compile Include="NetworkingManagerComponents\SyncedVarManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs b/MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs
@@ -134,9 +134,6 @@ private void OnDestroy()
         private List<object> syncedFieldValues = new List<object>();
         //A dirty field is a field that's not synced.
         public bool[] dirtyFields;
-        protected static ushort networkedBehaviourId;
-        //This is just for the unity editor. if you turn the editor to DEBUG mode you can see what the networkedBehaviourId is.
-        private ushort _networkedBehaviourId = networkedBehaviourId;
         internal void SyncVarInit()
         {
             FieldInfo[] sortedFields = GetType().GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.FlattenHierarchy | BindingFlags.Instance).OrderBy(x => x.Name).ToArray();
@@ -274,7 +271,6 @@ internal void FlushToClient(int clientId)
                     {
                         writer.Write(networkId);
                         writer.Write(networkedObject.GetOrderIndex(this));
-                        writer.Write(networkedBehaviourId);
                         writer.Write(i); //Index
                         switch (syncedFieldTypes[i])
                         {
@@ -364,7 +360,6 @@ internal void SyncVarUpdate()
                             {
                                 writer.Write(networkId);
                                 writer.Write(networkedObject.GetOrderIndex(this));
-                                writer.Write(networkedBehaviourId);
                                 writer.Write(i); //Index
                                 switch (syncedFieldTypes[i])
                                 {
diff --git a/MLAPI/MonoBehaviours/Core/NetworkedObject.cs b/MLAPI/MonoBehaviours/Core/NetworkedObject.cs
@@ -64,45 +64,53 @@ public void ChangeOwnership(int newOwnerClientId)
 
         internal void InvokeBehaviourOnLostOwnership()
         {
-            NetworkedBehaviour[] netBehaviours = GetComponentsInChildren<NetworkedBehaviour>();
-            for (int i = 0; i < netBehaviours.Length; i++)
+            for (int i = 0; i < childNetworkedBehaviours.Count; i++)
             {
-                //We check if we are it's networkedObject owner incase a networkedObject exists as a child of our networkedObject.
-                if (netBehaviours[i].networkedObject == this)
-                {
-                    netBehaviours[i].OnLostOwnership();
-                }
+                childNetworkedBehaviours[i].OnLostOwnership();
             }
         }
 
         internal void InvokeBehaviourOnGainedOwnership()
         {
-            NetworkedBehaviour[] netBehaviours = GetComponentsInChildren<NetworkedBehaviour>();
-            for (int i = 0; i < netBehaviours.Length; i++)
+            for (int i = 0; i < childNetworkedBehaviours.Count; i++)
             {
-                //We check if we are it's networkedObject owner incase a networkedObject exists as a child of our networkedObject.
-                if (netBehaviours[i].networkedObject == this)
-                {
-                    netBehaviours[i].OnGainedOwnership();
-                }
+                childNetworkedBehaviours[i].OnGainedOwnership();
             }
         }
 
         internal void InvokeBehaviourNetworkSpawn()
         {
-            NetworkedBehaviour[] netBehaviours = GetComponentsInChildren<NetworkedBehaviour>();
-            for (int i = 0; i < netBehaviours.Length; i++)
+            for (int i = 0; i < childNetworkedBehaviours.Count; i++)
             {
                 //We check if we are it's networkedObject owner incase a networkedObject exists as a child of our networkedObject.
-                if(netBehaviours[i].networkedObject == this && !netBehaviours[i].networkedStartInvoked)
+                if(!childNetworkedBehaviours[i].networkedStartInvoked)
                 {
-                    netBehaviours[i].NetworkStart();
+                    childNetworkedBehaviours[i].NetworkStart();
                     if (NetworkingManager.singleton.isServer)
-                        netBehaviours[i].SyncVarInit();
+                        childNetworkedBehaviours[i].SyncVarInit();
                 }
             }
         }
 
+        private List<NetworkedBehaviour> _childNetworkedBehaviours;
+        internal List<NetworkedBehaviour> childNetworkedBehaviours
+        {
+            get
+            {
+                if(_childNetworkedBehaviours == null)
+                {
+                    _childNetworkedBehaviours = new List<NetworkedBehaviour>();
+                    NetworkedBehaviour[] behaviours = GetComponentsInChildren<NetworkedBehaviour>();
+                    for (int i = 0; i < behaviours.Length; i++)
+                    {
+                        if (behaviours[i].networkedObject == this)
+                            _childNetworkedBehaviours.Add(behaviours[i]);
+                    }
+                }
+                return _childNetworkedBehaviours;
+            }
+        }
+
         internal static List<NetworkedBehaviour> NetworkedBehaviours = new List<NetworkedBehaviour>();
         internal static void InvokeSyncvarUpdate()
         {
@@ -115,27 +123,26 @@ internal static void InvokeSyncvarUpdate()
         //Flushes all syncVars to client
         internal void FlushToClient(int clientId)
         {
-            for (int i = 0; i < NetworkedBehaviours.Count; i++)
+            for (int i = 0; i < childNetworkedBehaviours.Count; i++)
             {
-                NetworkedBehaviours[i].FlushToClient(clientId);
+                childNetworkedBehaviours[i].FlushToClient(clientId);
             }
         }
 
         internal ushort GetOrderIndex(NetworkedBehaviour instance)
         {
-            NetworkedBehaviour[] behaviours = GetComponentsInChildren<NetworkedBehaviour>();
-            for (ushort i = 0; i < behaviours.Length; i++)
+            for (ushort i = 0; i < childNetworkedBehaviours.Count; i++)
             {
-                if (behaviours[i].networkedObject == this && behaviours[i] == instance)
+                if (childNetworkedBehaviours[i] == instance)
                     return i;
             }
             return 0;
         }
 
         internal NetworkedBehaviour GetBehaviourAtOrderIndex(ushort index)
         {
-            NetworkedBehaviour[] behaviours = GetComponentsInChildren<NetworkedBehaviour>();
-            return behaviours[index];
+            //TODO index out of bounds
+            return childNetworkedBehaviours[index];
         }
     }
 }
diff --git a/MLAPI/MonoBehaviours/Core/NetworkingManager.cs b/MLAPI/MonoBehaviours/Core/NetworkingManager.cs
@@ -74,7 +74,6 @@ private ConnectionConfig Init(NetworkingConfiguration netConfig)
         {
             NetworkConfig = netConfig;
 
-            SyncedVarManager.Init();
             pendingClients = new HashSet<int>();
             connectedClients = new Dictionary<int, NetworkedClient>();
             messageBuffer = new byte[NetworkConfig.MessageBufferSize];
@@ -697,7 +696,6 @@ private void HandleIncomingData(int clientId, byte[] data, int channelId)
                                                 {
                                                     uint netId = messageReader.ReadUInt32(); //NetId the syncvar is from
                                                     ushort orderIndex = messageReader.ReadUInt16();
-                                                    ushort networkBehaviourId = messageReader.ReadUInt16();
                                                     byte fieldIndex = messageReader.ReadByte();
                                                     FieldType type = SpawnManager.spawnedObjects[netId].GetBehaviourAtOrderIndex(orderIndex).syncedFieldTypes[fieldIndex];
                                                     switch (type)
diff --git a/MLAPI/NetworkingManagerComponents/SyncedVarManager.cs b/MLAPI/NetworkingManagerComponents/SyncedVarManager.cs

Original file line number	Diff line number	Diff line change
`@@ -134,9 +134,6 @@ private void OnDestroy()`
`134`	`134`	`private List<object> syncedFieldValues = new List<object>();`
`135`	`135`	`//A dirty field is a field that's not synced.`
`136`	`136`	`public bool[] dirtyFields;`
`137`		`- protected static ushort networkedBehaviourId;`
`138`		`- //This is just for the unity editor. if you turn the editor to DEBUG mode you can see what the networkedBehaviourId is.`
`139`		`- private ushort _networkedBehaviourId = networkedBehaviourId;`
`140`	`137`	`internal void SyncVarInit()`
`141`	`138`	`{`
`142`	`139`	`FieldInfo[] sortedFields = GetType().GetFields(BindingFlags.Public \| BindingFlags.NonPublic \| BindingFlags.FlattenHierarchy \| BindingFlags.Instance).OrderBy(x => x.Name).ToArray();`
`@@ -274,7 +271,6 @@ internal void FlushToClient(int clientId)`
`274`	`271`	`{`
`275`	`272`	`writer.Write(networkId);`
`276`	`273`	`writer.Write(networkedObject.GetOrderIndex(this));`
`277`		`- writer.Write(networkedBehaviourId);`
`278`	`274`	`writer.Write(i); //Index`
`279`	`275`	`switch (syncedFieldTypes[i])`
`280`	`276`	`{`
`@@ -364,7 +360,6 @@ internal void SyncVarUpdate()`
`364`	`360`	`{`
`365`	`361`	`writer.Write(networkId);`
`366`	`362`	`writer.Write(networkedObject.GetOrderIndex(this));`
`367`		`- writer.Write(networkedBehaviourId);`
`368`	`363`	`writer.Write(i); //Index`
`369`	`364`	`switch (syncedFieldTypes[i])`
`370`	`365`	`{`
Original file line number	Diff line number	Diff line change
`@@ -64,45 +64,53 @@ public void ChangeOwnership(int newOwnerClientId)`
`64`	`64`
`65`	`65`	`internal void InvokeBehaviourOnLostOwnership()`
`66`	`66`	`{`
`67`		`- NetworkedBehaviour[] netBehaviours = GetComponentsInChildren<NetworkedBehaviour>();`
`68`		`- for (int i = 0; i < netBehaviours.Length; i++)`
	`67`	`+ for (int i = 0; i < childNetworkedBehaviours.Count; i++)`
`69`	`68`	`{`
`70`		`- //We check if we are it's networkedObject owner incase a networkedObject exists as a child of our networkedObject.`
`71`		`- if (netBehaviours[i].networkedObject == this)`
`72`		`- {`
`73`		`- netBehaviours[i].OnLostOwnership();`
`74`		`- }`
	`69`	`+ childNetworkedBehaviours[i].OnLostOwnership();`
`75`	`70`	`}`
`76`	`71`	`}`
`77`	`72`
`78`	`73`	`internal void InvokeBehaviourOnGainedOwnership()`
`79`	`74`	`{`
`80`		`- NetworkedBehaviour[] netBehaviours = GetComponentsInChildren<NetworkedBehaviour>();`
`81`		`- for (int i = 0; i < netBehaviours.Length; i++)`
	`75`	`+ for (int i = 0; i < childNetworkedBehaviours.Count; i++)`
`82`	`76`	`{`
`83`		`- //We check if we are it's networkedObject owner incase a networkedObject exists as a child of our networkedObject.`
`84`		`- if (netBehaviours[i].networkedObject == this)`
`85`		`- {`
`86`		`- netBehaviours[i].OnGainedOwnership();`
`87`		`- }`
	`77`	`+ childNetworkedBehaviours[i].OnGainedOwnership();`
`88`	`78`	`}`
`89`	`79`	`}`
`90`	`80`
`91`	`81`	`internal void InvokeBehaviourNetworkSpawn()`
`92`	`82`	`{`
`93`		`- NetworkedBehaviour[] netBehaviours = GetComponentsInChildren<NetworkedBehaviour>();`
`94`		`- for (int i = 0; i < netBehaviours.Length; i++)`
	`83`	`+ for (int i = 0; i < childNetworkedBehaviours.Count; i++)`
`95`	`84`	`{`
`96`	`85`	`//We check if we are it's networkedObject owner incase a networkedObject exists as a child of our networkedObject.`
`97`		`- if(netBehaviours[i].networkedObject == this && !netBehaviours[i].networkedStartInvoked)`
	`86`	`+ if(!childNetworkedBehaviours[i].networkedStartInvoked)`
`98`	`87`	`{`
`99`		`- netBehaviours[i].NetworkStart();`
	`88`	`+ childNetworkedBehaviours[i].NetworkStart();`
`100`	`89`	`if (NetworkingManager.singleton.isServer)`
`101`		`- netBehaviours[i].SyncVarInit();`
	`90`	`+ childNetworkedBehaviours[i].SyncVarInit();`
`102`	`91`	`}`
`103`	`92`	`}`
`104`	`93`	`}`
`105`	`94`
	`95`	`+ private List<NetworkedBehaviour> _childNetworkedBehaviours;`
	`96`	`+ internal List<NetworkedBehaviour> childNetworkedBehaviours`
	`97`	`+ {`
	`98`	`+ get`
	`99`	`+ {`
	`100`	`+ if(_childNetworkedBehaviours == null)`
	`101`	`+ {`
	`102`	`+ _childNetworkedBehaviours = new List<NetworkedBehaviour>();`
	`103`	`+ NetworkedBehaviour[] behaviours = GetComponentsInChildren<NetworkedBehaviour>();`
	`104`	`+ for (int i = 0; i < behaviours.Length; i++)`
	`105`	`+ {`
	`106`	`+ if (behaviours[i].networkedObject == this)`
	`107`	`+ _childNetworkedBehaviours.Add(behaviours[i]);`
	`108`	`+ }`
	`109`	`+ }`
	`110`	`+ return _childNetworkedBehaviours;`
	`111`	`+ }`
	`112`	`+ }`
	`113`	`+`
`106`	`114`	`internal static List<NetworkedBehaviour> NetworkedBehaviours = new List<NetworkedBehaviour>();`
`107`	`115`	`internal static void InvokeSyncvarUpdate()`
`108`	`116`	`{`
`@@ -115,27 +123,26 @@ internal static void InvokeSyncvarUpdate()`
`115`	`123`	`//Flushes all syncVars to client`
`116`	`124`	`internal void FlushToClient(int clientId)`
`117`	`125`	`{`
`118`		`- for (int i = 0; i < NetworkedBehaviours.Count; i++)`
	`126`	`+ for (int i = 0; i < childNetworkedBehaviours.Count; i++)`
`119`	`127`	`{`
`120`		`- NetworkedBehaviours[i].FlushToClient(clientId);`
	`128`	`+ childNetworkedBehaviours[i].FlushToClient(clientId);`
`121`	`129`	`}`
`122`	`130`	`}`
`123`	`131`
`124`	`132`	`internal ushort GetOrderIndex(NetworkedBehaviour instance)`
`125`	`133`	`{`
`126`		`- NetworkedBehaviour[] behaviours = GetComponentsInChildren<NetworkedBehaviour>();`
`127`		`- for (ushort i = 0; i < behaviours.Length; i++)`
	`134`	`+ for (ushort i = 0; i < childNetworkedBehaviours.Count; i++)`
`128`	`135`	`{`
`129`		`- if (behaviours[i].networkedObject == this && behaviours[i] == instance)`
	`136`	`+ if (childNetworkedBehaviours[i] == instance)`
`130`	`137`	`return i;`
`131`	`138`	`}`
`132`	`139`	`return 0;`
`133`	`140`	`}`
`134`	`141`
`135`	`142`	`internal NetworkedBehaviour GetBehaviourAtOrderIndex(ushort index)`
`136`	`143`	`{`
`137`		`- NetworkedBehaviour[] behaviours = GetComponentsInChildren<NetworkedBehaviour>();`
`138`		`- return behaviours[index];`
	`144`	`+ //TODO index out of bounds`
	`145`	`+ return childNetworkedBehaviours[index];`
`139`	`146`	`}`
`140`	`147`	`}`
`141`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,6 @@ private ConnectionConfig Init(NetworkingConfiguration netConfig)`
`74`	`74`	`{`
`75`	`75`	`NetworkConfig = netConfig;`
`76`	`76`
`77`		`- SyncedVarManager.Init();`
`78`	`77`	`pendingClients = new HashSet<int>();`
`79`	`78`	`connectedClients = new Dictionary<int, NetworkedClient>();`
`80`	`79`	`messageBuffer = new byte[NetworkConfig.MessageBufferSize];`
`@@ -697,7 +696,6 @@ private void HandleIncomingData(int clientId, byte[] data, int channelId)`
`697`	`696`	`{`
`698`	`697`	`uint netId = messageReader.ReadUInt32(); //NetId the syncvar is from`
`699`	`698`	`ushort orderIndex = messageReader.ReadUInt16();`
`700`		`- ushort networkBehaviourId = messageReader.ReadUInt16();`
`701`	`699`	`byte fieldIndex = messageReader.ReadByte();`
`702`	`700`	`FieldType type = SpawnManager.spawnedObjects[netId].GetBehaviourAtOrderIndex(orderIndex).syncedFieldTypes[fieldIndex];`
`703`	`701`	`switch (type)`