pages can now be closed with follow up opens

coderDarren · coderDarren · commit 87ce6dd9fd79 · 2020-01-20T11:34:23.000-05:00
diff --git a/Menu/Page.cs b/Menu/Page.cs
@@ -7,9 +7,13 @@ namespace Menu {
 
         public class Page : MonoBehaviour
         {
+            public static readonly string FLAG_ON = "On";
+            public static readonly string FLAG_OFF = "Off";
+            public static readonly string FLAG_NONE = "None";
+
             public PageType type;
             public bool useAnimation;
-            public bool isAnimating {get;private set;}
+            public string targetState {get;private set;}
 
             /*
              * Animaton Requirements...
@@ -18,7 +22,7 @@ public class Page : MonoBehaviour
              *      1. Resting
              *      2. Turning On
              *      3. Turning Off
-             *  - The animator must have a control boolean called 'on'. Otherwise a flag will be thrown.
+             *  - The animator must have a control boolean called 'on'. Otherwise the animator will not work.
              */
             private Animator m_Animator;
 
@@ -38,25 +42,24 @@ public void Animate(bool _on) {
 
                     StopCoroutine("AwaitAnimation");
                     StartCoroutine("AwaitAnimation", _on);
-
-                    Log("Page ["+type+"] finished transitioning to "+(_on ? "<color=#0f0>on</color>." : "<color=#f00>off</color>."));
                 }
             }
 #endregion
 
 #region Private Functions
             private IEnumerator AwaitAnimation(bool _on) {
-                string _targetState = _on ? "On" : "Off";
-                isAnimating = true;
+                targetState = _on ? FLAG_ON : FLAG_OFF;
 
-                while (!m_Animator.GetCurrentAnimatorStateInfo(0).IsName(_targetState)) {
+                while (!m_Animator.GetCurrentAnimatorStateInfo(0).IsName(targetState)) {
                     yield return null;
                 }
                 while (m_Animator.GetCurrentAnimatorStateInfo(0).normalizedTime < 1) {
                     yield return null;
                 }
 
-                isAnimating = false;
+                targetState = FLAG_NONE;
+
+                Log("Page ["+type+"] finished transitioning to "+(_on ? "<color=#0f0>on</color>." : "<color=#f00>off</color>."));
 
                 if (!_on) {
                     gameObject.SetActive(false);
diff --git a/Menu/PageController.cs b/Menu/PageController.cs
@@ -26,18 +26,29 @@ private void Awake() {
                     m_OnList = new List<Page>();
                     m_OffList = new List<Page>();
                     RegisterAllPages();
-                    TurnPageOn(entryPage);
+
+                    if (entryPage != PageType.None) {
+                        TurnPageOn(entryPage);
+                    }
                 }
             }
 
+#if UNITY_EDITOR
             private void Update() {
                 if (Input.GetKeyUp(KeyCode.F)) {
                     TurnPageOn(PageType.Loading);
                 }
                 if (Input.GetKeyUp(KeyCode.G)) {
                     TurnPageOff(PageType.Loading);
                 }
+                if (Input.GetKeyUp(KeyCode.H)) {
+                    TurnPageOff(PageType.Loading, PageType.Menu);
+                }
+                if (Input.GetKeyUp(KeyCode.J)) {
+                    TurnPageOff(PageType.Loading, PageType.Menu, true);
+                }
             }
+#endif
 #endregion
 
 #region Public Functions
@@ -52,18 +63,36 @@ public void TurnPageOn(PageType _type) {
                 _page.Animate(true);
             }
 
-            public void TurnPageOff(PageType _type) {
-                if (!PageExists(_type)) {
-                    LogWarning("You are trying to turn a page off ["+_type+"] that has not been registered.");
+            public void TurnPageOff(PageType _off, PageType _on=PageType.None, bool _waitForExit=false) {
+                if (!PageExists(_off)) {
+                    LogWarning("You are trying to turn a page off ["+_on+"] that has not been registered.");
                     return;
                 }
 
-                Page _page = GetPage(_type);
-                _page.Animate(false);
+                Page _offPage = GetPage(_off);
+                if (_offPage.gameObject.activeSelf) {
+                    _offPage.Animate(false);
+                }
+
+                if (_waitForExit) {
+                    Page _onPage = GetPage(_on);
+                    StopCoroutine("WaitForPageExit");
+                    StartCoroutine(WaitForPageExit(_onPage, _offPage));
+                } else {
+                    TurnPageOn(_on);
+                }
             }
 #endregion
 
 #region Private Functions
+            private IEnumerator WaitForPageExit(Page _on, Page _off) {
+                while (_off.targetState != Page.FLAG_NONE) {
+                    yield return null;
+                }
+
+                TurnPageOn(_on.type);
+            }
+
             private void RegisterAllPages() {
                 foreach(Page _page in pages) {
                     RegisterPage(_page);
diff --git a/Menu/PageType.cs b/Menu/PageType.cs
@@ -4,7 +4,8 @@ namespace Menu {
 
         public enum PageType {
             None,
-            Loading
+            Loading,
+            Menu
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,8 @@ namespace Menu {`
`4`	`4`
`5`	`5`	`public enum PageType {`
`6`	`6`	`None,`
`7`		`- Loading`
	`7`	`+ Loading,`
	`8`	`+ Menu`
`8`	`9`	`}`
`9`	`10`	`}`
`10`	`11`	`}`