Changed initial spawn SyncedVar behaviour

TwoTenPvP · TwoTenPvP · commit 26072db80420 · 2018-05-13T17:46:01.000+02:00
diff --git a/MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs b/MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs
@@ -120,6 +120,13 @@ private void OnEnable()
         public virtual void NetworkStart()
         {
 
+        }
+        /// <summary>
+        /// Gets called when SyncedVars gets updated
+        /// </summary>
+        public virtual void OnSyncVarUpdate()
+        {
+
         }
         /// <summary>
         /// Gets called when the local client gains ownership of this object
diff --git a/MLAPI/MonoBehaviours/Core/NetworkedObject.cs b/MLAPI/MonoBehaviours/Core/NetworkedObject.cs
@@ -187,9 +187,11 @@ internal void RebuildObservers(uint? clientId = null)
                                 writer.WriteUInt(networkId);
                                 writer.WriteBool(observers.Contains(pair.Key));
 
+                                if (observers.Contains(pair.Key))
+                                    WriteFormattedSyncedVarData(writer);
+
                                 InternalMessageHandler.Send(pair.Key, "MLAPI_SET_VISIBILITY", "MLAPI_INTERNAL", writer, null);
                             }
-                            FlushToClient(pair.Key);
                         }
                     }
                 }
@@ -336,6 +338,7 @@ internal void SetFormattedSyncedVarData(BitReader reader)
                     childNetworkedBehaviours[i].syncedVarFields[j].FieldInfo.SetValue(behaviour, 
                         FieldTypeHelper.ReadFieldType(reader, childNetworkedBehaviours[i].syncedVarFields[j].FieldType));
                 }
+                behaviour.OnSyncVarUpdate();
             }
         }
 
diff --git a/MLAPI/MonoBehaviours/Core/NetworkingManager.cs b/MLAPI/MonoBehaviours/Core/NetworkingManager.cs
@@ -1162,7 +1162,8 @@ internal void HandleApproval(uint clientId, bool approved, Vector3 position, Qua
                             writer.WriteFloat(pair.Value.transform.rotation.eulerAngles.y);
                             writer.WriteFloat(pair.Value.transform.rotation.eulerAngles.z);
 
-                            pair.Value.WriteFormattedSyncedVarData(writer);
+                            if (pair.Value.observers.Contains(clientId))
+                                pair.Value.WriteFormattedSyncedVarData(writer);
                         }
                     }
 
@@ -1198,7 +1199,8 @@ internal void HandleApproval(uint clientId, bool approved, Vector3 position, Qua
                             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);
+                            if (connectedClients[clientId].PlayerObject.GetComponent<NetworkedObject>().observers.Contains(clientPair.Key))
+                                connectedClients[clientId].PlayerObject.GetComponent<NetworkedObject>().WriteFormattedSyncedVarData(writer);
                         }
                         else
                         {
diff --git a/MLAPI/NetworkingManagerComponents/Core/InternalMessageHandler.Receive.cs b/MLAPI/NetworkingManagerComponents/Core/InternalMessageHandler.Receive.cs
@@ -151,13 +151,13 @@ internal static void HandleAddObject(uint clientId, BitReader reader, int channe
                 {
                     netManager.connectedClients.Add(ownerId, new NetworkedClient() { ClientId = ownerId });
                     netManager.connectedClientsList.Add(netManager.connectedClients[ownerId]);
-                    GameObject go = SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader);
+                    GameObject go = SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), visible ? reader : null);
                     go.GetComponent<NetworkedObject>().SetLocalVisibility(visible);
                 }
                 else
                 {
                     GameObject go = SpawnManager.SpawnPrefabIndexClient(prefabId, networkId, ownerId,
-                                        new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader);
+                                        new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), visible ? reader : null);
 
                     go.GetComponent<NetworkedObject>().SetLocalVisibility(visible);
                     go.GetComponent<NetworkedObject>().sceneObject = sceneObject;
@@ -340,14 +340,14 @@ internal static void HandleAddObjects(uint clientId, BitReader reader, int chann
                     {
                         netManager.connectedClients.Add(ownerId, new NetworkedClient() { ClientId = ownerId });
                         netManager.connectedClientsList.Add(netManager.connectedClients[ownerId]);
-                        GameObject go = SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader);
+                        GameObject go = SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), visible ? reader : null);
 
                         go.GetComponent<NetworkedObject>().SetLocalVisibility(visible);
                     }
                     else
                     {
                         GameObject go = SpawnManager.SpawnPrefabIndexClient(prefabId, networkId, ownerId,
-                                            new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader);
+                                            new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), visible ? reader : null);
 
                         go.GetComponent<NetworkedObject>().SetLocalVisibility(visible);
                         go.GetComponent<NetworkedObject>().sceneObject = sceneObject;
@@ -423,6 +423,8 @@ internal static void HandleSetVisibility(uint clientId, BitReader reader, int ch
         {
             uint networkId = reader.ReadUInt();
             bool visibility = reader.ReadBool();
+            if (visibility)
+                SpawnManager.spawnedObjects[networkId].SetFormattedSyncedVarData(reader);
             SpawnManager.spawnedObjects[networkId].SetLocalVisibility(visibility);
         }
     }
diff --git a/MLAPI/NetworkingManagerComponents/Core/SpawnManager.cs b/MLAPI/NetworkingManagerComponents/Core/SpawnManager.cs
@@ -143,7 +143,8 @@ internal static void FlushSceneObjects()
                             writer.WriteFloat(netObject.Value.transform.rotation.eulerAngles.y);
                             writer.WriteFloat(netObject.Value.transform.rotation.eulerAngles.z);
 
-                            netObject.Value.WriteFormattedSyncedVarData(writer);
+                            if (netObject.Value.observers.Contains(client.Key))
+                                netObject.Value.WriteFormattedSyncedVarData(writer);
                         }
                     }
                     InternalMessageHandler.Send(client.Key, "MLAPI_ADD_OBJECTS", "MLAPI_INTERNAL", writer, null);
@@ -234,7 +235,8 @@ 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);
+                    if (netObject.observers.Contains(client.Key))
+                        netObject.WriteFormattedSyncedVarData(writer);
 
                     InternalMessageHandler.Send(client.Key, "MLAPI_ADD_OBJECT", "MLAPI_INTERNAL", writer, null);
                 }

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,13 @@ private void OnEnable()`
`120`	`120`	`public virtual void NetworkStart()`
`121`	`121`	`{`
`122`	`122`
	`123`	`+ }`
	`124`	`+ /// <summary>`
	`125`	`+ /// Gets called when SyncedVars gets updated`
	`126`	`+ /// </summary>`
	`127`	`+ public virtual void OnSyncVarUpdate()`
	`128`	`+ {`
	`129`	`+`
`123`	`130`	`}`
`124`	`131`	`/// <summary>`
`125`	`132`	`/// Gets called when the local client gains ownership of this object`
Original file line number	Diff line number	Diff line change
`@@ -187,9 +187,11 @@ internal void RebuildObservers(uint? clientId = null)`
`187`	`187`	`writer.WriteUInt(networkId);`
`188`	`188`	`writer.WriteBool(observers.Contains(pair.Key));`
`189`	`189`
	`190`	`+ if (observers.Contains(pair.Key))`
	`191`	`+ WriteFormattedSyncedVarData(writer);`
	`192`	`+`
`190`	`193`	`InternalMessageHandler.Send(pair.Key, "MLAPI_SET_VISIBILITY", "MLAPI_INTERNAL", writer, null);`
`191`	`194`	`}`
`192`		`- FlushToClient(pair.Key);`
`193`	`195`	`}`
`194`	`196`	`}`
`195`	`197`	`}`
`@@ -336,6 +338,7 @@ internal void SetFormattedSyncedVarData(BitReader reader)`
`336`	`338`	`childNetworkedBehaviours[i].syncedVarFields[j].FieldInfo.SetValue(behaviour,`
`337`	`339`	`FieldTypeHelper.ReadFieldType(reader, childNetworkedBehaviours[i].syncedVarFields[j].FieldType));`
`338`	`340`	`}`
	`341`	`+ behaviour.OnSyncVarUpdate();`
`339`	`342`	`}`
`340`	`343`	`}`
`341`	`344`
Original file line number	Diff line number	Diff line change
`@@ -1162,7 +1162,8 @@ internal void HandleApproval(uint clientId, bool approved, Vector3 position, Qua`
`1162`	`1162`	`writer.WriteFloat(pair.Value.transform.rotation.eulerAngles.y);`
`1163`	`1163`	`writer.WriteFloat(pair.Value.transform.rotation.eulerAngles.z);`
`1164`	`1164`
`1165`		`- pair.Value.WriteFormattedSyncedVarData(writer);`
	`1165`	`+ if (pair.Value.observers.Contains(clientId))`
	`1166`	`+ pair.Value.WriteFormattedSyncedVarData(writer);`
`1166`	`1167`	`}`
`1167`	`1168`	`}`
`1168`	`1169`
`@@ -1198,7 +1199,8 @@ internal void HandleApproval(uint clientId, bool approved, Vector3 position, Qua`
`1198`	`1199`	`writer.WriteFloat(connectedClients[clientId].PlayerObject.transform.rotation.eulerAngles.y);`
`1199`	`1200`	`writer.WriteFloat(connectedClients[clientId].PlayerObject.transform.rotation.eulerAngles.z);`
`1200`	`1201`
`1201`		`- connectedClients[clientId].PlayerObject.GetComponent<NetworkedObject>().WriteFormattedSyncedVarData(writer);`
	`1202`	`+ if (connectedClients[clientId].PlayerObject.GetComponent<NetworkedObject>().observers.Contains(clientPair.Key))`
	`1203`	`+ connectedClients[clientId].PlayerObject.GetComponent<NetworkedObject>().WriteFormattedSyncedVarData(writer);`
`1202`	`1204`	`}`
`1203`	`1205`	`else`
`1204`	`1206`	`{`
Original file line number	Diff line number	Diff line change
`@@ -151,13 +151,13 @@ internal static void HandleAddObject(uint clientId, BitReader reader, int channe`
`151`	`151`	`{`
`152`	`152`	`netManager.connectedClients.Add(ownerId, new NetworkedClient() { ClientId = ownerId });`
`153`	`153`	`netManager.connectedClientsList.Add(netManager.connectedClients[ownerId]);`
`154`		`- GameObject go = SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader);`
	`154`	`+ GameObject go = SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), visible ? reader : null);`
`155`	`155`	`go.GetComponent<NetworkedObject>().SetLocalVisibility(visible);`
`156`	`156`	`}`
`157`	`157`	`else`
`158`	`158`	`{`
`159`	`159`	`GameObject go = SpawnManager.SpawnPrefabIndexClient(prefabId, networkId, ownerId,`
`160`		`- new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader);`
	`160`	`+ new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), visible ? reader : null);`
`161`	`161`
`162`	`162`	`go.GetComponent<NetworkedObject>().SetLocalVisibility(visible);`
`163`	`163`	`go.GetComponent<NetworkedObject>().sceneObject = sceneObject;`
`@@ -340,14 +340,14 @@ internal static void HandleAddObjects(uint clientId, BitReader reader, int chann`
`340`	`340`	`{`
`341`	`341`	`netManager.connectedClients.Add(ownerId, new NetworkedClient() { ClientId = ownerId });`
`342`	`342`	`netManager.connectedClientsList.Add(netManager.connectedClients[ownerId]);`
`343`		`- GameObject go = SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader);`
	`343`	`+ GameObject go = SpawnManager.SpawnPlayerObject(ownerId, networkId, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), visible ? reader : null);`
`344`	`344`
`345`	`345`	`go.GetComponent<NetworkedObject>().SetLocalVisibility(visible);`
`346`	`346`	`}`
`347`	`347`	`else`
`348`	`348`	`{`
`349`	`349`	`GameObject go = SpawnManager.SpawnPrefabIndexClient(prefabId, networkId, ownerId,`
`350`		`- new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader);`
	`350`	`+ new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), visible ? reader : null);`
`351`	`351`
`352`	`352`	`go.GetComponent<NetworkedObject>().SetLocalVisibility(visible);`
`353`	`353`	`go.GetComponent<NetworkedObject>().sceneObject = sceneObject;`
`@@ -423,6 +423,8 @@ internal static void HandleSetVisibility(uint clientId, BitReader reader, int ch`
`423`	`423`	`{`
`424`	`424`	`uint networkId = reader.ReadUInt();`
`425`	`425`	`bool visibility = reader.ReadBool();`
	`426`	`+ if (visibility)`
	`427`	`+ SpawnManager.spawnedObjects[networkId].SetFormattedSyncedVarData(reader);`
`426`	`428`	`SpawnManager.spawnedObjects[networkId].SetLocalVisibility(visibility);`
`427`	`429`	`}`
`428`	`430`	`}`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,8 @@ internal static void FlushSceneObjects()`
`143`	`143`	`writer.WriteFloat(netObject.Value.transform.rotation.eulerAngles.y);`
`144`	`144`	`writer.WriteFloat(netObject.Value.transform.rotation.eulerAngles.z);`
`145`	`145`
`146`		`- netObject.Value.WriteFormattedSyncedVarData(writer);`
	`146`	`+ if (netObject.Value.observers.Contains(client.Key))`
	`147`	`+ netObject.Value.WriteFormattedSyncedVarData(writer);`
`147`	`148`	`}`
`148`	`149`	`}`
`149`	`150`	`InternalMessageHandler.Send(client.Key, "MLAPI_ADD_OBJECTS", "MLAPI_INTERNAL", writer, null);`
`@@ -234,7 +235,8 @@ internal static void SpawnPrefabIndexServer(NetworkedObject netObject, uint? cli`
`234`	`235`	`writer.WriteFloat(netObject.transform.rotation.eulerAngles.y);`
`235`	`236`	`writer.WriteFloat(netObject.transform.rotation.eulerAngles.z);`
`236`	`237`
`237`		`- netObject.WriteFormattedSyncedVarData(writer);`
	`238`	`+ if (netObject.observers.Contains(client.Key))`
	`239`	`+ netObject.WriteFormattedSyncedVarData(writer);`
`238`	`240`
`239`	`241`	`InternalMessageHandler.Send(client.Key, "MLAPI_ADD_OBJECT", "MLAPI_INTERNAL", writer, null);`
`240`	`242`	`}`