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

Fix incorrect timing when calling Delay with PhysicsProcess
Fractural · Mar 26, 2024 · 7e60152 · 7e60152
2 parents 4bf2655 + da72229
commit 7e60152
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/addons/GDTask/GDTask.Delay.cs b/addons/GDTask/GDTask.Delay.cs
@@ -486,6 +486,7 @@ static DelayPromise()
             ulong initialFrame;
             double delayTimeSpan;
             double elapsed;
+            PlayerLoopTiming timing;
             CancellationToken cancellationToken;
 
             GDTaskCompletionSourceCore<object> core;
@@ -510,6 +511,7 @@ public static IGDTaskSource Create(TimeSpan delayTimeSpan, PlayerLoopTiming timi
                 result.delayTimeSpan = (float)delayTimeSpan.TotalSeconds;
                 result.cancellationToken = cancellationToken;
                 result.isMainThread = GDTaskPlayerLoopAutoload.IsMainThread;
+                result.timing = timing;
                 if (result.isMainThread)
                     result.initialFrame = Engine.GetProcessFrames();
 
@@ -564,7 +566,11 @@ public bool MoveNext()
                     }
                 }
 
-                elapsed += GDTaskPlayerLoopAutoload.Global.DeltaTime;
+                if (timing == PlayerLoopTiming.Process)
+                    elapsed += GDTaskPlayerLoopAutoload.Global.DeltaTime;
+                else
+                    elapsed += GDTaskPlayerLoopAutoload.Global.PhysicsDeltaTime;
+
                 if (elapsed >= delayTimeSpan)
                 {
                     core.TrySetResult(null);