Skip to content

Commit 0a4cbc3

Browse files
committed
perf: Removed DestroyWithScene syncronization
1 parent 847b8fc commit 0a4cbc3

File tree

4 files changed

+5
-33
lines changed

4 files changed

+5
-33
lines changed

MLAPI/MonoBehaviours/Core/NetworkingManager.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,8 +1050,6 @@ internal void HandleApproval(ulong clientId, ulong? prefabHash, bool approved, V
10501050
}
10511051
}
10521052

1053-
writer.WriteBool(_observedObjects[i].DestroyWithScene);
1054-
10551053
writer.WriteSinglePacked(_observedObjects[i].transform.position.x);
10561054
writer.WriteSinglePacked(_observedObjects[i].transform.position.y);
10571055
writer.WriteSinglePacked(_observedObjects[i].transform.position.z);

MLAPI/NetworkingManagerComponents/Core/InternalMessageHandler.Receive.cs

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -260,13 +260,11 @@ void DelayedSpawnAction(Stream continuationStream)
260260
}
261261
}
262262

263-
bool destroyWithScene = continuationReader.ReadBool();
264-
265263
Vector3 pos = new Vector3(continuationReader.ReadSinglePacked(), continuationReader.ReadSinglePacked(), continuationReader.ReadSinglePacked());
266264
Quaternion rot = Quaternion.Euler(continuationReader.ReadSinglePacked(), continuationReader.ReadSinglePacked(), continuationReader.ReadSinglePacked());
267265

268266
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);
270268
}
271269

272270
NetworkingManager.Singleton.IsConnectedClient = true;
@@ -336,21 +334,14 @@ internal static void HandleAddObject(ulong clientId, Stream stream)
336334
}
337335
}
338336

339-
bool destroyWithScene = reader.ReadBool();
340-
341337
Vector3 pos = new Vector3(reader.ReadSinglePacked(), reader.ReadSinglePacked(), reader.ReadSinglePacked());
342338
Quaternion rot = Quaternion.Euler(reader.ReadSinglePacked(), reader.ReadSinglePacked(), reader.ReadSinglePacked());
343339

344340
bool hasPayload = reader.ReadBool();
345341
int payLoadLength = hasPayload ? reader.ReadInt32Packed() : 0;
346342

347343
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);
354345
}
355346
}
356347

@@ -443,19 +434,12 @@ internal static void HandleAddObjects(ulong clientId, Stream stream)
443434
instanceId = 0;
444435
}
445436
}
446-
447-
bool destroyWithScene = reader.ReadBool();
448437

449438
Vector3 pos = new Vector3(reader.ReadSinglePacked(), reader.ReadSinglePacked(), reader.ReadSinglePacked());
450439
Quaternion rot = Quaternion.Euler(reader.ReadSinglePacked(), reader.ReadSinglePacked(), reader.ReadSinglePacked());
451440

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-
457441
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);
459443
}
460444
}
461445
}

MLAPI/NetworkingManagerComponents/Core/NetworkSceneManager.cs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,6 @@ private static void OnSceneUnloadServer(Guid switchSceneGuid)
224224

225225
writer.WriteUInt64Packed(newSceneObjects[i].PrefabHash);
226226

227-
writer.WriteBool(newSceneObjects[i].DestroyWithScene);
228-
229227
writer.WriteSinglePacked(newSceneObjects[i].transform.position.x);
230228
writer.WriteSinglePacked(newSceneObjects[i].transform.position.y);
231229
writer.WriteSinglePacked(newSceneObjects[i].transform.position.z);
@@ -247,8 +245,6 @@ private static void OnSceneUnloadServer(Guid switchSceneGuid)
247245

248246
writer.WriteUInt64Packed(newSceneObjects[i].NetworkedInstanceId);
249247

250-
writer.WriteBool(newSceneObjects[i].DestroyWithScene);
251-
252248
if (NetworkingManager.Singleton.NetworkConfig.EnableNetworkedVar)
253249
{
254250
newSceneObjects[i].WriteNetworkedVarData(stream, NetworkingManager.Singleton.ConnectedClientsList[j].ClientId);
@@ -294,14 +290,12 @@ private static void OnSceneUnloadClient(Guid switchSceneGuid, Stream objectStrea
294290
ulong owner = reader.ReadUInt64Packed();
295291

296292
ulong prefabHash = reader.ReadUInt64Packed();
297-
298-
bool destroyWithScene = reader.ReadBool();
299293

300294
Vector3 position = new Vector3(reader.ReadSinglePacked(), reader.ReadSinglePacked(), reader.ReadSinglePacked());
301295
Quaternion rotation = Quaternion.Euler(reader.ReadSinglePacked(), reader.ReadSinglePacked(), reader.ReadSinglePacked());
302296

303297
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);
305299
}
306300
}
307301
}
@@ -322,11 +316,9 @@ private static void OnSceneUnloadClient(Guid switchSceneGuid, Stream objectStrea
322316
ulong owner = reader.ReadUInt64Packed();
323317

324318
ulong instanceId = reader.ReadUInt64Packed();
325-
326-
bool destroyWithScene = reader.ReadBool();
327319

328320
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);
330322
}
331323
}
332324
}

MLAPI/NetworkingManagerComponents/Core/SpawnManager.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,8 +364,6 @@ internal static void SendSpawnCallForObject(ulong clientId, NetworkedObject netO
364364
writer.WriteUInt64Packed(netObject.PrefabHash);
365365
}
366366
}
367-
368-
writer.WriteBool(netObject.DestroyWithScene);
369367

370368
writer.WriteSinglePacked(netObject.transform.position.x);
371369
writer.WriteSinglePacked(netObject.transform.position.y);

0 commit comments

Comments
 (0)