Adjust loading scripts to use different events

chark · Oct 3, 2023 · eed2f20 · eed2f20
1 parent 3d32685
commit eed2f20
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/Packages/com.chark.scriptable-scenes/Samples/Defaults/Scripts/LoadingCanvasController.cs b/Packages/com.chark.scriptable-scenes/Samples/Defaults/Scripts/LoadingCanvasController.cs
@@ -20,27 +20,27 @@ internal sealed class LoadingCanvasController : MonoBehaviour
         private void OnEnable()
         {
             var collectionEvents = sceneController.CollectionEvents;
-            collectionEvents.OnLoadEntered += OnLoadEntered;
+            collectionEvents.OnShowTransitionEntered += OnShowTransitionEntered;
             collectionEvents.OnLoadProgress += OnLoadProgress;
         }
 
         private void OnDisable()
         {
             var collectionEvents = sceneController.CollectionEvents;
-            collectionEvents.OnLoadEntered -= OnLoadEntered;
+            collectionEvents.OnShowTransitionEntered -= OnShowTransitionEntered;
             collectionEvents.OnLoadProgress -= OnLoadProgress;
         }
 
-        private void OnLoadEntered(CollectionLoadEventArgs args)
+        private void OnShowTransitionEntered()
         {
-            loadingStateText.text = "";
+            loadingStateText.text = "Loading...";
             loadingPercentageText.text = "0%";
         }
 
         private void OnLoadProgress(CollectionLoadProgressEventArgs args)
         {
             var collectionName = args.Collection.Name;
-            var percentage = (int) (args.CollectionLoadProgress * 100);
+            var percentage = (int)(args.CollectionLoadProgress * 100);
 
             loadingStateText.text = $"Loading \"{collectionName}\"...";
             loadingPercentageText.text = $"{percentage}%";

diff --git a/...ges/com.chark.scriptable-scenes/Samples/MultipleScenes/Scripts/LoadingCanvasController.cs b/...ges/com.chark.scriptable-scenes/Samples/MultipleScenes/Scripts/LoadingCanvasController.cs
@@ -20,27 +20,27 @@ internal sealed class LoadingCanvasController : MonoBehaviour
         private void OnEnable()
         {
             var collectionEvents = sceneController.CollectionEvents;
-            collectionEvents.OnLoadEntered += OnLoadEntered;
+            collectionEvents.OnShowTransitionEntered += OnShowTransitionEntered;
             collectionEvents.OnLoadProgress += OnLoadProgress;
         }
 
         private void OnDisable()
         {
             var collectionEvents = sceneController.CollectionEvents;
-            collectionEvents.OnLoadEntered -= OnLoadEntered;
+            collectionEvents.OnShowTransitionEntered -= OnShowTransitionEntered;
             collectionEvents.OnLoadProgress -= OnLoadProgress;
         }
 
-        private void OnLoadEntered(CollectionLoadEventArgs args)
+        private void OnShowTransitionEntered()
         {
-            loadingStateText.text = "";
+            loadingStateText.text = "Loading...";
             loadingPercentageText.text = "0%";
         }
 
         private void OnLoadProgress(CollectionLoadProgressEventArgs args)
         {
             var collectionName = args.Collection.Name;
-            var percentage = (int) (args.CollectionLoadProgress * 100);
+            var percentage = (int)(args.CollectionLoadProgress * 100);
 
             loadingStateText.text = $"Loading \"{collectionName}\"...";
             loadingPercentageText.text = $"{percentage}%";