refactor: changing clientObjectManager to be used by other classes

making clientObjectManager be used by NetworkClient And networkSceneManager just like serverObjectManager BREAKING CHANGE: NetworkClient and NetworkSceneManager now need a reference to ClientObjectManager
MirageNet · May 5, 2023 · 2a69409 · 2a69409
1 parent f2d2cf3
commit 2a69409
Show file tree

Hide file tree

Showing 6 changed files with 105 additions and 117 deletions.
diff --git a/Assets/Mirage/Editor/NetworkMenu.cs b/Assets/Mirage/Editor/NetworkMenu.cs
@@ -43,7 +43,6 @@ public static GameObject CreateNetworkManager()
             var go = new GameObject("NetworkManager", components);
 
             var socketFactory = go.GetComponent<T>();
-            var nsm = go.GetComponent<NetworkSceneManager>();
 
             var networkClient = go.GetComponent<NetworkClient>();
             networkClient.SocketFactory = socketFactory;
@@ -53,11 +52,15 @@ public static GameObject CreateNetworkManager()
 
             var serverObjectManager = go.GetComponent<ServerObjectManager>();
             networkServer.ObjectManager = serverObjectManager;
-            nsm.ServerObjectManager = serverObjectManager;
 
             var clientObjectManager = go.GetComponent<ClientObjectManager>();
-            clientObjectManager.Client = networkClient;
-            clientObjectManager.NetworkSceneManager = nsm;
+            networkClient.ObjectManager = clientObjectManager;
+
+            var nsm = go.GetComponent<NetworkSceneManager>();
+            nsm.Server = networkServer;
+            nsm.Client = networkClient;
+            nsm.ServerObjectManager = serverObjectManager;
+            nsm.ClientObjectManager = clientObjectManager;
 
             var networkManager = go.GetComponent<NetworkManager>();
             networkManager.Client = networkClient;