Skip to content

Refactor UpdateManager instance handling and registration #108

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

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

Refactor UpdateManager instance handling and registration #108

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84953d9
Refactor UpdateManager instance handling and registration
Riryan May 26, 2026
7e53ce4
Merge branch 'master' into Riryan-patch-7
johnmoney May 28, 2026
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
108 changes: 92 additions & 16 deletions ThirdParty/UpdateManager/Scripts/UpdateManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,29 @@ public sealed class UpdateManager : MonoBehaviour
private static readonly SortedList<int, Updater> _updaters = new SortedList<int, Updater>();

private static UpdateManager _instance;
public static UpdateManager Instance => _instance != null ? _instance : (_instance = CreateInstance());
private static bool _applicationIsQuitting;

public static UpdateManager Instance => GetOrCreateInstance();

private static UpdateManager GetOrCreateInstance()
{
if (_applicationIsQuitting)
return null;

if (_instance != null)
return _instance;

_instance = FindObjectOfType<UpdateManager>();
return _instance != null ? _instance : CreateInstance();
}

private static UpdateManager CreateInstance()
{
var gameObject = new GameObject(nameof(UpdateManager))
{
hideFlags = HideFlags.DontSave,
};

#if UNITY_EDITOR
if (!Application.isPlaying)
{
Expand All @@ -27,12 +42,46 @@ private static UpdateManager CreateInstance()
{
DontDestroyOnLoad(gameObject);
}

return gameObject.AddComponent<UpdateManager>();
}

private void Awake()
{
if (_instance != null && _instance != this)
{
Destroy(gameObject);
return;
}

_instance = this;
}

private void OnApplicationQuit()
{
_applicationIsQuitting = true;
}

private void OnDestroy()
{
if (_instance != this)
return;

_instance = null;
_defaultUpdater.Clear();
_updaters.Clear();
}

public static void Register(IManagedUpdateBase updater)
{
Instance.Register_Implementation(updater);
if (updater == null)
return;

UpdateManager instance = GetOrCreateInstance();
if (instance == null)
return;

instance.Register_Implementation(updater);
}

private void Register_Implementation(IManagedUpdateBase updater)
Expand All @@ -42,7 +91,10 @@ private void Register_Implementation(IManagedUpdateBase updater)

public static void Unregister(IManagedUpdateBase updater)
{
Instance.Unregister_Implementation(updater);
if (updater == null || _instance == null)
return;

_instance.Unregister_Implementation(updater);
}

private void Unregister_Implementation(IManagedUpdateBase updater)
Expand All @@ -52,52 +104,76 @@ private void Unregister_Implementation(IManagedUpdateBase updater)

public static void Register(int order, IManagedUpdateBase updater)
{
Instance.Register_Implementation(order, updater);
if (updater == null)
return;

UpdateManager instance = GetOrCreateInstance();
if (instance == null)
return;

instance.Register_Implementation(order, updater);
}

private void Register_Implementation(int order, IManagedUpdateBase updater)
{
if (!_updaters.ContainsKey(order))
_updaters.Add(order, new Updater());
_updaters[order].Register(updater);
if (!_updaters.TryGetValue(order, out Updater updaterGroup))
{
updaterGroup = new Updater();
_updaters.Add(order, updaterGroup);
}

updaterGroup.Register(updater);
}

public static void Unregister(int order, IManagedUpdateBase updater)
{
Instance.Unregister_Implementation(order, updater);
if (updater == null || _instance == null)
return;

_instance.Unregister_Implementation(order, updater);
}

private void Unregister_Implementation(int order, IManagedUpdateBase updater)
{
if (!_updaters.ContainsKey(order))
if (!_updaters.TryGetValue(order, out Updater updaterGroup))
return;
_updaters[order].Unregister(updater);

updaterGroup.Unregister(updater);

if (updaterGroup.IsEmpty)
_updaters.Remove(order);
}

private void Update()
{
_defaultUpdater.Update();
for (int i = 0; i < _updaters.Count; ++i)

IList<Updater> orderedUpdaters = _updaters.Values;
for (int i = 0, count = orderedUpdaters.Count; i < count; ++i)
{
_updaters.Values[i].Update();
orderedUpdaters[i].Update();
}
}

private void LateUpdate()
{
_defaultUpdater.LateUpdate();
for (int i = 0; i < _updaters.Count; ++i)

IList<Updater> orderedUpdaters = _updaters.Values;
for (int i = 0, count = orderedUpdaters.Count; i < count; ++i)
{
_updaters.Values[i].LateUpdate();
orderedUpdaters[i].LateUpdate();
}
}

private void FixedUpdate()
{
_defaultUpdater.FixedUpdate();
for (int i = 0; i < _updaters.Count; ++i)

IList<Updater> orderedUpdaters = _updaters.Values;
for (int i = 0, count = orderedUpdaters.Count; i < count; ++i)
{
_updaters.Values[i].FixedUpdate();
orderedUpdaters[i].FixedUpdate();
}
}
}
Expand Down