Changed SyncedVars to be flushed on object creation

TwoTenPvP · TwoTenPvP · commit aa4b5c6b6d5a · 2018-04-24T20:53:46.000+02:00
diff --git a/MLAPI/MonoBehaviours/Core/NetworkedObject.cs b/MLAPI/MonoBehaviours/Core/NetworkedObject.cs
@@ -297,6 +297,38 @@ internal static void InvokeSyncvarUpdate()
             }
         }
 
+        internal void WriteFormattedSyncedVarData(BitWriter writer)
+        {
+            for (int i = 0; i < childNetworkedBehaviours.Count; i++)
+            {
+                childNetworkedBehaviours[i].SyncVarInit();
+                if (childNetworkedBehaviours[i].syncedVarFields.Count == 0)
+                    continue;
+                writer.WriteUShort(GetOrderIndex(childNetworkedBehaviours[i])); //Write the behaviourId
+                for (int j = 0; j < childNetworkedBehaviours[i].syncedVarFields.Count; j++)
+                {
+                    FieldTypeHelper.WriteFieldType(writer, childNetworkedBehaviours[i].syncedVarFields[j].FieldValue,
+                        childNetworkedBehaviours[i].syncedVarFields[j].FieldType);
+                }
+            }
+        }
+
+        internal void SetFormattedSyncedVarData(BitReader reader)
+        {
+            for (int i = 0; i < childNetworkedBehaviours.Count; i++)
+            {
+                childNetworkedBehaviours[i].SyncVarInit();
+                if (childNetworkedBehaviours[i].syncedVarFields.Count == 0)
+                    continue;
+                NetworkedBehaviour behaviour = GetBehaviourAtOrderIndex(reader.ReadUShort());
+                for (int j = 0; j < childNetworkedBehaviours[i].syncedVarFields.Count; j++)
+                {
+                    childNetworkedBehaviours[i].syncedVarFields[j].FieldInfo.SetValue(behaviour, 
+                        FieldTypeHelper.ReadFieldType(reader, childNetworkedBehaviours[i].syncedVarFields[j].FieldType));
+                }
+            }
+        }
+
         //Flushes all syncVars to client
         internal void FlushToClient(uint clientId)
         {
diff --git a/MLAPI/MonoBehaviours/Core/NetworkingManager.cs b/MLAPI/MonoBehaviours/Core/NetworkingManager.cs
@@ -1096,6 +1096,8 @@ internal void HandleApproval(uint clientId, bool approved, Vector3 position, Qua
                             writer.WriteFloat(pair.Value.transform.rotation.eulerAngles.x);
                             writer.WriteFloat(pair.Value.transform.rotation.eulerAngles.y);
                             writer.WriteFloat(pair.Value.transform.rotation.eulerAngles.z);
+
+                            pair.Value.WriteFormattedSyncedVarData(writer);
                         }
                     }
 
@@ -1125,6 +1127,8 @@ internal void HandleApproval(uint clientId, bool approved, Vector3 position, Qua
                         writer.WriteFloat(connectedClients[clientId].PlayerObject.transform.rotation.eulerAngles.x);
                         writer.WriteFloat(connectedClients[clientId].PlayerObject.transform.rotation.eulerAngles.y);
                         writer.WriteFloat(connectedClients[clientId].PlayerObject.transform.rotation.eulerAngles.z);
+
+                        connectedClients[clientId].PlayerObject.GetComponent<NetworkedObject>().WriteFormattedSyncedVarData(writer);
                     }
                     else
                     {
@@ -1133,11 +1137,6 @@ internal void HandleApproval(uint clientId, bool approved, Vector3 position, Qua
 
                     InternalMessageHandler.Send("MLAPI_ADD_OBJECT", "MLAPI_INTERNAL", writer.Finalize(), clientId, null);
                 }
-                //Flush syncvars:
-                foreach (KeyValuePair<uint, NetworkedObject> networkedObject in SpawnManager.spawnedObjects)
-                {
-                    networkedObject.Value.FlushToClient(clientId);
-                }
             }
             else
             {
diff --git a/MLAPI/NetworkingManagerComponents/Core/InternalMessageHandler.Receive.cs b/MLAPI/NetworkingManagerComponents/Core/InternalMessageHandler.Receive.cs
@@ -106,13 +106,13 @@ internal static void HandleConnectionApproved(uint clientId, byte[] incommingDat
 
                     if (isPlayerObject)
                     {
-                        GameObject go = SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot));
+                        GameObject go = SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader);
                         go.GetComponent<NetworkedObject>().SetLocalVisibility(visible);
                     }
                     else
                     {
                         GameObject go = SpawnManager.SpawnPrefabIndexClient(prefabId, networkId, ownerId,
-                            new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot));
+                            new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader);
 
                         go.GetComponent<NetworkedObject>().SetLocalVisibility(visible);
                         go.GetComponent<NetworkedObject>().sceneObject = sceneObject;
@@ -155,13 +155,13 @@ internal static void HandleAddObject(uint clientId, byte[] incommingData, int ch
                 if (isPlayerObject)
                 {
                     netManager.connectedClients.Add(ownerId, new NetworkedClient() { ClientId = ownerId });
-                    GameObject go = SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot));
+                    GameObject go = SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader);
                     go.GetComponent<NetworkedObject>().SetLocalVisibility(visible);
                 }
                 else
                 {
                     GameObject go = SpawnManager.SpawnPrefabIndexClient(prefabId, networkId, ownerId,
-                                        new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot));
+                                        new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader);
 
                     go.GetComponent<NetworkedObject>().SetLocalVisibility(visible);
                     go.GetComponent<NetworkedObject>().sceneObject = sceneObject;
@@ -364,14 +364,14 @@ internal static void HandleAddObjects(uint clientId, byte[] incommingData, int c
                     if (isPlayerObject)
                     {
                         netManager.connectedClients.Add(ownerId, new NetworkedClient() { ClientId = ownerId });
-                        GameObject go = SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot));
+                        GameObject go = SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader);
 
                         go.GetComponent<NetworkedObject>().SetLocalVisibility(visible);
                     }
                     else
                     {
                         GameObject go = SpawnManager.SpawnPrefabIndexClient(prefabId, networkId, ownerId,
-                                            new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot));
+                                            new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader);
 
                         go.GetComponent<NetworkedObject>().SetLocalVisibility(visible);
                         go.GetComponent<NetworkedObject>().sceneObject = sceneObject;
diff --git a/MLAPI/NetworkingManagerComponents/Core/SpawnManager.cs b/MLAPI/NetworkingManagerComponents/Core/SpawnManager.cs
@@ -113,6 +113,7 @@ internal static void FlushSceneObjects()
             using (BitWriter writer = new BitWriter())
             {
                 writer.WriteUShort((ushort)sceneObjectsToSync.Count);
+
                 for (int i = 0; i < sceneObjectsToSync.Count; i++)
                 {
                     writer.WriteBool(false); //isLocalPlayer
@@ -128,13 +129,14 @@ internal static void FlushSceneObjects()
                     writer.WriteFloat(sceneObjectsToSync[i].transform.rotation.eulerAngles.x);
                     writer.WriteFloat(sceneObjectsToSync[i].transform.rotation.eulerAngles.y);
                     writer.WriteFloat(sceneObjectsToSync[i].transform.rotation.eulerAngles.z);
-                }
 
+                    sceneObjectsToSync[i].WriteFormattedSyncedVarData(writer);
+                }
                 InternalMessageHandler.Send("MLAPI_ADD_OBJECTS", "MLAPI_INTERNAL", writer.Finalize(), null);
             }
         }
 
-        internal static GameObject SpawnPrefabIndexClient(int networkedPrefabId, uint networkId, uint owner, Vector3 position, Quaternion rotation)
+        internal static GameObject SpawnPrefabIndexClient(int networkedPrefabId, uint networkId, uint owner, Vector3 position, Quaternion rotation, BitReader reader = null)
         {
             if (!netManager.NetworkConfig.NetworkPrefabNames.ContainsKey(networkedPrefabId))
             {
@@ -149,6 +151,10 @@ internal static GameObject SpawnPrefabIndexClient(int networkedPrefabId, uint ne
                 Debug.LogWarning("MLAPI: Please add a NetworkedObject component to the root of all spawnable objects");
                 netObject = go.AddComponent<NetworkedObject>();
             }
+
+            if (reader != null)
+                netObject.SetFormattedSyncedVarData(reader);
+
             netObject.NetworkedPrefabName = netManager.NetworkConfig.NetworkPrefabNames[networkedPrefabId];
             netObject._isSpawned = true;
             netObject._isPooledObject = false;
@@ -210,12 +216,13 @@ internal static void SpawnPrefabIndexServer(NetworkedObject netObject, uint? cli
                 writer.WriteFloat(netObject.transform.rotation.eulerAngles.y);
                 writer.WriteFloat(netObject.transform.rotation.eulerAngles.z);
 
+                netObject.WriteFormattedSyncedVarData(writer);
 
                 InternalMessageHandler.Send("MLAPI_ADD_OBJECT", "MLAPI_INTERNAL", writer.Finalize(), null);
             }
         }
 
-        internal static GameObject SpawnPlayerObject(uint clientId, uint networkId, Vector3 position, Quaternion rotation)
+        internal static GameObject SpawnPlayerObject(uint clientId, uint networkId, Vector3 position, Quaternion rotation, BitReader reader = null)
         {
             if (string.IsNullOrEmpty(netManager.NetworkConfig.PlayerPrefabName) || !netManager.NetworkConfig.NetworkPrefabIds.ContainsKey(netManager.NetworkConfig.PlayerPrefabName))
             {
@@ -235,6 +242,9 @@ internal static GameObject SpawnPlayerObject(uint clientId, uint networkId, Vect
             else
                 netObject.networkId = networkId;
 
+            if (reader != null)
+                netObject.SetFormattedSyncedVarData(reader);
+
             netObject._isPooledObject = false;
             netObject.ownerClientId = clientId;
             netObject._isPlayerObject = true;

Original file line number	Diff line number	Diff line change
`@@ -1096,6 +1096,8 @@ internal void HandleApproval(uint clientId, bool approved, Vector3 position, Qua`
`1096`	`1096`	`writer.WriteFloat(pair.Value.transform.rotation.eulerAngles.x);`
`1097`	`1097`	`writer.WriteFloat(pair.Value.transform.rotation.eulerAngles.y);`
`1098`	`1098`	`writer.WriteFloat(pair.Value.transform.rotation.eulerAngles.z);`
	`1099`	`+`
	`1100`	`+ pair.Value.WriteFormattedSyncedVarData(writer);`
`1099`	`1101`	`}`
`1100`	`1102`	`}`
`1101`	`1103`
`@@ -1125,6 +1127,8 @@ internal void HandleApproval(uint clientId, bool approved, Vector3 position, Qua`
`1125`	`1127`	`writer.WriteFloat(connectedClients[clientId].PlayerObject.transform.rotation.eulerAngles.x);`
`1126`	`1128`	`writer.WriteFloat(connectedClients[clientId].PlayerObject.transform.rotation.eulerAngles.y);`
`1127`	`1129`	`writer.WriteFloat(connectedClients[clientId].PlayerObject.transform.rotation.eulerAngles.z);`
	`1130`	`+`
	`1131`	`+ connectedClients[clientId].PlayerObject.GetComponent<NetworkedObject>().WriteFormattedSyncedVarData(writer);`
`1128`	`1132`	`}`
`1129`	`1133`	`else`
`1130`	`1134`	`{`
`@@ -1133,11 +1137,6 @@ internal void HandleApproval(uint clientId, bool approved, Vector3 position, Qua`
`1133`	`1137`
`1134`	`1138`	`InternalMessageHandler.Send("MLAPI_ADD_OBJECT", "MLAPI_INTERNAL", writer.Finalize(), clientId, null);`
`1135`	`1139`	`}`
`1136`		`- //Flush syncvars:`
`1137`		`- foreach (KeyValuePair<uint, NetworkedObject> networkedObject in SpawnManager.spawnedObjects)`
`1138`		`- {`
`1139`		`- networkedObject.Value.FlushToClient(clientId);`
`1140`		`- }`
`1141`	`1140`	`}`
`1142`	`1141`	`else`
`1143`	`1142`	`{`
Original file line number	Diff line number	Diff line change
`@@ -106,13 +106,13 @@ internal static void HandleConnectionApproved(uint clientId, byte[] incommingDat`
`106`	`106`
`107`	`107`	`if (isPlayerObject)`
`108`	`108`	`{`
`109`		`- GameObject go = SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot));`
	`109`	`+ GameObject go = SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader);`
`110`	`110`	`go.GetComponent<NetworkedObject>().SetLocalVisibility(visible);`
`111`	`111`	`}`
`112`	`112`	`else`
`113`	`113`	`{`
`114`	`114`	`GameObject go = SpawnManager.SpawnPrefabIndexClient(prefabId, networkId, ownerId,`
`115`		`- new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot));`
	`115`	`+ new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader);`
`116`	`116`
`117`	`117`	`go.GetComponent<NetworkedObject>().SetLocalVisibility(visible);`
`118`	`118`	`go.GetComponent<NetworkedObject>().sceneObject = sceneObject;`
`@@ -155,13 +155,13 @@ internal static void HandleAddObject(uint clientId, byte[] incommingData, int ch`
`155`	`155`	`if (isPlayerObject)`
`156`	`156`	`{`
`157`	`157`	`netManager.connectedClients.Add(ownerId, new NetworkedClient() { ClientId = ownerId });`
`158`		`- GameObject go = SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot));`
	`158`	`+ GameObject go = SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader);`
`159`	`159`	`go.GetComponent<NetworkedObject>().SetLocalVisibility(visible);`
`160`	`160`	`}`
`161`	`161`	`else`
`162`	`162`	`{`
`163`	`163`	`GameObject go = SpawnManager.SpawnPrefabIndexClient(prefabId, networkId, ownerId,`
`164`		`- new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot));`
	`164`	`+ new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader);`
`165`	`165`
`166`	`166`	`go.GetComponent<NetworkedObject>().SetLocalVisibility(visible);`
`167`	`167`	`go.GetComponent<NetworkedObject>().sceneObject = sceneObject;`
`@@ -364,14 +364,14 @@ internal static void HandleAddObjects(uint clientId, byte[] incommingData, int c`
`364`	`364`	`if (isPlayerObject)`
`365`	`365`	`{`
`366`	`366`	`netManager.connectedClients.Add(ownerId, new NetworkedClient() { ClientId = ownerId });`
`367`		`- GameObject go = SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot));`
	`367`	`+ GameObject go = SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader);`
`368`	`368`
`369`	`369`	`go.GetComponent<NetworkedObject>().SetLocalVisibility(visible);`
`370`	`370`	`}`
`371`	`371`	`else`
`372`	`372`	`{`
`373`	`373`	`GameObject go = SpawnManager.SpawnPrefabIndexClient(prefabId, networkId, ownerId,`
`374`		`- new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot));`
	`374`	`+ new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader);`
`375`	`375`
`376`	`376`	`go.GetComponent<NetworkedObject>().SetLocalVisibility(visible);`
`377`	`377`	`go.GetComponent<NetworkedObject>().sceneObject = sceneObject;`
Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,7 @@ internal static void FlushSceneObjects()`
`113`	`113`	`using (BitWriter writer = new BitWriter())`
`114`	`114`	`{`
`115`	`115`	`writer.WriteUShort((ushort)sceneObjectsToSync.Count);`
	`116`	`+`
`116`	`117`	`for (int i = 0; i < sceneObjectsToSync.Count; i++)`
`117`	`118`	`{`
`118`	`119`	`writer.WriteBool(false); //isLocalPlayer`
`@@ -128,13 +129,14 @@ internal static void FlushSceneObjects()`
`128`	`129`	`writer.WriteFloat(sceneObjectsToSync[i].transform.rotation.eulerAngles.x);`
`129`	`130`	`writer.WriteFloat(sceneObjectsToSync[i].transform.rotation.eulerAngles.y);`
`130`	`131`	`writer.WriteFloat(sceneObjectsToSync[i].transform.rotation.eulerAngles.z);`
`131`		`- }`
`132`	`132`
	`133`	`+ sceneObjectsToSync[i].WriteFormattedSyncedVarData(writer);`
	`134`	`+ }`
`133`	`135`	`InternalMessageHandler.Send("MLAPI_ADD_OBJECTS", "MLAPI_INTERNAL", writer.Finalize(), null);`
`134`	`136`	`}`
`135`	`137`	`}`
`136`	`138`
`137`		`- internal static GameObject SpawnPrefabIndexClient(int networkedPrefabId, uint networkId, uint owner, Vector3 position, Quaternion rotation)`
	`139`	`+ internal static GameObject SpawnPrefabIndexClient(int networkedPrefabId, uint networkId, uint owner, Vector3 position, Quaternion rotation, BitReader reader = null)`
`138`	`140`	`{`
`139`	`141`	`if (!netManager.NetworkConfig.NetworkPrefabNames.ContainsKey(networkedPrefabId))`
`140`	`142`	`{`
`@@ -149,6 +151,10 @@ internal static GameObject SpawnPrefabIndexClient(int networkedPrefabId, uint ne`
`149`	`151`	`Debug.LogWarning("MLAPI: Please add a NetworkedObject component to the root of all spawnable objects");`
`150`	`152`	`netObject = go.AddComponent<NetworkedObject>();`
`151`	`153`	`}`
	`154`	`+`
	`155`	`+ if (reader != null)`
	`156`	`+ netObject.SetFormattedSyncedVarData(reader);`
	`157`	`+`
`152`	`158`	`netObject.NetworkedPrefabName = netManager.NetworkConfig.NetworkPrefabNames[networkedPrefabId];`
`153`	`159`	`netObject._isSpawned = true;`
`154`	`160`	`netObject._isPooledObject = false;`
`@@ -210,12 +216,13 @@ internal static void SpawnPrefabIndexServer(NetworkedObject netObject, uint? cli`
`210`	`216`	`writer.WriteFloat(netObject.transform.rotation.eulerAngles.y);`
`211`	`217`	`writer.WriteFloat(netObject.transform.rotation.eulerAngles.z);`
`212`	`218`
	`219`	`+ netObject.WriteFormattedSyncedVarData(writer);`
`213`	`220`
`214`	`221`	`InternalMessageHandler.Send("MLAPI_ADD_OBJECT", "MLAPI_INTERNAL", writer.Finalize(), null);`
`215`	`222`	`}`
`216`	`223`	`}`
`217`	`224`
`218`		`- internal static GameObject SpawnPlayerObject(uint clientId, uint networkId, Vector3 position, Quaternion rotation)`
	`225`	`+ internal static GameObject SpawnPlayerObject(uint clientId, uint networkId, Vector3 position, Quaternion rotation, BitReader reader = null)`
`219`	`226`	`{`
`220`	`227`	`if (string.IsNullOrEmpty(netManager.NetworkConfig.PlayerPrefabName) \|\| !netManager.NetworkConfig.NetworkPrefabIds.ContainsKey(netManager.NetworkConfig.PlayerPrefabName))`
`221`	`228`	`{`
`@@ -235,6 +242,9 @@ internal static GameObject SpawnPlayerObject(uint clientId, uint networkId, Vect`
`235`	`242`	`else`
`236`	`243`	`netObject.networkId = networkId;`
`237`	`244`
	`245`	`+ if (reader != null)`
	`246`	`+ netObject.SetFormattedSyncedVarData(reader);`
	`247`	`+`
`238`	`248`	`netObject._isPooledObject = false;`
`239`	`249`	`netObject.ownerClientId = clientId;`
`240`	`250`	`netObject._isPlayerObject = true;`