refactor!: SpawnManager is no longer static #696
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BREAKING CHANGE: SpawnManager is no longer static. Access it with NetworkManager.Singleton.SpawnManager
|
First step towards singleton removal. Makes the SpawnManager instance based. |
0xFA11
reviewed
Apr 1, 2021
| @@ -508,7 +508,7 @@ internal static void NetworkBehaviourUpdate() | |||
| for (int i = 0; i < NetworkManager.Singleton.ConnectedClientsList.Count; i++) | |||
| { | |||
| var client = NetworkManager.Singleton.ConnectedClientsList[i]; | |||
| var spawnedObjs = NetworkSpawnManager.SpawnedObjectsList; | |||
| var spawnedObjs = NetworkManager.Singleton.SpawnManager.SpawnedObjectsList; | |||
There was a problem hiding this comment.
Suggested change
| var spawnedObjs = NetworkManager.Singleton.SpawnManager.SpawnedObjectsList; | |
| var spawnedNetworkObjects = NetworkManager.SpawnManager.SpawnedObjectsList; |
There was a problem hiding this comment.
I agree and disagree, but mostly disagree. The name change is maybe valid (though having small insignificant names for insignificant variables and vice versa is a style choice I actually prefer), but there's also the "when in Rome" principal where we want to make the PR as focused on the actual change at hand, not mix in some minor unrelated style edits to keep the signal / noise ratio high.
There was a problem hiding this comment.
I don't understand why you'd consider this change in a separate PR.
we're changing it from:
NetworkSpawnManager.SpawnedObjectsList
to
NetworkManager.Singleton.SpawnManager.SpawnedObjectsList
already.
my only suggestion here is to kill .Singleton part as well
NetworkManager.SpawnManager.SpawnedObjectsList
because there is already NetworkBehaviour.NetworkManager property available, so there is no need to access NetworkManager over NetworkManager.Singleton instead of NetworkBehaviour.NetworkManager.
I do not think it should go under a separate PR — we are making a change there already, let's make it even better.
There was a problem hiding this comment.
This will come in my next PR!
That's where I will convert the whole NetworkObject & Behaviour.
0xFA11
reviewed
Apr 1, 2021
| @@ -532,7 +532,7 @@ internal static void NetworkBehaviourUpdate() | |||
| else | |||
| { | |||
| // when client updates the sever, it tells it about all its objects | |||
| foreach (var sobj in NetworkSpawnManager.SpawnedObjectsList) | |||
| foreach (var sobj in NetworkManager.Singleton.SpawnManager.SpawnedObjectsList) | |||
There was a problem hiding this comment.
Suggested change
| foreach (var sobj in NetworkManager.Singleton.SpawnManager.SpawnedObjectsList) | |
| var spawnedNetworkObjects = NetworkManager.SpawnManager.SpawnedObjectsList; | |
| foreach (var networkObject in spawnedNetworkObjects) |
There was a problem hiding this comment.
Ditto as above, actually making the induction variable longer doesn't to me improve readability
0xFA11
reviewed
Apr 1, 2021
| @@ -541,7 +541,7 @@ internal static void NetworkBehaviourUpdate() | |||
| } | |||
|
|
|||
| // Now, reset all the no-longer-dirty variables | |||
| foreach (var sobj in NetworkSpawnManager.SpawnedObjectsList) | |||
| foreach (var sobj in NetworkManager.Singleton.SpawnManager.SpawnedObjectsList) | |||
There was a problem hiding this comment.
Suggested change
| foreach (var sobj in NetworkManager.Singleton.SpawnManager.SpawnedObjectsList) | |
| foreach (var networkObject in spawnedNetworkObjects) |
0xFA11
reviewed
Apr 1, 2021
| @@ -1006,6 +1006,6 @@ internal static void SetNetworkVariableData(List<INetworkVariable> networkVariab | |||
| /// </summary> | |||
| /// <param name="networkId"></param> | |||
| /// <returns></returns> | |||
| protected NetworkObject GetNetworkObject(ulong networkId) => NetworkSpawnManager.SpawnedObjects.ContainsKey(networkId) ? NetworkSpawnManager.SpawnedObjects[networkId] : null; | |||
| protected NetworkObject GetNetworkObject(ulong networkId) => NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(networkId) ? NetworkManager.Singleton.SpawnManager.SpawnedObjects[networkId] : null; | |||
There was a problem hiding this comment.
Suggested change
| protected NetworkObject GetNetworkObject(ulong networkId) => NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(networkId) ? NetworkManager.Singleton.SpawnManager.SpawnedObjects[networkId] : null; | |
| protected NetworkObject GetNetworkObject(ulong networkObjectId) => NetworkManager.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId) ? NetworkManager.SpawnManager.SpawnedObjects[networkObjectId] : null; |
0xFA11
reviewed
Apr 1, 2021
| @@ -1380,7 +1387,7 @@ internal void OnClientDisconnectFromServer(ulong clientId) | |||
|
|
|||
| // TODO: Could(should?) be replaced with more memory per client, by storing the visiblity | |||
|
|
|||
| foreach (var sobj in NetworkSpawnManager.SpawnedObjectsList) | |||
| foreach (var sobj in SpawnManager.SpawnedObjectsList) | |||
There was a problem hiding this comment.
Suggested change
| foreach (var sobj in SpawnManager.SpawnedObjectsList) | |
| foreach (var networkObject in SpawnManager.SpawnedObjectsList) |
0xFA11
reviewed
Apr 1, 2021
|
|
||
| ConnectedClients[ownerClientId].PlayerObject = networkObject; | ||
| } | ||
|
|
||
| m_ObservedObjects.Clear(); | ||
|
|
||
| foreach (var sobj in NetworkSpawnManager.SpawnedObjectsList) | ||
| foreach (var sobj in SpawnManager.SpawnedObjectsList) |
There was a problem hiding this comment.
Suggested change
| foreach (var sobj in SpawnManager.SpawnedObjectsList) | |
| foreach (var networkObject in SpawnManager.SpawnedObjectsList) |
0xFA11
reviewed
Apr 1, 2021
| @@ -225,7 +225,7 @@ public void NetworkShow(ulong clientId, Stream payload = null) | |||
| // Send spawn call | |||
| Observers.Add(clientId); | |||
|
|
|||
| NetworkSpawnManager.SendSpawnCallForObject(clientId, this, payload); | |||
| NetworkManager.Singleton.SpawnManager.SendSpawnCallForObject(clientId, this, payload); | |||
There was a problem hiding this comment.
Suggested change
| NetworkManager.Singleton.SpawnManager.SendSpawnCallForObject(clientId, this, payload); | |
| NetworkManager.SpawnManager.SendSpawnCallForObject(clientId, this, payload); |
0xFA11
reviewed
Apr 1, 2021
| @@ -265,7 +265,7 @@ public static void NetworkShow(List<NetworkObject> networkObjects, ulong clientI | |||
| // Send spawn call | |||
| networkObjects[i].Observers.Add(clientId); | |||
|
|
|||
| NetworkSpawnManager.WriteSpawnCallForObject(buffer, clientId, networkObjects[i], payload); | |||
| NetworkManager.Singleton.SpawnManager.WriteSpawnCallForObject(buffer, clientId, networkObjects[i], payload); | |||
There was a problem hiding this comment.
Suggested change
| NetworkManager.Singleton.SpawnManager.WriteSpawnCallForObject(buffer, clientId, networkObjects[i], payload); | |
| NetworkManager.SpawnManager.WriteSpawnCallForObject(buffer, clientId, networkObjects[i], payload); |
0xFA11
reviewed
Apr 1, 2021
| @@ -361,9 +361,9 @@ public static void NetworkHide(List<NetworkObject> networkObjects, ulong clientI | |||
|
|
|||
| private void OnDestroy() | |||
| { | |||
| if (NetworkManager.Singleton != null && NetworkSpawnManager.SpawnedObjects.ContainsKey(NetworkObjectId)) | |||
| if (NetworkManager.Singleton != null && NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(NetworkObjectId)) | |||
There was a problem hiding this comment.
Suggested change
| if (NetworkManager.Singleton != null && NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(NetworkObjectId)) | |
| if (NetworkManager.Singleton != null && NetworkManager.SpawnManager.SpawnedObjects.ContainsKey(NetworkObjectId)) |
0xFA11
reviewed
Apr 1, 2021
| { | ||
| NetworkSpawnManager.OnDestroyObject(NetworkObjectId, false); | ||
| NetworkManager.Singleton.SpawnManager.OnDestroyObject(NetworkObjectId, false); |
There was a problem hiding this comment.
Suggested change
| NetworkManager.Singleton.SpawnManager.OnDestroyObject(NetworkObjectId, false); | |
| NetworkManager.SpawnManager.OnDestroyObject(NetworkObjectId, false); |
0xFA11
reviewed
Apr 1, 2021
| @@ -385,13 +385,13 @@ private void SpawnInternal(Stream spawnPayload, bool destroyWithScene, ulong? ow | |||
| spawnPayload.Position = 0; | |||
| } | |||
|
|
|||
| NetworkSpawnManager.SpawnNetworkObjectLocally(this, NetworkSpawnManager.GetNetworkObjectId(), false, playerObject, ownerClientId, spawnPayload, spawnPayload != null, spawnPayload == null ? 0 : (int)spawnPayload.Length, false, destroyWithScene); | |||
| NetworkManager.Singleton.SpawnManager.SpawnNetworkObjectLocally(this, NetworkManager.Singleton.SpawnManager.GetNetworkObjectId(), false, playerObject, ownerClientId, spawnPayload, spawnPayload != null, spawnPayload == null ? 0 : (int)spawnPayload.Length, false, destroyWithScene); | |||
There was a problem hiding this comment.
Suggested change
| NetworkManager.Singleton.SpawnManager.SpawnNetworkObjectLocally(this, NetworkManager.Singleton.SpawnManager.GetNetworkObjectId(), false, playerObject, ownerClientId, spawnPayload, spawnPayload != null, spawnPayload == null ? 0 : (int)spawnPayload.Length, false, destroyWithScene); | |
| NetworkManager.SpawnManager.SpawnNetworkObjectLocally(this, NetworkManager.SpawnManager.GetNetworkObjectId(), false, playerObject, ownerClientId, spawnPayload, spawnPayload != null, spawnPayload == null ? 0 : (int)spawnPayload.Length, false, destroyWithScene); |
0xFA11
reviewed
Apr 1, 2021
|
|
||
| for (int i = 0; i < NetworkManager.Singleton.ConnectedClientsList.Count; i++) | ||
| { | ||
| if (Observers.Contains(NetworkManager.Singleton.ConnectedClientsList[i].ClientId)) | ||
| { | ||
| NetworkSpawnManager.SendSpawnCallForObject(NetworkManager.Singleton.ConnectedClientsList[i].ClientId, this, spawnPayload); | ||
| NetworkManager.Singleton.SpawnManager.SendSpawnCallForObject(NetworkManager.Singleton.ConnectedClientsList[i].ClientId, this, spawnPayload); |
There was a problem hiding this comment.
Suggested change
| NetworkManager.Singleton.SpawnManager.SendSpawnCallForObject(NetworkManager.Singleton.ConnectedClientsList[i].ClientId, this, spawnPayload); | |
| NetworkManager.SpawnManager.SendSpawnCallForObject(NetworkManager.Singleton.ConnectedClientsList[i].ClientId, this, spawnPayload); |
0xFA11
reviewed
Apr 1, 2021
| @@ -433,7 +433,7 @@ public void SpawnAsPlayerObject(ulong clientId, Stream spawnPayload = null, bool | |||
| /// </summary> | |||
| public void Despawn(bool destroy = false) | |||
| { | |||
| NetworkSpawnManager.DespawnObject(this, destroy); | |||
| NetworkManager.Singleton.SpawnManager.DespawnObject(this, destroy); | |||
There was a problem hiding this comment.
Suggested change
| NetworkManager.Singleton.SpawnManager.DespawnObject(this, destroy); | |
| NetworkManager.SpawnManager.DespawnObject(this, destroy); |
0xFA11
reviewed
Apr 1, 2021
| @@ -442,7 +442,7 @@ public void Despawn(bool destroy = false) | |||
| /// </summary> | |||
| public void RemoveOwnership() | |||
| { | |||
| NetworkSpawnManager.RemoveOwnership(this); | |||
| NetworkManager.Singleton.SpawnManager.RemoveOwnership(this); | |||
There was a problem hiding this comment.
Suggested change
| NetworkManager.Singleton.SpawnManager.RemoveOwnership(this); | |
| NetworkManager.SpawnManager.RemoveOwnership(this); |
0xFA11
reviewed
Apr 1, 2021
| @@ -451,7 +451,7 @@ public void RemoveOwnership() | |||
| /// <param name="newOwnerClientId">The new owner clientId</param> | |||
| public void ChangeOwnership(ulong newOwnerClientId) | |||
| { | |||
| NetworkSpawnManager.ChangeOwnership(this, newOwnerClientId); | |||
| NetworkManager.Singleton.SpawnManager.ChangeOwnership(this, newOwnerClientId); | |||
There was a problem hiding this comment.
Suggested change
| NetworkManager.Singleton.SpawnManager.ChangeOwnership(this, newOwnerClientId); | |
| NetworkManager.SpawnManager.ChangeOwnership(this, newOwnerClientId); |
0xFA11
reviewed
Apr 1, 2021
| @@ -111,11 +111,11 @@ void DelayedSpawnAction(Stream continuationStream) | |||
| { | |||
| if (!NetworkManager.Singleton.NetworkConfig.EnableSceneManagement || NetworkManager.Singleton.NetworkConfig.UsePrefabSync) | |||
| { | |||
| NetworkSpawnManager.DestroySceneObjects(); | |||
| NetworkManager.Singleton.SpawnManager.DestroySceneObjects(); | |||
There was a problem hiding this comment.
Suggested change
| NetworkManager.Singleton.SpawnManager.DestroySceneObjects(); | |
| NetworkManager.SpawnManager.DestroySceneObjects(); |
0xFA11
reviewed
Apr 1, 2021
| } | ||
| else | ||
| { | ||
| NetworkSpawnManager.ClientCollectSoftSyncSceneObjectSweep(null); | ||
| NetworkManager.Singleton.SpawnManager.ClientCollectSoftSyncSceneObjectSweep(null); |
There was a problem hiding this comment.
Suggested change
| NetworkManager.Singleton.SpawnManager.ClientCollectSoftSyncSceneObjectSweep(null); | |
| NetworkManager.SpawnManager.ClientCollectSoftSyncSceneObjectSweep(null); |
0xFA11
reviewed
Apr 1, 2021
Comment on lines
+169
to
+170
| var networkObject = NetworkManager.Singleton.SpawnManager.CreateLocalNetworkObject(softSync, instanceId, prefabHash, ownerId, parentNetworkId, pos, rot); | ||
| NetworkManager.Singleton.SpawnManager.SpawnNetworkObjectLocally(networkObject, networkId, softSync, isPlayerObject, ownerId, continuationStream, false, 0, true, false); |
There was a problem hiding this comment.
Suggested change
| var networkObject = NetworkManager.Singleton.SpawnManager.CreateLocalNetworkObject(softSync, instanceId, prefabHash, ownerId, parentNetworkId, pos, rot); | |
| NetworkManager.Singleton.SpawnManager.SpawnNetworkObjectLocally(networkObject, networkId, softSync, isPlayerObject, ownerId, continuationStream, false, 0, true, false); | |
| var networkObject = NetworkManager.SpawnManager.CreateLocalNetworkObject(softSync, instanceId, prefabHash, ownerId, parentNetworkId, pos, rot); | |
| NetworkManager.SpawnManager.SpawnNetworkObjectLocally(networkObject, networkId, softSync, isPlayerObject, ownerId, continuationStream, false, 0, true, false); |
0xFA11
reviewed
Apr 1, 2021
Comment on lines
+186
to
188
| NetworkManager.Singleton.SpawnManager.CleanDiffedSceneObjects(); | ||
| NetworkManager.Singleton.IsConnectedClient = true; | ||
| NetworkManager.Singleton.InvokeOnClientConnectedCallback(NetworkManager.Singleton.LocalClientId); |
There was a problem hiding this comment.
Suggested change
| NetworkManager.Singleton.SpawnManager.CleanDiffedSceneObjects(); | |
| NetworkManager.Singleton.IsConnectedClient = true; | |
| NetworkManager.Singleton.InvokeOnClientConnectedCallback(NetworkManager.Singleton.LocalClientId); | |
| NetworkManager.SpawnManager.CleanDiffedSceneObjects(); | |
| NetworkManager.IsConnectedClient = true; | |
| NetworkManager.InvokeOnClientConnectedCallback(NetworkManager.Singleton.LocalClientId); |
0xFA11
reviewed
Apr 1, 2021
Comment on lines
+276
to
+277
| var networkObject = NetworkManager.Singleton.SpawnManager.CreateLocalNetworkObject(softSync, instanceId, prefabHash, ownerClientId, parentNetworkId, pos, rot); | ||
| NetworkManager.Singleton.SpawnManager.SpawnNetworkObjectLocally(networkObject, networkId, softSync, isPlayerObject, ownerClientId, stream, hasPayload, payLoadLength, true, false); |
There was a problem hiding this comment.
Suggested change
| var networkObject = NetworkManager.Singleton.SpawnManager.CreateLocalNetworkObject(softSync, instanceId, prefabHash, ownerClientId, parentNetworkId, pos, rot); | |
| NetworkManager.Singleton.SpawnManager.SpawnNetworkObjectLocally(networkObject, networkId, softSync, isPlayerObject, ownerClientId, stream, hasPayload, payLoadLength, true, false); | |
| var networkObject = NetworkManager.SpawnManager.CreateLocalNetworkObject(softSync, instanceId, prefabHash, ownerClientId, parentNetworkId, pos, rot); | |
| NetworkManager.SpawnManager.SpawnNetworkObjectLocally(networkObject, networkId, softSync, isPlayerObject, ownerClientId, stream, hasPayload, payLoadLength, true, false); |
0xFA11
reviewed
Apr 1, 2021
| @@ -302,7 +302,7 @@ internal static void HandleDestroyObject(ulong clientId, Stream stream) | |||
| using (var reader = PooledNetworkReader.Get(stream)) | |||
| { | |||
| ulong networkId = reader.ReadUInt64Packed(); | |||
| NetworkSpawnManager.OnDestroyObject(networkId, true); | |||
| NetworkManager.Singleton.SpawnManager.OnDestroyObject(networkId, true); | |||
There was a problem hiding this comment.
Suggested change
| NetworkManager.Singleton.SpawnManager.OnDestroyObject(networkId, true); | |
| NetworkManager.SpawnManager.OnDestroyObject(networkObjectId, true); |
0xFA11
reviewed
Apr 1, 2021
| @@ -354,19 +354,19 @@ internal static void HandleChangeOwner(ulong clientId, Stream stream) | |||
| ulong networkId = reader.ReadUInt64Packed(); | |||
| ulong ownerClientId = reader.ReadUInt64Packed(); | |||
|
|
|||
| if (NetworkSpawnManager.SpawnedObjects[networkId].OwnerClientId == NetworkManager.Singleton.LocalClientId) | |||
| if (NetworkManager.Singleton.SpawnManager.SpawnedObjects[networkId].OwnerClientId == NetworkManager.Singleton.LocalClientId) | |||
There was a problem hiding this comment.
Suggested change
| if (NetworkManager.Singleton.SpawnManager.SpawnedObjects[networkId].OwnerClientId == NetworkManager.Singleton.LocalClientId) | |
| if (NetworkManager.SpawnManager.SpawnedObjects[networkObjectId].OwnerClientId == NetworkManager.LocalClientId) |
0xFA11
reviewed
Apr 1, 2021
| { | ||
| //We are current owner. | ||
| NetworkSpawnManager.SpawnedObjects[networkId].InvokeBehaviourOnLostOwnership(); | ||
| NetworkManager.Singleton.SpawnManager.SpawnedObjects[networkId].InvokeBehaviourOnLostOwnership(); |
There was a problem hiding this comment.
Suggested change
| NetworkManager.Singleton.SpawnManager.SpawnedObjects[networkId].InvokeBehaviourOnLostOwnership(); | |
| NetworkManager.SpawnManager.SpawnedObjects[networkObjectId].InvokeBehaviourOnLostOwnership(); |
0xFA11
reviewed
Apr 1, 2021
| } | ||
|
|
||
| if (ownerClientId == NetworkManager.Singleton.LocalClientId) | ||
| { | ||
| //We are new owner. | ||
| NetworkSpawnManager.SpawnedObjects[networkId].InvokeBehaviourOnGainedOwnership(); | ||
| NetworkManager.Singleton.SpawnManager.SpawnedObjects[networkId].InvokeBehaviourOnGainedOwnership(); |
There was a problem hiding this comment.
Suggested change
| NetworkManager.Singleton.SpawnManager.SpawnedObjects[networkId].InvokeBehaviourOnGainedOwnership(); | |
| NetworkManager.SpawnManager.SpawnedObjects[networkObjectId].InvokeBehaviourOnGainedOwnership(); |
0xFA11
reviewed
Apr 1, 2021
| } | ||
|
|
||
| NetworkSpawnManager.SpawnedObjects[networkId].OwnerClientId = ownerClientId; | ||
| NetworkManager.Singleton.SpawnManager.SpawnedObjects[networkId].OwnerClientId = ownerClientId; |
There was a problem hiding this comment.
Suggested change
| NetworkManager.Singleton.SpawnManager.SpawnedObjects[networkId].OwnerClientId = ownerClientId; | |
| NetworkManager.SpawnManager.SpawnedObjects[networkObjectId].OwnerClientId = ownerClientId; |
0xFA11
reviewed
Apr 1, 2021
| @@ -446,9 +446,9 @@ internal static void HandleNetworkVariableDelta(ulong clientId, Stream stream, A | |||
| ulong networkObjectId = reader.ReadUInt64Packed(); | |||
| ushort networkBehaviourIndex = reader.ReadUInt16Packed(); | |||
|
|
|||
| if (NetworkSpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) | |||
| if (NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) | |||
There was a problem hiding this comment.
Suggested change
| if (NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) | |
| if (NetworkManager.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) |
0xFA11
reviewed
Apr 1, 2021
| { | ||
| NetworkBehaviour instance = NetworkSpawnManager.SpawnedObjects[networkObjectId].GetNetworkBehaviourAtOrderIndex(networkBehaviourIndex); | ||
| NetworkBehaviour instance = NetworkManager.Singleton.SpawnManager.SpawnedObjects[networkObjectId].GetNetworkBehaviourAtOrderIndex(networkBehaviourIndex); |
There was a problem hiding this comment.
Suggested change
| NetworkBehaviour instance = NetworkManager.Singleton.SpawnManager.SpawnedObjects[networkObjectId].GetNetworkBehaviourAtOrderIndex(networkBehaviourIndex); | |
| var networkBehaviour = NetworkManager.SpawnManager.SpawnedObjects[networkObjectId].GetNetworkBehaviourAtOrderIndex(networkBehaviourIndex); |
0xFA11
reviewed
Apr 1, 2021
| @@ -504,9 +504,9 @@ internal static void HandleNetworkVariableUpdate(ulong clientId, Stream stream, | |||
| ulong networkObjectId = reader.ReadUInt64Packed(); | |||
| ushort networkBehaviourIndex = reader.ReadUInt16Packed(); | |||
|
|
|||
| if (NetworkSpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) | |||
| if (NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) | |||
There was a problem hiding this comment.
Suggested change
| if (NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) | |
| if (NetworkManager.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) |
0xFA11
reviewed
Apr 1, 2021
| { | ||
| var networkBehaviour = NetworkSpawnManager.SpawnedObjects[networkObjectId].GetNetworkBehaviourAtOrderIndex(networkBehaviourIndex); | ||
| var networkBehaviour = NetworkManager.Singleton.SpawnManager.SpawnedObjects[networkObjectId].GetNetworkBehaviourAtOrderIndex(networkBehaviourIndex); |
There was a problem hiding this comment.
Suggested change
| var networkBehaviour = NetworkManager.Singleton.SpawnManager.SpawnedObjects[networkObjectId].GetNetworkBehaviourAtOrderIndex(networkBehaviourIndex); | |
| var networkBehaviour = NetworkManager.SpawnManager.SpawnedObjects[networkObjectId].GetNetworkBehaviourAtOrderIndex(networkBehaviourIndex); |
0xFA11
reviewed
Apr 1, 2021
| @@ -58,7 +58,7 @@ public void ProcessReceiveQueue(NetworkUpdateStage currentStage, bool isTesting) | |||
|
|
|||
| if (!isTesting) | |||
| { | |||
| NetworkManager.InvokeRpc(currentQueueItem); | |||
| NetworkManager.Singleton.InvokeRpc(currentQueueItem); | |||
There was a problem hiding this comment.
Suggested change
| NetworkManager.Singleton.InvokeRpc(currentQueueItem); | |
| NetworkManager.InvokeRpc(currentQueueItem); |
There was a problem hiding this comment.
Still not following how this would be valid
There was a problem hiding this comment.
NetworkManager.InvokeRpc is a static function.
0xFA11
reviewed
Apr 1, 2021
| @@ -118,7 +118,7 @@ public static SceneSwitchProgress SwitchScene(string sceneName) | |||
| return null; | |||
| } | |||
|
|
|||
| NetworkSpawnManager.ServerDestroySpawnedSceneObjects(); //Destroy current scene objects before switching. | |||
| NetworkManager.Singleton.SpawnManager.ServerDestroySpawnedSceneObjects(); //Destroy current scene objects before switching. | |||
There was a problem hiding this comment.
Suggested change
| NetworkManager.Singleton.SpawnManager.ServerDestroySpawnedSceneObjects(); //Destroy current scene objects before switching. | |
| NetworkManager.SpawnManager.ServerDestroySpawnedSceneObjects(); //Destroy current scene objects before switching. |
0xFA11
reviewed
Apr 1, 2021
| @@ -241,7 +241,7 @@ private static void OnSceneUnloadServer(Guid switchSceneGuid) | |||
| { | |||
| if (networkObjects[i].IsSceneObject == null) | |||
| { | |||
| NetworkSpawnManager.SpawnNetworkObjectLocally(networkObjects[i], NetworkSpawnManager.GetNetworkObjectId(), true, false, null, null, false, 0, false, true); | |||
| NetworkManager.Singleton.SpawnManager.SpawnNetworkObjectLocally(networkObjects[i], NetworkManager.Singleton.SpawnManager.GetNetworkObjectId(), true, false, null, null, false, 0, false, true); | |||
There was a problem hiding this comment.
Suggested change
| NetworkManager.Singleton.SpawnManager.SpawnNetworkObjectLocally(networkObjects[i], NetworkManager.Singleton.SpawnManager.GetNetworkObjectId(), true, false, null, null, false, 0, false, true); | |
| NetworkManager.SpawnManager.SpawnNetworkObjectLocally(networkObjects[i], NetworkManager.SpawnManager.GetNetworkObjectId(), true, false, null, null, false, 0, false, true); |
0xFA11
reviewed
Apr 1, 2021
| @@ -337,7 +337,7 @@ private static void OnSceneUnloadClient(Guid switchSceneGuid, Stream objectStrea | |||
| { | |||
| if (!NetworkManager.Singleton.NetworkConfig.EnableSceneManagement || NetworkManager.Singleton.NetworkConfig.UsePrefabSync) | |||
| { | |||
| NetworkSpawnManager.DestroySceneObjects(); | |||
| NetworkManager.Singleton.SpawnManager.DestroySceneObjects(); | |||
There was a problem hiding this comment.
Suggested change
| NetworkManager.Singleton.SpawnManager.DestroySceneObjects(); | |
| NetworkManager.SpawnManager.DestroySceneObjects(); |
0xFA11
reviewed
Apr 1, 2021
Comment on lines
+369
to
+370
| var networkObject = NetworkManager.Singleton.SpawnManager.CreateLocalNetworkObject(false, 0, prefabHash, ownerClientId, parentNetworkId, position, rotation); | ||
| NetworkManager.Singleton.SpawnManager.SpawnNetworkObjectLocally(networkObject, networkId, true, isPlayerObject, ownerClientId, objectStream, false, 0, true, false); |
There was a problem hiding this comment.
Suggested change
| var networkObject = NetworkManager.Singleton.SpawnManager.CreateLocalNetworkObject(false, 0, prefabHash, ownerClientId, parentNetworkId, position, rotation); | |
| NetworkManager.Singleton.SpawnManager.SpawnNetworkObjectLocally(networkObject, networkId, true, isPlayerObject, ownerClientId, objectStream, false, 0, true, false); | |
| var networkObject = NetworkManager.SpawnManager.CreateLocalNetworkObject(false, 0, prefabHash, ownerClientId, parentNetworkId, position, rotation); | |
| NetworkManager.SpawnManager.SpawnNetworkObjectLocally(networkObject, networkId, true, isPlayerObject, ownerClientId, objectStream, false, 0, true, false); |
0xFA11
reviewed
Apr 1, 2021
| @@ -387,7 +387,7 @@ private static void OnSceneUnloadClient(Guid switchSceneGuid, Stream objectStrea | |||
| else | |||
| { | |||
| var networkObjects = UnityEngine.Object.FindObjectsOfType<NetworkObject>(); | |||
| NetworkSpawnManager.ClientCollectSoftSyncSceneObjectSweep(networkObjects); | |||
| NetworkManager.Singleton.SpawnManager.ClientCollectSoftSyncSceneObjectSweep(networkObjects); | |||
There was a problem hiding this comment.
Suggested change
| NetworkManager.Singleton.SpawnManager.ClientCollectSoftSyncSceneObjectSweep(networkObjects); | |
| NetworkManager.SpawnManager.ClientCollectSoftSyncSceneObjectSweep(networkObjects); |
0xFA11
reviewed
Apr 1, 2021
Comment on lines
+411
to
+412
| var networkObject = NetworkManager.Singleton.SpawnManager.CreateLocalNetworkObject(true, instanceId, 0, ownerClientId, parentNetworkId, null, null); | ||
| NetworkManager.Singleton.SpawnManager.SpawnNetworkObjectLocally(networkObject, networkId, true, isPlayerObject, ownerClientId, objectStream, false, 0, true, false); |
There was a problem hiding this comment.
Suggested change
| var networkObject = NetworkManager.Singleton.SpawnManager.CreateLocalNetworkObject(true, instanceId, 0, ownerClientId, parentNetworkId, null, null); | |
| NetworkManager.Singleton.SpawnManager.SpawnNetworkObjectLocally(networkObject, networkId, true, isPlayerObject, ownerClientId, objectStream, false, 0, true, false); | |
| var networkObject = NetworkManager.SpawnManager.CreateLocalNetworkObject(true, instanceId, 0, ownerClientId, parentNetworkId, null, null); | |
| NetworkManager.SpawnManager.SpawnNetworkObjectLocally(networkObject, networkId, true, isPlayerObject, ownerClientId, objectStream, false, 0, true, false); |
0xFA11
reviewed
Apr 1, 2021
| @@ -470,7 +470,7 @@ internal static void RemoveClientFromSceneSwitchProgresses(ulong clientId) | |||
| private static void MoveObjectsToDontDestroyOnLoad() | |||
| { | |||
| // Move ALL NetworkObjects to the temp scene | |||
| var objectsToKeep = NetworkSpawnManager.SpawnedObjectsList; | |||
| var objectsToKeep = NetworkManager.Singleton.SpawnManager.SpawnedObjectsList; | |||
There was a problem hiding this comment.
Suggested change
| var objectsToKeep = NetworkManager.Singleton.SpawnManager.SpawnedObjectsList; | |
| var objectsToKeep = NetworkManager.SpawnManager.SpawnedObjectsList; |
0xFA11
reviewed
Apr 1, 2021
| @@ -487,7 +487,7 @@ private static void MoveObjectsToDontDestroyOnLoad() | |||
| private static void MoveObjectsToScene(Scene scene) | |||
| { | |||
| // Move ALL NetworkObjects to the temp scene | |||
| var objectsToKeep = NetworkSpawnManager.SpawnedObjectsList; | |||
| var objectsToKeep = NetworkManager.Singleton.SpawnManager.SpawnedObjectsList; | |||
There was a problem hiding this comment.
Suggested change
| var objectsToKeep = NetworkManager.Singleton.SpawnManager.SpawnedObjectsList; | |
| var objectsToKeep = NetworkManager.SpawnManager.SpawnedObjectsList; |
0xFA11
reviewed
Apr 1, 2021
| @@ -243,9 +243,9 @@ public object ReadObjectPacked(Type type) | |||
| { | |||
| ulong networkObjectId = ReadUInt64Packed(); | |||
|
|
|||
| if (NetworkSpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) | |||
| if (NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) | |||
There was a problem hiding this comment.
Suggested change
| if (NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) | |
| if (NetworkManager.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) |
0xFA11
reviewed
Apr 1, 2021
| { | ||
| return NetworkSpawnManager.SpawnedObjects[networkObjectId].gameObject; | ||
| return NetworkManager.Singleton.SpawnManager.SpawnedObjects[networkObjectId].gameObject; |
There was a problem hiding this comment.
Suggested change
| return NetworkManager.Singleton.SpawnManager.SpawnedObjects[networkObjectId].gameObject; | |
| return NetworkManager.SpawnManager.SpawnedObjects[networkObjectId].gameObject; |
0xFA11
reviewed
Apr 1, 2021
| @@ -260,9 +260,9 @@ public object ReadObjectPacked(Type type) | |||
| { | |||
| ulong networkObjectId = ReadUInt64Packed(); | |||
|
|
|||
| if (NetworkSpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) | |||
| if (NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) | |||
There was a problem hiding this comment.
Suggested change
| if (NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) | |
| if (NetworkManager.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) |
0xFA11
reviewed
Apr 1, 2021
| { | ||
| return NetworkSpawnManager.SpawnedObjects[networkObjectId]; | ||
| return NetworkManager.Singleton.SpawnManager.SpawnedObjects[networkObjectId]; |
There was a problem hiding this comment.
Suggested change
| return NetworkManager.Singleton.SpawnManager.SpawnedObjects[networkObjectId]; | |
| return NetworkManager.SpawnManager.SpawnedObjects[networkObjectId]; |
0xFA11
reviewed
Apr 1, 2021
| @@ -277,9 +277,9 @@ public object ReadObjectPacked(Type type) | |||
| { | |||
| ulong networkObjectId = ReadUInt64Packed(); | |||
| ushort behaviourId = ReadUInt16Packed(); | |||
| if (NetworkSpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) | |||
| if (NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) | |||
There was a problem hiding this comment.
Suggested change
| if (NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) | |
| if (NetworkManager.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) |
0xFA11
reviewed
Apr 1, 2021
| { | ||
| return NetworkSpawnManager.SpawnedObjects[networkObjectId].GetNetworkBehaviourAtOrderIndex(behaviourId); | ||
| return NetworkManager.Singleton.SpawnManager.SpawnedObjects[networkObjectId].GetNetworkBehaviourAtOrderIndex(behaviourId); |
There was a problem hiding this comment.
Suggested change
| return NetworkManager.Singleton.SpawnManager.SpawnedObjects[networkObjectId].GetNetworkBehaviourAtOrderIndex(behaviourId); | |
| return NetworkManager.SpawnManager.SpawnedObjects[networkObjectId].GetNetworkBehaviourAtOrderIndex(behaviourId); |
0xFA11
reviewed
Apr 1, 2021
| @@ -89,6 +89,11 @@ public class NetworkManager : MonoBehaviour, INetworkUpdateSystem, IProfilableTr | |||
| /// </summary> | |||
| public static NetworkManager Singleton { get; private set; } | |||
|
|
|||
| /// <summary> | |||
| /// Gets the SpawnManager for this NetworkManager | |||
There was a problem hiding this comment.
Suggested change
| /// Gets the SpawnManager for this NetworkManager | |
| /// Gets the SpawnManager associated with this NetworkManager |
0xFA11
reviewed
Apr 1, 2021
| NetworkSpawnManager.SpawnedObjectsList.Clear(); | ||
| NetworkSpawnManager.ReleasedNetworkObjectIds.Clear(); | ||
| NetworkSpawnManager.PendingSoftSyncObjects.Clear(); | ||
| // Create spawn manager instance |
There was a problem hiding this comment.
Suggested change
| // Create spawn manager instance |
isn't it obvious already? 😛
|
what might be nicer is to use but all the suggested changes are optional, they're not showstoppers. |
mattwalsh-unity
approved these changes
Apr 2, 2021
TwoTenPvP
force-pushed
the
singleton-removal-spawn-manager
branch
from
84d35b1 to
96b9825
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
BREAKING CHANGE: SpawnManager is no longer static. Access it with NetworkManager.Singleton.SpawnManager