refactor: player loop is now only a initialization system

Author: Hertzole

Packages/packages-lock.json

@@ -25,9 +25,8 @@
     "com.unity.ext.nunit": {
       "version": "2.0.5",
       "depth": 1,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
+      "source": "builtin",
+      "dependencies": {}
     },
     "com.unity.ide.rider": {
       "version": "3.0.36",
@@ -48,29 +47,31 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.scriptablebuildpipeline": {
-      "version": "2.1.4",
+      "version": "2.4.0",
       "depth": 1,
       "source": "registry",
-      "dependencies": {},
+      "dependencies": {
+        "com.unity.test-framework": "1.4.5",
+        "com.unity.modules.assetbundle": "1.0.0"
+      },
       "url": "https://packages.unity.com"
     },
     "com.unity.settings-manager": {
-      "version": "2.0.1",
+      "version": "2.1.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.4.6",
+      "version": "1.5.1",
       "depth": 0,
-      "source": "registry",
+      "source": "builtin",
       "dependencies": {
         "com.unity.ext.nunit": "2.0.3",
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
+      }
     },
     "com.unity.testtools.codecoverage": {
       "version": "1.2.6",

Packages/se.hertzole.scriptable-values/Runtime/Player Loop/ScriptableValuesPlayerLoop.cs

@@ -1,58 +1,45 @@
+#if UNITY_EDITOR
+using System;
 using System.Collections.Generic;
+using UnityEditor;
 using UnityEngine;
-using UnityEngine.LowLevel;
-using UnityEngine.PlayerLoop;
 
 namespace Hertzole.ScriptableValues
 {
-    internal sealed class ScriptableValuesUpdate { }
-
     internal static class ScriptableValuesPlayerLoop
     {
         private static readonly List<IScriptableValueCallbacks> objectsToEnable = new List<IScriptableValueCallbacks>();
         private static readonly List<IScriptableValueCallbacks> objectsToDisable = new List<IScriptableValueCallbacks>();
 
-        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
-        private static void Init()
+        [InitializeOnLoadMethod]
+        private static void InitInEditor()
         {
-            PlayerLoopSystem defaultLoop = PlayerLoop.GetCurrentPlayerLoop();
-
-            PlayerLoopSystem customUpdate = new PlayerLoopSystem
-            {
-                updateDelegate = OnUpdate,
-                type = typeof(ScriptableValuesUpdate),
-                subSystemList = null
-            };
-
-            PlayerLoopSystem loopWithUpdate = InsertSystemAfter<EarlyUpdate>(in defaultLoop, in customUpdate);
-            PlayerLoop.SetPlayerLoop(loopWithUpdate);
+            EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
         }
 
-        public static void RegisterForEnable(IScriptableValueCallbacks obj)
+        private static void OnPlayModeStateChanged(PlayModeStateChange state)
         {
-            if (!objectsToEnable.Contains(obj))
+            // When exiting play mode, we want to call OnScriptableObjectPreDisable and OnScriptableObjectDisable on all registered objects.
+            if (state == PlayModeStateChange.EnteredEditMode)
             {
-                objectsToEnable.Add(obj);
-            }
-        }
+                for (int i = 0; i < objectsToDisable.Count; i++)
+                {
+                    objectsToDisable[i].OnScriptableObjectPreDisable();
+                }
 
-        public static void RegisterForDisable(IScriptableValueCallbacks obj)
-        {
-            if (!objectsToDisable.Contains(obj))
-            {
-                objectsToDisable.Add(obj);
+                for (int i = 0; i < objectsToDisable.Count; i++)
+                {
+                    objectsToDisable[i].OnScriptableObjectDisable();
+                }
+
+                objectsToDisable.Clear();
             }
         }
 
-        private static void OnUpdate()
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+        private static void Init()
         {
-#if UNITY_EDITOR
-            if (!Application.isPlaying)
-            {
-                return;
-            }
-#endif
-
+            // When the game starts, call OnScriptableObjectPreEnable and OnScriptableObjectEnable on all registered objects.
             for (int i = 0; i < objectsToEnable.Count; i++)
             {
                 objectsToEnable[i].OnScriptableObjectPreEnable();
@@ -63,50 +50,35 @@ private static void OnUpdate()
                 objectsToEnable[i].OnScriptableObjectEnable();
             }
 
-            for (int i = 0; i < objectsToDisable.Count; i++)
+            objectsToEnable.Clear();
+        }
+
+        public static void RegisterForEnable(IScriptableValueCallbacks obj)
+        {
+            // This is a bootstrapper, we can't register for enable if the application is already playing. The object should call those methods directly.
+            if (Application.isPlaying)
             {
-                objectsToDisable[i].OnScriptableObjectPreDisable();
+                throw new InvalidOperationException("Cannot register for enable when the application is already playing.");
             }
 
-            for (int i = 0; i < objectsToDisable.Count; i++)
+            if (!objectsToEnable.Contains(obj))
             {
-                objectsToDisable[i].OnScriptableObjectDisable();
+                objectsToEnable.Add(obj);
             }
-
-            objectsToEnable.Clear();
-            objectsToDisable.Clear();
         }
 
-        private static PlayerLoopSystem InsertSystemAfter<T>(in PlayerLoopSystem loopSystem, in PlayerLoopSystem newSystem) where T : struct
+        public static void RegisterForDisable(IScriptableValueCallbacks obj)
         {
-            // Create a new root PlayerLoopSystem
-            PlayerLoopSystem newPlayerLoop = new PlayerLoopSystem
+            if (!Application.isPlaying)
             {
-                loopConditionFunction = loopSystem.loopConditionFunction,
-                type = loopSystem.type,
-                updateDelegate = loopSystem.updateDelegate,
-                updateFunction = loopSystem.updateFunction
-            };
-
-            // Create a new list to populate with subsystems, including the custom system
-            List<PlayerLoopSystem> newSubSystemList = new List<PlayerLoopSystem>();
+                throw new InvalidOperationException("Cannot register for disable when the application is not playing.");
+            }
 
-            //Iterate through the subsystems in the existing loop we passed in and add them to the new list
-            if (loopSystem.subSystemList != null)
+            if (!objectsToDisable.Contains(obj))
             {
-                for (int i = 0; i < loopSystem.subSystemList.Length; i++)
-                {
-                    newSubSystemList.Add(loopSystem.subSystemList[i]);
-                    // If the previously added subsystem is of the type to add after, add the custom system
-                    if (loopSystem.subSystemList[i].type == typeof(T))
-                    {
-                        newSubSystemList.Add(newSystem);
-                    }
-                }
+                objectsToDisable.Add(obj);
             }
-
-            newPlayerLoop.subSystemList = newSubSystemList.ToArray();
-            return newPlayerLoop;
         }
     }
-}
+}
+#endif