modify WaitUntil/WaitWhile handler to CustomYieldInstruction handler.

Author: hxdnshx

Assets/EditorCoroutines/Scripts/CoroutineWindowExample.cs

@@ -43,28 +43,28 @@ void OnGUI()
 				this.StopAllCoroutines();
 			}
 
-		    if (GUILayout.Button("WaitUntil/WaitWhile"))
-		    {
-		        _status = false;
-		        this.StartCoroutine(ExampleWaitUntilWhile());
-		    }
-
-		    if (GUILayout.Button("Switch For WaitUntil/WaitWhile:" + (_status ? "On" : "Off")))
-		    {
-		        _status = !_status;
-                EditorUtility.SetDirty(this);
-		    }
+			if (GUILayout.Button("WaitUntil/WaitWhile"))
+			{
+				_status = false;
+				this.StartCoroutine(ExampleWaitUntilWhile());
+			}
+
+			if (GUILayout.Button("Switch For WaitUntil/WaitWhile:" + (_status ? "On" : "Off")))
+			{
+				_status = !_status;
+				EditorUtility.SetDirty(this);
+			}
 		}
 
-	    private bool _status;
+		private bool _status;
 
-	    IEnumerator ExampleWaitUntilWhile()
-	    {
-            yield return new WaitUntil(()=>_status);
-            Debug.Log("Switch On");
-            yield return new WaitWhile(()=>_status);
-            Debug.Log("Switch Off");
-	    }
+		IEnumerator ExampleWaitUntilWhile()
+		{
+			yield return new WaitUntil(()=>_status);
+			Debug.Log("Switch On");
+			yield return new WaitWhile(()=>_status);
+			Debug.Log("Switch Off");
+		}
 
 		IEnumerator Example()
 		{

Assets/EditorCoroutines/Scripts/EditorCoroutines.cs

@@ -75,27 +75,21 @@ public bool IsDone(float deltaTime)
 			}
 		}
 
-	    struct YieldWaitUntil : ICoroutineYield
-	    {
-	        public Func<bool> predicate;
-
-	        public bool IsDone(float deltaTime)
-	        {
-	            return predicate();
-	        }
-	    }
-
-	    struct YieldWaitWhile : ICoroutineYield
-	    {
-	        public Func<bool> predicate;
-
-	        public bool IsDone(float deltaTime)
-	        {
-	            return !predicate();
-	        }
-	    }
-
-        struct YieldWWW : ICoroutineYield
+		struct YieldCustomYieldInstruction : ICoroutineYield
+		{
+			public CustomYieldInstruction customYield;
+
+			public bool IsDone(float deltaTime)
+			{
+                /*
+                 * To keep coroutine suspended return true. To let coroutine proceed with execution return false.
+                 * From: https://docs.unity3d.com/ScriptReference/CustomYieldInstruction.html
+                 */
+                return !customYield.keepWaiting;
+			}
+		}
+
+		struct YieldWWW : ICoroutineYield
 		{
 			public WWW Www;
 
@@ -374,21 +368,14 @@ static bool Process(EditorCoroutine coroutine)
 				float seconds = float.Parse(GetInstanceField(typeof(WaitForSeconds), current, "m_Seconds").ToString());
 				coroutine.currentYield = new YieldWaitForSeconds() {timeLeft = (float) seconds};
 			}
-			else if (current is WaitUntil)
+			else if (current is CustomYieldInstruction)
 			{
-			    coroutine.currentYield = new YieldWaitUntil()
-			    {
-			        predicate = (Func<bool>)GetInstanceField(typeof(WaitUntil), current, "m_Predicate")
-			    };
-			}
-			else if (current is WaitWhile)
-			{
-			    coroutine.currentYield = new YieldWaitWhile()
-			    {
-			        predicate = (Func<bool>)GetInstanceField(typeof(WaitWhile), current, "m_Predicate")
-			    };
+				coroutine.currentYield = new YieldCustomYieldInstruction()
+				{
+					customYield = current as CustomYieldInstruction
+				};
 			}
-            else if (current is WWW)
+			else if (current is WWW)
 			{
 				coroutine.currentYield = new YieldWWW {Www = (WWW) current};
 			}