Merge pull request #2 from hxdnshx/master

Add WaitUntil / WaitWhile support to EditorCoroutine

Author: marijnz

Unity.gitignore renamed to .gitignore

@@ -42,6 +42,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);
+			}
+		}
+
+		private bool status;
+
+		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/CoroutineWindowExample.cs

@@ -75,6 +75,16 @@ public bool IsDone(float deltaTime)
 			}
 		}
 
+		struct YieldCustomYieldInstruction : ICoroutineYield
+		{
+			public CustomYieldInstruction customYield;
+
+			public bool IsDone(float deltaTime)
+			{
+				return !customYield.keepWaiting;
+			}
+		}
+
 		struct YieldWWW : ICoroutineYield
 		{
 			public WWW Www;
@@ -354,6 +364,13 @@ 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 CustomYieldInstruction)
+			{
+				coroutine.currentYield = new YieldCustomYieldInstruction()
+				{
+					customYield = current as CustomYieldInstruction
+				};
+			}
 			else if (current is WWW)
 			{
 				coroutine.currentYield = new YieldWWW {Www = (WWW) current};