refactor

Removing DefaultPayerGlobalObjectIdHashValue with new GlobalObjectIdHash goodness.

Author: NoelStephensUnity

com.unity.netcode.gameobjects/Tests/Runtime/BaseMultiInstanceTest.cs

@@ -14,8 +14,6 @@ public abstract class BaseMultiInstanceTest
         protected NetworkManager m_ServerNetworkManager;
         protected NetworkManager[] m_ClientNetworkManagers;
 
-        internal static uint DefaultPayerGlobalObjectIdHashValue = 7777777;
-
         protected abstract int NbClients { get; }
 
         [UnitySetUp]
@@ -96,7 +94,7 @@ public IEnumerator StartSomeClientsAndServerWithPlayers(bool useHost, int nbClie
              * at runtime without it being treated as a SceneObject or causing other conflicts with the Netcode.
              */
             // Make it a prefab
-            MultiInstanceHelpers.MakeNetworkObjectTestPrefab(networkObject, DefaultPayerGlobalObjectIdHashValue);
+            MultiInstanceHelpers.MakeNetworkObjectTestPrefab(networkObject);
 
             updatePlayerPrefab(m_PlayerPrefab); // update player prefab with whatever is needed before players are spawned
 

com.unity.netcode.gameobjects/Tests/Runtime/NetworkShowHideTests.cs

@@ -22,6 +22,7 @@ public class NetworkShowHideTests : BaseMultiInstanceTest
         protected override int NbClients => 2;
 
         private ulong m_ClientId0;
+        private GameObject m_PrefabToSpawn;
 
         private NetworkObject m_NetSpawnedObject1;
         private NetworkObject m_NetSpawnedObject2;
@@ -37,6 +38,7 @@ public override IEnumerator Setup()
                 updatePlayerPrefab: playerPrefab =>
                 {
                     var networkTransform = playerPrefab.AddComponent<NetworkShowHideTest>();
+                    m_PrefabToSpawn = PreparePrefab(typeof(ShowHideObject));
                 });
         }
 
@@ -45,7 +47,7 @@ public GameObject PreparePrefab(Type type)
             var prefabToSpawn = new GameObject();
             prefabToSpawn.AddComponent(type);
             var networkObjectPrefab = prefabToSpawn.AddComponent<NetworkObject>();
-            MultiInstanceHelpers.MakeNetworkObjectTestPrefab(networkObjectPrefab, DefaultPayerGlobalObjectIdHashValue);
+            MultiInstanceHelpers.MakeNetworkObjectTestPrefab(networkObjectPrefab);
             m_ServerNetworkManager.NetworkConfig.NetworkPrefabs.Add(new NetworkPrefab() { Prefab = prefabToSpawn });
             foreach (var clientNetworkManager in m_ClientNetworkManagers)
             {
@@ -159,10 +161,10 @@ public IEnumerator NetworkShowHideTest()
 
             // create 3 objects
 
-            var prefabToSpawn = PreparePrefab(typeof(ShowHideObject));
-            var spawnedObject1 = UnityEngine.Object.Instantiate(prefabToSpawn);
-            var spawnedObject2 = UnityEngine.Object.Instantiate(prefabToSpawn);
-            var spawnedObject3 = UnityEngine.Object.Instantiate(prefabToSpawn);
+
+            var spawnedObject1 = UnityEngine.Object.Instantiate(m_PrefabToSpawn);
+            var spawnedObject2 = UnityEngine.Object.Instantiate(m_PrefabToSpawn);
+            var spawnedObject3 = UnityEngine.Object.Instantiate(m_PrefabToSpawn);
             m_NetSpawnedObject1 = spawnedObject1.GetComponent<NetworkObject>();
             m_NetSpawnedObject2 = spawnedObject2.GetComponent<NetworkObject>();
             m_NetSpawnedObject3 = spawnedObject3.GetComponent<NetworkObject>();

testproject/Assets/Tests/Runtime/MessageOrdering.cs

@@ -113,8 +113,8 @@ public IEnumerator SpawnRpcDespawn([Values] NetworkUpdateStage testStage)
             var networkObject = m_Prefab.AddComponent<NetworkObject>();
 
             // Make it a prefab
-            MultiInstanceHelpers.MakeNetworkObjectTestPrefab(networkObject, 1);
-            var handler = new SpawnRpcDespawnInstanceHandler(1);
+            MultiInstanceHelpers.MakeNetworkObjectTestPrefab(networkObject);
+            var handler = new SpawnRpcDespawnInstanceHandler(networkObject.GlobalObjectIdHash);
             foreach (var client in clients)
             {
                 client.PrefabHandler.AddHandler(networkObject, handler);