refactor!: SpawnManager is no longer static - #696
Merged
Conversation
BREAKING CHANGE: SpawnManager is no longer static. Access it with NetworkManager.Singleton.SpawnManager
Contributor
Author
|
First step towards singleton removal. Makes the SpawnManager instance based. |
0xFA11
reviewed
Apr 1, 2021
| { | ||
| var client = NetworkManager.Singleton.ConnectedClientsList[i]; | ||
| var spawnedObjs = NetworkSpawnManager.SpawnedObjectsList; | ||
| var spawnedObjs = NetworkManager.Singleton.SpawnManager.SpawnedObjectsList; |
Contributor
There was a problem hiding this comment.
Suggested change
| var spawnedObjs = NetworkManager.Singleton.SpawnManager.SpawnedObjectsList; | |
| var spawnedNetworkObjects = NetworkManager.SpawnManager.SpawnedObjectsList; |
Contributor
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.
Contributor
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.
Contributor
Author
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
| { | ||
| // 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) |
Contributor
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) |
Contributor
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
|
|
||
| // Now, reset all the no-longer-dirty variables | ||
| foreach (var sobj in NetworkSpawnManager.SpawnedObjectsList) | ||
| foreach (var sobj in NetworkManager.Singleton.SpawnManager.SpawnedObjectsList) |
Contributor
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
| /// <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; |
Contributor
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
| // 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) |
Contributor
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
| m_ObservedObjects.Clear(); | ||
|
|
||
| foreach (var sobj in NetworkSpawnManager.SpawnedObjectsList) | ||
| foreach (var sobj in SpawnManager.SpawnedObjectsList) |
Contributor
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
| Observers.Add(clientId); | ||
|
|
||
| NetworkSpawnManager.SendSpawnCallForObject(clientId, this, payload); | ||
| NetworkManager.Singleton.SpawnManager.SendSpawnCallForObject(clientId, this, payload); |
Contributor
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
| networkObjects[i].Observers.Add(clientId); | ||
|
|
||
| NetworkSpawnManager.WriteSpawnCallForObject(buffer, clientId, networkObjects[i], payload); | ||
| NetworkManager.Singleton.SpawnManager.WriteSpawnCallForObject(buffer, clientId, networkObjects[i], payload); |
Contributor
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
| private void OnDestroy() | ||
| { | ||
| if (NetworkManager.Singleton != null && NetworkSpawnManager.SpawnedObjects.ContainsKey(NetworkObjectId)) | ||
| if (NetworkManager.Singleton != null && NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(NetworkObjectId)) |
Contributor
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
| if (NetworkManager.Singleton != null && NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(NetworkObjectId)) | ||
| { | ||
| NetworkSpawnManager.OnDestroyObject(NetworkObjectId, false); | ||
| NetworkManager.Singleton.SpawnManager.OnDestroyObject(NetworkObjectId, false); |
Contributor
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
| } | ||
|
|
||
| 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); |
Contributor
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
| 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); |
Contributor
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
| public void Despawn(bool destroy = false) | ||
| { | ||
| NetworkSpawnManager.DespawnObject(this, destroy); | ||
| NetworkManager.Singleton.SpawnManager.DespawnObject(this, destroy); |
Contributor
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
| public void RemoveOwnership() | ||
| { | ||
| NetworkSpawnManager.RemoveOwnership(this); | ||
| NetworkManager.Singleton.SpawnManager.RemoveOwnership(this); |
Contributor
There was a problem hiding this comment.
Suggested change
| NetworkManager.Singleton.SpawnManager.RemoveOwnership(this); | |
| NetworkManager.SpawnManager.RemoveOwnership(this); |
0xFA11
reviewed
Apr 1, 2021
| public void ChangeOwnership(ulong newOwnerClientId) | ||
| { | ||
| NetworkSpawnManager.ChangeOwnership(this, newOwnerClientId); | ||
| NetworkManager.Singleton.SpawnManager.ChangeOwnership(this, newOwnerClientId); |
Contributor
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
| if (!NetworkManager.Singleton.NetworkConfig.EnableSceneManagement || NetworkManager.Singleton.NetworkConfig.UsePrefabSync) | ||
| { | ||
| NetworkSpawnManager.DestroySceneObjects(); | ||
| NetworkManager.Singleton.SpawnManager.DestroySceneObjects(); |
Contributor
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); |
Contributor
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); |
Contributor
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); |
Contributor
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); |
Contributor
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
| { | ||
| ulong networkId = reader.ReadUInt64Packed(); | ||
| NetworkSpawnManager.OnDestroyObject(networkId, true); | ||
| NetworkManager.Singleton.SpawnManager.OnDestroyObject(networkId, true); |
Contributor
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
| ulong ownerClientId = reader.ReadUInt64Packed(); | ||
|
|
||
| if (NetworkSpawnManager.SpawnedObjects[networkId].OwnerClientId == NetworkManager.Singleton.LocalClientId) | ||
| if (NetworkManager.Singleton.SpawnManager.SpawnedObjects[networkId].OwnerClientId == NetworkManager.Singleton.LocalClientId) |
Contributor
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(); |
Contributor
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
| { | ||
| //We are new owner. | ||
| NetworkSpawnManager.SpawnedObjects[networkId].InvokeBehaviourOnGainedOwnership(); | ||
| NetworkManager.Singleton.SpawnManager.SpawnedObjects[networkId].InvokeBehaviourOnGainedOwnership(); |
Contributor
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; |
Contributor
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
| ushort networkBehaviourIndex = reader.ReadUInt16Packed(); | ||
|
|
||
| if (NetworkSpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) | ||
| if (NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) |
Contributor
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
| if (NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) | ||
| { | ||
| NetworkBehaviour instance = NetworkSpawnManager.SpawnedObjects[networkObjectId].GetNetworkBehaviourAtOrderIndex(networkBehaviourIndex); | ||
| NetworkBehaviour instance = NetworkManager.Singleton.SpawnManager.SpawnedObjects[networkObjectId].GetNetworkBehaviourAtOrderIndex(networkBehaviourIndex); |
Contributor
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
| ushort networkBehaviourIndex = reader.ReadUInt16Packed(); | ||
|
|
||
| if (NetworkSpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) | ||
| if (NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) |
Contributor
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
| if (NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) | ||
| { | ||
| var networkBehaviour = NetworkSpawnManager.SpawnedObjects[networkObjectId].GetNetworkBehaviourAtOrderIndex(networkBehaviourIndex); | ||
| var networkBehaviour = NetworkManager.Singleton.SpawnManager.SpawnedObjects[networkObjectId].GetNetworkBehaviourAtOrderIndex(networkBehaviourIndex); |
Contributor
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
| if (!isTesting) | ||
| { | ||
| NetworkManager.InvokeRpc(currentQueueItem); | ||
| NetworkManager.Singleton.InvokeRpc(currentQueueItem); |
Contributor
There was a problem hiding this comment.
Suggested change
| NetworkManager.Singleton.InvokeRpc(currentQueueItem); | |
| NetworkManager.InvokeRpc(currentQueueItem); |
Contributor
There was a problem hiding this comment.
Still not following how this would be valid
Contributor
There was a problem hiding this comment.
NetworkManager.InvokeRpc is a static function.
0xFA11
reviewed
Apr 1, 2021
| } | ||
|
|
||
| NetworkSpawnManager.ServerDestroySpawnedSceneObjects(); //Destroy current scene objects before switching. | ||
| NetworkManager.Singleton.SpawnManager.ServerDestroySpawnedSceneObjects(); //Destroy current scene objects before switching. |
Contributor
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
| 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); |
Contributor
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
| if (!NetworkManager.Singleton.NetworkConfig.EnableSceneManagement || NetworkManager.Singleton.NetworkConfig.UsePrefabSync) | ||
| { | ||
| NetworkSpawnManager.DestroySceneObjects(); | ||
| NetworkManager.Singleton.SpawnManager.DestroySceneObjects(); |
Contributor
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); |
Contributor
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
| { | ||
| var networkObjects = UnityEngine.Object.FindObjectsOfType<NetworkObject>(); | ||
| NetworkSpawnManager.ClientCollectSoftSyncSceneObjectSweep(networkObjects); | ||
| NetworkManager.Singleton.SpawnManager.ClientCollectSoftSyncSceneObjectSweep(networkObjects); |
Contributor
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); |
Contributor
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
| { | ||
| // Move ALL NetworkObjects to the temp scene | ||
| var objectsToKeep = NetworkSpawnManager.SpawnedObjectsList; | ||
| var objectsToKeep = NetworkManager.Singleton.SpawnManager.SpawnedObjectsList; |
Contributor
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
| { | ||
| // Move ALL NetworkObjects to the temp scene | ||
| var objectsToKeep = NetworkSpawnManager.SpawnedObjectsList; | ||
| var objectsToKeep = NetworkManager.Singleton.SpawnManager.SpawnedObjectsList; |
Contributor
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
| ulong networkObjectId = ReadUInt64Packed(); | ||
|
|
||
| if (NetworkSpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) | ||
| if (NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) |
Contributor
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
| if (NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) | ||
| { | ||
| return NetworkSpawnManager.SpawnedObjects[networkObjectId].gameObject; | ||
| return NetworkManager.Singleton.SpawnManager.SpawnedObjects[networkObjectId].gameObject; |
Contributor
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
| ulong networkObjectId = ReadUInt64Packed(); | ||
|
|
||
| if (NetworkSpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) | ||
| if (NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) |
Contributor
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
| if (NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) | ||
| { | ||
| return NetworkSpawnManager.SpawnedObjects[networkObjectId]; | ||
| return NetworkManager.Singleton.SpawnManager.SpawnedObjects[networkObjectId]; |
Contributor
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
| ulong networkObjectId = ReadUInt64Packed(); | ||
| ushort behaviourId = ReadUInt16Packed(); | ||
| if (NetworkSpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) | ||
| if (NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) |
Contributor
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
| if (NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId)) | ||
| { | ||
| return NetworkSpawnManager.SpawnedObjects[networkObjectId].GetNetworkBehaviourAtOrderIndex(behaviourId); | ||
| return NetworkManager.Singleton.SpawnManager.SpawnedObjects[networkObjectId].GetNetworkBehaviourAtOrderIndex(behaviourId); |
Contributor
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
| public static NetworkManager Singleton { get; private set; } | ||
|
|
||
| /// <summary> | ||
| /// Gets the SpawnManager for this NetworkManager |
Contributor
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 |
Contributor
There was a problem hiding this comment.
Suggested change
| // Create spawn manager instance |
isn't it obvious already? 😛
Contributor
|
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
April 6, 2021 08:26
84d35b1 to
96b9825
Compare
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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