Fix transition events not being fired

chark · Sep 28, 2022 · 3373f69 · 3373f69
1 parent d03217b
commit 3373f69
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.0.3] - 2022-09-28
+
+### Fixed
+- Fixed transition events not being invoked.
+
 ## [0.0.2] - 2022-09-28
 Minor UX updates and bug fixes.
 

diff --git a/Runtime/ScriptableSceneController.cs b/Runtime/ScriptableSceneController.cs
@@ -193,35 +193,45 @@ private IEnumerator LoadSceneCollectionInternalRoutine(
             BaseScriptableSceneCollection collection
         )
         {
-            yield return collection.ShowTransitionRoutine();
-            if (loadedCollection != false)
+            // TODO: reduce nesting
+            try
             {
+                collection.CollectionEvents.AddTransitionListeners(collectionEvents);
+                yield return collection.ShowTransitionRoutine();
+
+                if (loadedCollection != false)
+                {
+                    try
+                    {
+                        loadedCollection.CollectionEvents.AddListeners(collectionEvents);
+                        loadedCollection.SceneEvents.AddListeners(sceneEvents);
+                        yield return loadedCollection.UnloadRoutine();
+                    }
+                    finally
+                    {
+                        loadedCollection.CollectionEvents.RemoveListeners(collectionEvents);
+                        loadedCollection.SceneEvents.RemoveListeners(sceneEvents);
+                    }
+                }
+
                 try
                 {
-                    loadedCollection.CollectionEvents.AddListeners(collectionEvents);
-                    loadedCollection.SceneEvents.AddListeners(sceneEvents);
-                    yield return loadedCollection.UnloadRoutine();
+                    collection.CollectionEvents.AddListeners(collectionEvents);
+                    collection.SceneEvents.AddListeners(sceneEvents);
+                    yield return collection.LoadRoutine();
                 }
                 finally
                 {
-                    loadedCollection.CollectionEvents.RemoveListeners(collectionEvents);
-                    loadedCollection.SceneEvents.RemoveListeners(sceneEvents);
+                    collection.CollectionEvents.RemoveListeners(collectionEvents);
+                    collection.SceneEvents.RemoveListeners(sceneEvents);
                 }
-            }
 
-            try
-            {
-                collection.CollectionEvents.AddListeners(collectionEvents);
-                collection.SceneEvents.AddListeners(sceneEvents);
-                yield return collection.LoadRoutine();
+                yield return collection.HideTransitionRoutine();
             }
             finally
             {
-                collection.CollectionEvents.RemoveListeners(collectionEvents);
-                collection.SceneEvents.RemoveListeners(sceneEvents);
+                collection.CollectionEvents.RemoveTransitionListeners(collectionEvents);
             }
-
-            yield return collection.HideTransitionRoutine();
         }
 
         #endregion

diff --git a/Runtime/Utilities/ScriptableSceneUtilities.cs b/Runtime/Utilities/ScriptableSceneUtilities.cs
@@ -169,6 +169,30 @@ internal static bool TryGetLoadedScene(BaseScriptableScene scriptableScene, out
             return false;
         }
 
+        // TODO: how can we avoid this?
+        internal static void AddTransitionListeners(
+            this ICollectionEventHandler handler,
+            CollectionEventHandler otherHandler
+        )
+        {
+            handler.OnShowTransitionEntered += otherHandler.RaiseShowTransitionEntered;
+            handler.OnShowTransitionExited += otherHandler.RaiseShowTransitionExited;
+            handler.OnHideTransitionEntered += otherHandler.RaiseHideTransitionEntered;
+            handler.OnHideTransitionExited += otherHandler.RaiseHideTransitionExited;
+        }
+
+        // TODO: how can we avoid this?
+        internal static void RemoveTransitionListeners(
+            this ICollectionEventHandler handler,
+            CollectionEventHandler otherHandler
+        )
+        {
+            handler.OnShowTransitionEntered -= otherHandler.RaiseShowTransitionEntered;
+            handler.OnShowTransitionExited -= otherHandler.RaiseShowTransitionExited;
+            handler.OnHideTransitionEntered -= otherHandler.RaiseHideTransitionEntered;
+            handler.OnHideTransitionExited -= otherHandler.RaiseHideTransitionExited;
+        }
+
         // TODO: how can we avoid this?
         internal static void AddListeners(
             this ICollectionEventHandler handler,
@@ -180,10 +204,6 @@ CollectionEventHandler otherHandler
             handler.OnLoadProgress += otherHandler.RaiseLoadProgress;
             handler.OnUnloadEntered += otherHandler.RaiseUnloadEntered;
             handler.OnUnloadExited += otherHandler.RaiseUnloadExited;
-            handler.OnShowTransitionEntered += otherHandler.RaiseShowTransitionEntered;
-            handler.OnShowTransitionExited += otherHandler.RaiseShowTransitionExited;
-            handler.OnHideTransitionEntered += otherHandler.RaiseHideTransitionEntered;
-            handler.OnHideTransitionExited += otherHandler.RaiseHideTransitionExited;
         }
 
         // TODO: how can we avoid this?
@@ -197,10 +217,6 @@ CollectionEventHandler otherHandler
             handler.OnLoadProgress -= otherHandler.RaiseLoadProgress;
             handler.OnUnloadEntered -= otherHandler.RaiseUnloadEntered;
             handler.OnUnloadExited -= otherHandler.RaiseUnloadExited;
-            handler.OnShowTransitionEntered -= otherHandler.RaiseShowTransitionEntered;
-            handler.OnShowTransitionExited -= otherHandler.RaiseShowTransitionExited;
-            handler.OnHideTransitionEntered -= otherHandler.RaiseHideTransitionEntered;
-            handler.OnHideTransitionExited -= otherHandler.RaiseHideTransitionExited;
         }
 
         // TODO: how can we avoid this?

diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
     "name": "CHARK",
     "url": "https://chark.io"
   },
-  "version": "0.0.2",
+  "version": "0.0.3",
   "unity": "2020.3",
   "description": "Simple scene loading and management system for Unity Engine, implemented via scriptable objects.",
   "keywords": [