Mirrors/SanAndreasUnity
2
0
Fork 0
mirror of https://github.com/GTA-ASM/SanAndreasUnity synced 2024-11-22 20:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

add more error-proof checking for startup singletons

Browse source
This commit is contained in:
in0finite 2022-01-22 01:24:52 +01:00
parent 4556e1eed6
commit f0959761e8
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Assets/Scripts/Utilities/SingletonComponent.cs
View file

@ -47,6 +47,8 @@ namespace SanAndreasUnity.Utilities
throw new Exception($"Awake() method called twice for singleton of type {this.GetType().Name}"); throw new Exception($"Awake() method called twice for singleton of type {this.GetType().Name}");
} }
this.OnSingletonAwakeValidate();
Singleton = (T)this; Singleton = (T)this;
this.OnSingletonAwake(); this.OnSingletonAwake();
@ -56,6 +58,10 @@ namespace SanAndreasUnity.Utilities
{ {
} }
protected virtual void OnSingletonAwakeValidate()
{
}
private void OnDisable() private void OnDisable()
{ {
if (Singleton != this) if (Singleton != this)

11
Assets/Scripts/Utilities/StartupSingleton.cs
View file

@ -1,7 +1,16 @@
namespace SanAndreasUnity.Utilities using UnityEngine.SceneManagement;
namespace SanAndreasUnity.Utilities
{ {
public class StartupSingleton<T> : SingletonComponent<T> public class StartupSingleton<T> : SingletonComponent<T>
where T : StartupSingleton<T> where T : StartupSingleton<T>
{ {
protected override void OnSingletonAwakeValidate()
{
Scene activeScene = SceneManager.GetActiveScene();
if (!activeScene.IsValid() || activeScene.buildIndex != 0)
throw new System.Exception("Startup singleton can only be initialized in startup scene");
}
} }
} }