Skip to content

refactor: remove TempGlobalObjectIdHashOverride #1105

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

Merged
0xFA11 merged 1 commit into from
Aug 27, 2021
Merged

refactor: remove TempGlobalObjectIdHashOverride #1105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 0 additions & 12 deletions com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,13 @@ public sealed class NetworkObject : MonoBehaviour
internal uint GlobalObjectIdHash;

#if UNITY_EDITOR
// HEAD: DO NOT USE! TEST ONLY TEMP IMPL, WILL BE REMOVED
internal uint TempGlobalObjectIdHashOverride = 0;
// TAIL: DO NOT USE! TEST ONLY TEMP IMPL, WILL BE REMOVED

private void OnValidate()
{
GenerateGlobalObjectIdHash();
}

internal void GenerateGlobalObjectIdHash()
{
// HEAD: DO NOT USE! TEST ONLY TEMP IMPL, WILL BE REMOVED
if (TempGlobalObjectIdHashOverride != 0)
{
GlobalObjectIdHash = TempGlobalObjectIdHashOverride;
return;
}
// TAIL: DO NOT USE! TEST ONLY TEMP IMPL, WILL BE REMOVED

// do NOT regenerate GlobalObjectIdHash for NetworkPrefabs while Editor is in PlayMode
if (UnityEditor.EditorApplication.isPlaying && !string.IsNullOrEmpty(gameObject.scene.name))
{
Expand Down
9 changes: 3 additions & 6 deletions com.unity.netcode.gameobjects/Tests/Runtime/MultiInstanceHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,16 +217,13 @@ public class CoroutineResultWrapper<T>
/// <param name="globalObjectIdHash">The GlobalObjectId to force</param>
public static void MakeNetworkObjectTestPrefab(NetworkObject networkObject, uint globalObjectIdHash = default)
{
// Set a globalObjectId for prefab
// Override `GlobalObjectIdHash` if `globalObjectIdHash` param is set
if (globalObjectIdHash != default)
{
networkObject.TempGlobalObjectIdHashOverride = globalObjectIdHash;
networkObject.GlobalObjectIdHash = globalObjectIdHash;
}

// Force generation
networkObject.GenerateGlobalObjectIdHash();

// Fallback to auto-increment if generation fails
// Fallback to auto-increment if `GlobalObjectIdHash` was never set
if (networkObject.GlobalObjectIdHash == default)
{
networkObject.GlobalObjectIdHash = ++s_AutoIncrementGlobalObjectIdHashCounter;
Expand Down