perf: Removed DestroyWithScene syncronization

TwoTenPvP · TwoTenPvP · commit 0a4cbc325253 · 2019-04-12T12:16:14.000+02:00
diff --git a/MLAPI/MonoBehaviours/Core/NetworkingManager.cs b/MLAPI/MonoBehaviours/Core/NetworkingManager.cs
@@ -1050,8 +1050,6 @@ internal void HandleApproval(ulong clientId, ulong? prefabHash, bool approved, V
                                 }
                             }
 
-                            writer.WriteBool(_observedObjects[i].DestroyWithScene);
-
                             writer.WriteSinglePacked(_observedObjects[i].transform.position.x);
                             writer.WriteSinglePacked(_observedObjects[i].transform.position.y);
                             writer.WriteSinglePacked(_observedObjects[i].transform.position.z);
diff --git a/MLAPI/NetworkingManagerComponents/Core/InternalMessageHandler.Receive.cs b/MLAPI/NetworkingManagerComponents/Core/InternalMessageHandler.Receive.cs
@@ -260,13 +260,11 @@ void DelayedSpawnAction(Stream continuationStream)
                                 }
                             }
 
-                            bool destroyWithScene = continuationReader.ReadBool();
-
                             Vector3 pos = new Vector3(continuationReader.ReadSinglePacked(), continuationReader.ReadSinglePacked(), continuationReader.ReadSinglePacked());
                             Quaternion rot = Quaternion.Euler(continuationReader.ReadSinglePacked(), continuationReader.ReadSinglePacked(), continuationReader.ReadSinglePacked());
 
                             NetworkedObject netObject = SpawnManager.CreateLocalNetworkedObject(softSync, instanceId, prefabHash, pos, rot);
-                            SpawnManager.SpawnNetworkedObjectLocally(netObject, networkId, softSync, isPlayerObject, ownerId, continuationStream, false, 0, true, destroyWithScene);
+                            SpawnManager.SpawnNetworkedObjectLocally(netObject, networkId, softSync, isPlayerObject, ownerId, continuationStream, false, 0, true, false);
                         }
 
                         NetworkingManager.Singleton.IsConnectedClient = true;
@@ -336,21 +334,14 @@ internal static void HandleAddObject(ulong clientId, Stream stream)
                     }
                 }
 
-                bool destroyWithScene = reader.ReadBool();
-
                 Vector3 pos = new Vector3(reader.ReadSinglePacked(), reader.ReadSinglePacked(), reader.ReadSinglePacked());
                 Quaternion rot = Quaternion.Euler(reader.ReadSinglePacked(), reader.ReadSinglePacked(), reader.ReadSinglePacked());
 
                 bool hasPayload = reader.ReadBool();
                 int payLoadLength = hasPayload ? reader.ReadInt32Packed() : 0;
                 
                 NetworkedObject netObject = SpawnManager.CreateLocalNetworkedObject(softSync, instanceId, prefabHash, pos, rot);
-                SpawnManager.SpawnNetworkedObjectLocally(netObject, networkId, softSync, isPlayerObject, ownerId, stream, hasPayload, payLoadLength, true, destroyWithScene);
-
-                /*
-                NetworkedObject netObject = SpawnManager.CreateSpawnedObject(SpawnManager.GetNetworkedPrefabIndexOfHash(prefabHash), networkId, ownerId, isPlayerObject,
-                    sceneSpawnedInIndex, sceneDelayedSpawn, destroyWithScene, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), true, stream, hasPayload, payLoadLength, true);
-                    */
+                SpawnManager.SpawnNetworkedObjectLocally(netObject, networkId, softSync, isPlayerObject, ownerId, stream, hasPayload, payLoadLength, true, false);
             }
         }
 
@@ -443,19 +434,12 @@ internal static void HandleAddObjects(ulong clientId, Stream stream)
                             instanceId = 0;
                         }
                     }
-                    
-                    bool destroyWithScene = reader.ReadBool();
 
                     Vector3 pos = new Vector3(reader.ReadSinglePacked(), reader.ReadSinglePacked(), reader.ReadSinglePacked());
                     Quaternion rot = Quaternion.Euler(reader.ReadSinglePacked(), reader.ReadSinglePacked(), reader.ReadSinglePacked());
                     
-                    /*
-                    NetworkedObject netObject = SpawnManager.CreateSpawnedObject(SpawnManager.GetNetworkedPrefabIndexOfHash(prefabHash), networkId, ownerId, isPlayerObject,
-                        sceneSpawnedInIndex, sceneDelayedSpawn, destroyWithScene, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), true, stream, false, 0, true);
-                        */
-                    
                     NetworkedObject netObject = SpawnManager.CreateLocalNetworkedObject(softSync, instanceId, prefabHash, pos, rot);
-                    SpawnManager.SpawnNetworkedObjectLocally(netObject, networkId, softSync, isPlayerObject, ownerId, stream, false, 0, true, destroyWithScene);
+                    SpawnManager.SpawnNetworkedObjectLocally(netObject, networkId, softSync, isPlayerObject, ownerId, stream, false, 0, true, false);
                 }
             }
         }
diff --git a/MLAPI/NetworkingManagerComponents/Core/NetworkSceneManager.cs b/MLAPI/NetworkingManagerComponents/Core/NetworkSceneManager.cs
@@ -224,8 +224,6 @@ private static void OnSceneUnloadServer(Guid switchSceneGuid)
 
                                         writer.WriteUInt64Packed(newSceneObjects[i].PrefabHash);
 
-                                        writer.WriteBool(newSceneObjects[i].DestroyWithScene);
-
                                         writer.WriteSinglePacked(newSceneObjects[i].transform.position.x);
                                         writer.WriteSinglePacked(newSceneObjects[i].transform.position.y);
                                         writer.WriteSinglePacked(newSceneObjects[i].transform.position.z);
@@ -247,8 +245,6 @@ private static void OnSceneUnloadServer(Guid switchSceneGuid)
 
                                         writer.WriteUInt64Packed(newSceneObjects[i].NetworkedInstanceId);
 
-                                        writer.WriteBool(newSceneObjects[i].DestroyWithScene);
-
                                         if (NetworkingManager.Singleton.NetworkConfig.EnableNetworkedVar)
                                         {
                                             newSceneObjects[i].WriteNetworkedVarData(stream, NetworkingManager.Singleton.ConnectedClientsList[j].ClientId);
@@ -294,14 +290,12 @@ private static void OnSceneUnloadClient(Guid switchSceneGuid, Stream objectStrea
                         ulong owner = reader.ReadUInt64Packed();
 
                         ulong prefabHash = reader.ReadUInt64Packed();
-                        
-                        bool destroyWithScene = reader.ReadBool();
 
                         Vector3 position = new Vector3(reader.ReadSinglePacked(), reader.ReadSinglePacked(), reader.ReadSinglePacked());
                         Quaternion rotation = Quaternion.Euler(reader.ReadSinglePacked(), reader.ReadSinglePacked(), reader.ReadSinglePacked());
                         
                         NetworkedObject networkedObject = SpawnManager.CreateLocalNetworkedObject(false, 0, prefabHash, position, rotation);
-                        SpawnManager.SpawnNetworkedObjectLocally(networkedObject, networkId, true, isPlayerObject, owner, objectStream, false, 0, true, destroyWithScene);
+                        SpawnManager.SpawnNetworkedObjectLocally(networkedObject, networkId, true, isPlayerObject, owner, objectStream, false, 0, true, false);
                     }
                 }
             }
@@ -322,11 +316,9 @@ private static void OnSceneUnloadClient(Guid switchSceneGuid, Stream objectStrea
                         ulong owner = reader.ReadUInt64Packed();
 
                         ulong instanceId = reader.ReadUInt64Packed();
-                        
-                        bool destroyWithScene = reader.ReadBool();
 
                         NetworkedObject networkedObject = SpawnManager.CreateLocalNetworkedObject(true, instanceId, 0, null, null);
-                        SpawnManager.SpawnNetworkedObjectLocally(networkedObject, networkId, true, isPlayerObject, owner, objectStream, false, 0, true, destroyWithScene);
+                        SpawnManager.SpawnNetworkedObjectLocally(networkedObject, networkId, true, isPlayerObject, owner, objectStream, false, 0, true, false);
                     }
                 }
             }
diff --git a/MLAPI/NetworkingManagerComponents/Core/SpawnManager.cs b/MLAPI/NetworkingManagerComponents/Core/SpawnManager.cs
@@ -364,8 +364,6 @@ internal static void SendSpawnCallForObject(ulong clientId, NetworkedObject netO
                             writer.WriteUInt64Packed(netObject.PrefabHash);
                         }
                     }
-                    
-                    writer.WriteBool(netObject.DestroyWithScene);
 
                     writer.WriteSinglePacked(netObject.transform.position.x);
                     writer.WriteSinglePacked(netObject.transform.position.y);

Original file line number	Diff line number	Diff line change
`@@ -1050,8 +1050,6 @@ internal void HandleApproval(ulong clientId, ulong? prefabHash, bool approved, V`
`1050`	`1050`	`}`
`1051`	`1051`	`}`
`1052`	`1052`
`1053`		`- writer.WriteBool(_observedObjects[i].DestroyWithScene);`
`1054`		`-`
`1055`	`1053`	`writer.WriteSinglePacked(_observedObjects[i].transform.position.x);`
`1056`	`1054`	`writer.WriteSinglePacked(_observedObjects[i].transform.position.y);`
`1057`	`1055`	`writer.WriteSinglePacked(_observedObjects[i].transform.position.z);`
Original file line number	Diff line number	Diff line change
`@@ -260,13 +260,11 @@ void DelayedSpawnAction(Stream continuationStream)`
`260`	`260`	`}`
`261`	`261`	`}`
`262`	`262`
`263`		`- bool destroyWithScene = continuationReader.ReadBool();`
`264`		`-`
`265`	`263`	`Vector3 pos = new Vector3(continuationReader.ReadSinglePacked(), continuationReader.ReadSinglePacked(), continuationReader.ReadSinglePacked());`
`266`	`264`	`Quaternion rot = Quaternion.Euler(continuationReader.ReadSinglePacked(), continuationReader.ReadSinglePacked(), continuationReader.ReadSinglePacked());`
`267`	`265`
`268`	`266`	`NetworkedObject netObject = SpawnManager.CreateLocalNetworkedObject(softSync, instanceId, prefabHash, pos, rot);`
`269`		`- SpawnManager.SpawnNetworkedObjectLocally(netObject, networkId, softSync, isPlayerObject, ownerId, continuationStream, false, 0, true, destroyWithScene);`
	`267`	`+ SpawnManager.SpawnNetworkedObjectLocally(netObject, networkId, softSync, isPlayerObject, ownerId, continuationStream, false, 0, true, false);`
`270`	`268`	`}`
`271`	`269`
`272`	`270`	`NetworkingManager.Singleton.IsConnectedClient = true;`
`@@ -336,21 +334,14 @@ internal static void HandleAddObject(ulong clientId, Stream stream)`
`336`	`334`	`}`
`337`	`335`	`}`
`338`	`336`
`339`		`- bool destroyWithScene = reader.ReadBool();`
`340`		`-`
`341`	`337`	`Vector3 pos = new Vector3(reader.ReadSinglePacked(), reader.ReadSinglePacked(), reader.ReadSinglePacked());`
`342`	`338`	`Quaternion rot = Quaternion.Euler(reader.ReadSinglePacked(), reader.ReadSinglePacked(), reader.ReadSinglePacked());`
`343`	`339`
`344`	`340`	`bool hasPayload = reader.ReadBool();`
`345`	`341`	`int payLoadLength = hasPayload ? reader.ReadInt32Packed() : 0;`
`346`	`342`
`347`	`343`	`NetworkedObject netObject = SpawnManager.CreateLocalNetworkedObject(softSync, instanceId, prefabHash, pos, rot);`
`348`		`- SpawnManager.SpawnNetworkedObjectLocally(netObject, networkId, softSync, isPlayerObject, ownerId, stream, hasPayload, payLoadLength, true, destroyWithScene);`
`349`		`-`
`350`		`- /*`
`351`		`- NetworkedObject netObject = SpawnManager.CreateSpawnedObject(SpawnManager.GetNetworkedPrefabIndexOfHash(prefabHash), networkId, ownerId, isPlayerObject,`
`352`		`- sceneSpawnedInIndex, sceneDelayedSpawn, destroyWithScene, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), true, stream, hasPayload, payLoadLength, true);`
`353`		`- */`
	`344`	`+ SpawnManager.SpawnNetworkedObjectLocally(netObject, networkId, softSync, isPlayerObject, ownerId, stream, hasPayload, payLoadLength, true, false);`
`354`	`345`	`}`
`355`	`346`	`}`
`356`	`347`
`@@ -443,19 +434,12 @@ internal static void HandleAddObjects(ulong clientId, Stream stream)`
`443`	`434`	`instanceId = 0;`
`444`	`435`	`}`
`445`	`436`	`}`
`446`		`-`
`447`		`- bool destroyWithScene = reader.ReadBool();`
`448`	`437`
`449`	`438`	`Vector3 pos = new Vector3(reader.ReadSinglePacked(), reader.ReadSinglePacked(), reader.ReadSinglePacked());`
`450`	`439`	`Quaternion rot = Quaternion.Euler(reader.ReadSinglePacked(), reader.ReadSinglePacked(), reader.ReadSinglePacked());`
`451`	`440`
`452`		`- /*`
`453`		`- NetworkedObject netObject = SpawnManager.CreateSpawnedObject(SpawnManager.GetNetworkedPrefabIndexOfHash(prefabHash), networkId, ownerId, isPlayerObject,`
`454`		`- sceneSpawnedInIndex, sceneDelayedSpawn, destroyWithScene, new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), true, stream, false, 0, true);`
`455`		`- */`
`456`		`-`
`457`	`441`	`NetworkedObject netObject = SpawnManager.CreateLocalNetworkedObject(softSync, instanceId, prefabHash, pos, rot);`
`458`		`- SpawnManager.SpawnNetworkedObjectLocally(netObject, networkId, softSync, isPlayerObject, ownerId, stream, false, 0, true, destroyWithScene);`
	`442`	`+ SpawnManager.SpawnNetworkedObjectLocally(netObject, networkId, softSync, isPlayerObject, ownerId, stream, false, 0, true, false);`
`459`	`443`	`}`
`460`	`444`	`}`
`461`	`445`	`}`
Original file line number	Diff line number	Diff line change
`@@ -224,8 +224,6 @@ private static void OnSceneUnloadServer(Guid switchSceneGuid)`
`224`	`224`
`225`	`225`	`writer.WriteUInt64Packed(newSceneObjects[i].PrefabHash);`
`226`	`226`
`227`		`- writer.WriteBool(newSceneObjects[i].DestroyWithScene);`
`228`		`-`
`229`	`227`	`writer.WriteSinglePacked(newSceneObjects[i].transform.position.x);`
`230`	`228`	`writer.WriteSinglePacked(newSceneObjects[i].transform.position.y);`
`231`	`229`	`writer.WriteSinglePacked(newSceneObjects[i].transform.position.z);`
`@@ -247,8 +245,6 @@ private static void OnSceneUnloadServer(Guid switchSceneGuid)`
`247`	`245`
`248`	`246`	`writer.WriteUInt64Packed(newSceneObjects[i].NetworkedInstanceId);`
`249`	`247`
`250`		`- writer.WriteBool(newSceneObjects[i].DestroyWithScene);`
`251`		`-`
`252`	`248`	`if (NetworkingManager.Singleton.NetworkConfig.EnableNetworkedVar)`
`253`	`249`	`{`
`254`	`250`	`newSceneObjects[i].WriteNetworkedVarData(stream, NetworkingManager.Singleton.ConnectedClientsList[j].ClientId);`
`@@ -294,14 +290,12 @@ private static void OnSceneUnloadClient(Guid switchSceneGuid, Stream objectStrea`
`294`	`290`	`ulong owner = reader.ReadUInt64Packed();`
`295`	`291`
`296`	`292`	`ulong prefabHash = reader.ReadUInt64Packed();`
`297`		`-`
`298`		`- bool destroyWithScene = reader.ReadBool();`
`299`	`293`
`300`	`294`	`Vector3 position = new Vector3(reader.ReadSinglePacked(), reader.ReadSinglePacked(), reader.ReadSinglePacked());`
`301`	`295`	`Quaternion rotation = Quaternion.Euler(reader.ReadSinglePacked(), reader.ReadSinglePacked(), reader.ReadSinglePacked());`
`302`	`296`
`303`	`297`	`NetworkedObject networkedObject = SpawnManager.CreateLocalNetworkedObject(false, 0, prefabHash, position, rotation);`
`304`		`- SpawnManager.SpawnNetworkedObjectLocally(networkedObject, networkId, true, isPlayerObject, owner, objectStream, false, 0, true, destroyWithScene);`
	`298`	`+ SpawnManager.SpawnNetworkedObjectLocally(networkedObject, networkId, true, isPlayerObject, owner, objectStream, false, 0, true, false);`
`305`	`299`	`}`
`306`	`300`	`}`
`307`	`301`	`}`
`@@ -322,11 +316,9 @@ private static void OnSceneUnloadClient(Guid switchSceneGuid, Stream objectStrea`
`322`	`316`	`ulong owner = reader.ReadUInt64Packed();`
`323`	`317`
`324`	`318`	`ulong instanceId = reader.ReadUInt64Packed();`
`325`		`-`
`326`		`- bool destroyWithScene = reader.ReadBool();`
`327`	`319`
`328`	`320`	`NetworkedObject networkedObject = SpawnManager.CreateLocalNetworkedObject(true, instanceId, 0, null, null);`
`329`		`- SpawnManager.SpawnNetworkedObjectLocally(networkedObject, networkId, true, isPlayerObject, owner, objectStream, false, 0, true, destroyWithScene);`
	`321`	`+ SpawnManager.SpawnNetworkedObjectLocally(networkedObject, networkId, true, isPlayerObject, owner, objectStream, false, 0, true, false);`
`330`	`322`	`}`
`331`	`323`	`}`
`332`	`324`	`}`
Original file line number	Diff line number	Diff line change
`@@ -364,8 +364,6 @@ internal static void SendSpawnCallForObject(ulong clientId, NetworkedObject netO`
`364`	`364`	`writer.WriteUInt64Packed(netObject.PrefabHash);`
`365`	`365`	`}`
`366`	`366`	`}`
`367`		`-`
`368`		`- writer.WriteBool(netObject.DestroyWithScene);`
`369`	`367`
`370`	`368`	`writer.WriteSinglePacked(netObject.transform.position.x);`
`371`	`369`	`writer.WriteSinglePacked(netObject.transform.position.y);`