Merge pull request #4 from Delsin-Yu/4.x

Remove the requirement for marking GDTaskPlayerLoopAutoload as autoload
Fractural · Dec 4, 2023 · 865f087 · 865f087
2 parents 69678b2 + 427448d
commit 865f087
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 24 deletions.
diff --git a/addons/GDTask/Autoload/GDTaskPlayerLoopAutoload.cs b/addons/GDTask/Autoload/GDTaskPlayerLoopAutoload.cs
@@ -80,23 +80,44 @@ public void LocalAddContinuation(PlayerLoopTiming timing, Action continuation)
             q.Enqueue(continuation);
         }
 
-        public static GDTaskPlayerLoopAutoload Global { get; private set; }
+        public static GDTaskPlayerLoopAutoload Global
+        {
+            get
+            {
+                if (s_Global != null) return s_Global;
+
+                var newInstance = new GDTaskPlayerLoopAutoload();
+                newInstance.Initialize();
+                var currentScene = ((SceneTree)Engine.GetMainLoop()).CurrentScene;
+                currentScene.AddChild(newInstance);
+                currentScene.MoveChild(newInstance, 0);
+                newInstance.Name = "GDTaskPlayerLoopAutoload";
+                s_Global = newInstance;
+
+                return s_Global;
+            }
+        }
         public double DeltaTime => GetProcessDeltaTime();
         public double PhysicsDeltaTime => GetPhysicsProcessDeltaTime();
 
+        private static GDTaskPlayerLoopAutoload s_Global;
         private int mainThreadId;
         private ContinuationQueue[] yielders;
         private PlayerLoopRunner[] runners;
 
         public override void _Ready()
         {
-            if (Global != null)
+            if (s_Global == null)
             {
-                QueueFree();
+                Initialize();
+                s_Global = this;
                 return;
             }
-            Global = this;
+            QueueFree();
+        }
 
+        private void Initialize()
+        {
             mainThreadId = System.Threading.Thread.CurrentThread.ManagedThreadId;
             yielders = new[] {
                 new ContinuationQueue(PlayerLoopTiming.Process),
@@ -113,7 +134,7 @@ public override void _Notification(int what)
             if (what == NotificationPredelete)
             {
                 if (Global == this)
-                    Global = null;
+                    s_Global = null;
                 if (yielders != null)
                 {
                     foreach (var yielder in yielders)

diff --git a/addons/GDTask/CompilerServices/AsyncMethodBuilderAttribute.cs b/addons/GDTask/CompilerServices/AsyncMethodBuilderAttribute.cs
diff --git a/project.godot b/project.godot
@@ -29,10 +29,6 @@ boot_splash/bg_color=Color(0, 0, 0, 1)
 boot_splash/image="res://bootsplash.png"
 config/icon="res://icon.png"
 
-[autoload]
-
-GdTaskPlayerLoopAutoload="*res://addons/GDTask/Autoload/GDTaskPlayerLoopAutoload.cs"
-
 [dotnet]
 
 project/assembly_name="GDTask"