fix multiple FixedUpdate invokes to work

Eddio0141 · Aug 27, 2024 · efd1c60 · efd1c60
1 parent db3f831
commit efd1c60
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/UniTAS/Patcher/Implementations/UnityEvents/UnityEvents.cs b/UniTAS/Patcher/Implementations/UnityEvents/UnityEvents.cs
@@ -457,8 +457,6 @@ public void InvokeUpdate()
         if (_updated) return;
         _updated = true;
 
-        _calledFixedUpdate = false;
-
 #if TRACE
         StaticLogger.Trace($"InvokeUpdate, time: {_patchReverseInvoker.Invoke(() => Time.time)}");
 #endif
@@ -503,6 +501,12 @@ public void InvokeLateUpdate()
         }
     }
 
+    // isn't called at the very first yield WaitForFixedUpdate, but this is enough
+    public void CoroutineFixedUpdate()
+    {
+        _calledFixedUpdate = false;
+    }
+
     public void InvokeFixedUpdate()
     {
         if (_calledFixedUpdate) return;
@@ -557,4 +561,4 @@ private void InvokeCallOnPreUpdate()
                 preUpdate();
         }
     }
-}
+}
diff --git a/UniTAS/Patcher/MonoBehaviourScripts/MonoBehaviourUpdateInvoker.cs b/UniTAS/Patcher/MonoBehaviourScripts/MonoBehaviourUpdateInvoker.cs
@@ -22,7 +22,7 @@ private void Awake()
 
         _monoBehEventInvoker.InvokeAwake();
 
-        StartCoroutine(EndOfFrame());
+        StartCoroutine(WhileCoroutine());
     }
 
     private void OnDestroy()
@@ -62,11 +62,14 @@ private void OnEnable()
 
     // stupid optimization since object alloc
     private readonly WaitForEndOfFrame _waitForEndOfFrame = new();
+    private readonly WaitForFixedUpdate _waitForFixedUpdate = new();
 
-    private IEnumerator EndOfFrame()
+    private IEnumerator WhileCoroutine()
     {
         while (true)
         {
+            yield return _waitForFixedUpdate;
+            _monoBehEventInvoker.CoroutineFixedUpdate();
             yield return _waitForEndOfFrame;
             _monoBehEventInvoker.InvokeLastUpdate();
         }

diff --git a/UniTAS/Patcher/Services/UnityEvents/IMonoBehEventInvoker.cs b/UniTAS/Patcher/Services/UnityEvents/IMonoBehEventInvoker.cs
@@ -10,4 +10,5 @@ public interface IMonoBehEventInvoker
     void InvokeLastUpdate();
     void InvokeOnGUI();
     void InvokeOnEnable();
+    void CoroutineFixedUpdate();
 }