Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(NetworkPrefabHandler): reduce effort cognitive for understand this #2443

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

refactor(NetworkPrefabHandler): reduce effort cognitive for understand this #2443

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e09234e
refactor(NetworkPrefabHandler): reduce effort cognitive for understan…
Mar 9, 2023
2c0b820
Merge branch 'develop' into refactor/network-prefab-handler
MarcusViniciusSS Mar 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 52 additions & 61 deletions com.unity.netcode.gameobjects/Runtime/Spawning/NetworkPrefabHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@ public bool AddHandler(NetworkObject prefabAssetNetworkObject, INetworkPrefabIns
/// <returns></returns>
public bool AddHandler(uint globalObjectIdHash, INetworkPrefabInstanceHandler instanceHandler)
{
if (!m_PrefabAssetToPrefabHandler.ContainsKey(globalObjectIdHash))
if (m_PrefabAssetToPrefabHandler.ContainsKey(globalObjectIdHash))
{
m_PrefabAssetToPrefabHandler.Add(globalObjectIdHash, instanceHandler);
return true;
return false;
}

return false;
m_PrefabAssetToPrefabHandler.Add(globalObjectIdHash, instanceHandler);
return true;
}

/// <summary>
Expand All @@ -108,47 +108,38 @@ public bool AddHandler(uint globalObjectIdHash, INetworkPrefabInstanceHandler in
/// <param name="networkPrefabOverrides">one or more NetworkPrefabs could be used to override the source NetworkPrefab</param>
public void RegisterHostGlobalObjectIdHashValues(GameObject sourceNetworkPrefab, List<GameObject> networkPrefabOverrides)
{
if (NetworkManager.Singleton.IsListening)
if (!NetworkManager.Singleton.IsListening)
{
if (NetworkManager.Singleton.IsHost)
throw new System.Exception($"You can only call {nameof(RegisterHostGlobalObjectIdHashValues)} once NetworkManager is listening!");
}

if (!NetworkManager.Singleton.IsHost)
{
throw new System.Exception($"You should only call {nameof(RegisterHostGlobalObjectIdHashValues)} as a Host!");
}

var sourceNetworkObject = sourceNetworkPrefab.GetComponent<NetworkObject>();

if (sourceNetworkPrefab == null)
{
throw new System.Exception($"{sourceNetworkPrefab.name} does not have a {nameof(NetworkObject)} component!");
}

var sourceGlobalObjectIdHash = sourceNetworkObject.GlobalObjectIdHash;
// Now we register all
foreach (var gameObject in networkPrefabOverrides)
{
if (!gameObject.TryGetComponent<NetworkObject>(out var targetNetworkObject))
{
var sourceNetworkObject = sourceNetworkPrefab.GetComponent<NetworkObject>();
if (sourceNetworkPrefab != null)
{
var sourceGlobalObjectIdHash = sourceNetworkObject.GlobalObjectIdHash;
// Now we register all
foreach (var gameObject in networkPrefabOverrides)
{
if (gameObject.TryGetComponent<NetworkObject>(out var targetNetworkObject))
{
if (!m_PrefabInstanceToPrefabAsset.ContainsKey(targetNetworkObject.GlobalObjectIdHash))
{
m_PrefabInstanceToPrefabAsset.Add(targetNetworkObject.GlobalObjectIdHash, sourceGlobalObjectIdHash);
}
else
{
Debug.LogWarning($"{targetNetworkObject.name} appears to be a duplicate entry!");
}
}
else
{
throw new System.Exception($"{targetNetworkObject.name} does not have a {nameof(NetworkObject)} component!");
}
}
}
else
{
throw new System.Exception($"{sourceNetworkPrefab.name} does not have a {nameof(NetworkObject)} component!");
}
throw new System.Exception($"{targetNetworkObject.name} does not have a {nameof(NetworkObject)} component!");
}
else

if (m_PrefabInstanceToPrefabAsset.ContainsKey(targetNetworkObject.GlobalObjectIdHash))
{
throw new System.Exception($"You should only call {nameof(RegisterHostGlobalObjectIdHashValues)} as a Host!");
Debug.LogWarning($"{targetNetworkObject.name} appears to be a duplicate entry!");
}
}
else
{
throw new System.Exception($"You can only call {nameof(RegisterHostGlobalObjectIdHashValues)} once NetworkManager is listening!");

m_PrefabInstanceToPrefabAsset.Add(targetNetworkObject.GlobalObjectIdHash, sourceGlobalObjectIdHash);
}
}

Expand Down Expand Up @@ -179,21 +170,21 @@ public bool RemoveHandler(NetworkObject networkObject)
/// <returns>true (success) or false (failure)</returns>
public bool RemoveHandler(uint globalObjectIdHash)
{
if (m_PrefabInstanceToPrefabAsset.ContainsValue(globalObjectIdHash))
if (!m_PrefabInstanceToPrefabAsset.ContainsValue(globalObjectIdHash))
{
return m_PrefabAssetToPrefabHandler.Remove(globalObjectIdHash);
}

uint networkPrefabHashKey = 0;
foreach (var kvp in m_PrefabInstanceToPrefabAsset)
{
uint networkPrefabHashKey = 0;
foreach (var kvp in m_PrefabInstanceToPrefabAsset)
if (kvp.Value == globalObjectIdHash)
{
if (kvp.Value == globalObjectIdHash)
{
networkPrefabHashKey = kvp.Key;
break;
}
networkPrefabHashKey = kvp.Key;
break;
}
m_PrefabInstanceToPrefabAsset.Remove(networkPrefabHashKey);
}

return m_PrefabAssetToPrefabHandler.Remove(globalObjectIdHash);
m_PrefabInstanceToPrefabAsset.Remove(networkPrefabHashKey);
}

/// <summary>
Expand Down Expand Up @@ -256,21 +247,21 @@ internal uint GetSourceGlobalObjectIdHash(uint networkPrefabHash)
/// <returns></returns>
internal NetworkObject HandleNetworkPrefabSpawn(uint networkPrefabAssetHash, ulong ownerClientId, Vector3 position, Quaternion rotation)
{
if (m_PrefabAssetToPrefabHandler.ContainsKey(networkPrefabAssetHash))
if (!m_PrefabAssetToPrefabHandler.ContainsKey(networkPrefabAssetHash))
{
var networkObjectInstance = m_PrefabAssetToPrefabHandler[networkPrefabAssetHash].Instantiate(ownerClientId, position, rotation);
return null;
}

//Now we must make sure this alternate PrefabAsset spawned in place of the prefab asset with the networkPrefabAssetHash (GlobalObjectIdHash)
//is registered and linked to the networkPrefabAssetHash so during the HandleNetworkPrefabDestroy process we can identify the alternate prefab asset.
if (networkObjectInstance != null && !m_PrefabInstanceToPrefabAsset.ContainsKey(networkObjectInstance.GlobalObjectIdHash))
{
m_PrefabInstanceToPrefabAsset.Add(networkObjectInstance.GlobalObjectIdHash, networkPrefabAssetHash);
}
var networkObjectInstance = m_PrefabAssetToPrefabHandler[networkPrefabAssetHash].Instantiate(ownerClientId, position, rotation);

return networkObjectInstance;
//Now we must make sure this alternate PrefabAsset spawned in place of the prefab asset with the networkPrefabAssetHash (GlobalObjectIdHash)
//is registered and linked to the networkPrefabAssetHash so during the HandleNetworkPrefabDestroy process we can identify the alternate prefab asset.
if (networkObjectInstance != null && !m_PrefabInstanceToPrefabAsset.ContainsKey(networkObjectInstance.GlobalObjectIdHash))
{
m_PrefabInstanceToPrefabAsset.Add(networkObjectInstance.GlobalObjectIdHash, networkPrefabAssetHash);
}

return null;
return networkObjectInstance;
}

/// <summary>
Expand Down