refactor: FindObject(s)OfType now filters NetworkManagers #763
Conversation
… can now be overriden BREAKING CHANGE: Static lifecycle properties in NetworkBehaviour are no longer static
TwoTenPvP
changed the base branch from
develop
to
singleton-removal-network-object
|
PR is targeting |
Yeah |
| for (int i = 0; i < networkObjects.Length; i++) | ||
| { | ||
| if (networkObjects[i].IsSceneObject == null) | ||
| if (networkObjects[i].NetworkManager == m_NetworkManager) |
There was a problem hiding this comment.
I was looking at this and wondering how this works in practice if you have 2 NM's. I get how you override the NM for a NO. How about for a scene? Or are we saying that just one NM will ever have the scene-defined objects? Then I wonder if the contrary of this is true, is it an error? That is you have a NO that is a scene object that belongs to the NM that is not the one that handles scene objects. If that's true (I know this is a long walk...) then seems like we should throw an exception here.
| @@ -499,17 +499,20 @@ internal void DestroyNonSceneObjects() | |||
|
|
|||
| for (int i = 0; i < networkObjects.Length; i++) | |||
| { | |||
| if (networkObjects[i].IsSceneObject != null && networkObjects[i].IsSceneObject.Value == false) | |||
| if (networkObjects[i].NetworkManager == NetworkManager) | |||
There was a problem hiding this comment.
Same comment as above
To answer those questions above. Right now you have the same override mechanism for NetworkObjects. By default they go and spawn themselves on the Singleton but if it's manually overriden it will go to that one. Nothing really going on. As for Multi-scene tests where we actually do scene switching. That is not yet covered by this PR and it's something not yet looked into. (As was outlined in the proposal). But I think I should be able to make it work fairly easily. It all really depends on how much I can hack the new GlobalObjectId system. The old PrefabHash system was easy to inject values into. |
TwoTenPvP
force-pushed
the
singleton-removal-network-object
branch
from
d77f930 to
84cf1c1
Compare
| @@ -577,9 +586,12 @@ internal void ClientCollectSoftSyncSceneObjectSweep(NetworkObject[] networkObjec | |||
|
|
|||
| for (int i = 0; i < networkObjects.Length; i++) | |||
| { | |||
| if (networkObjects[i].IsSceneObject == null) | |||
| if (networkObjects[i].NetworkManager == NetworkManager) | |||
There was a problem hiding this comment.
Almost all places use the owner NetworkManager by default.
This is the only place we use FindObjectsOfType and thus aren't filtered yet properly.
No description provided.