cz.xprees.scene-management 1.0.2 → 1.0.3

package/Runtime/Extensions/SceneSOExtensions.cs

@@ -0,0 +1,19 @@
+using Xprees.SceneManagement.ScriptableObjects;
+
+namespace Xprees.SceneManagement.Extensions
+{
+    public static class SceneSOExtensions
+    {
+        /// Thread-safe method to set the IsBeingProcessed property of the SceneSO
+        public static void SetAsProcessed(this SceneSO scene, bool isProcessed)
+        {
+            lock (scene) scene.IsBeingProcessed = isProcessed;
+        }
+
+        /// Thread-safe method to set the IsLoaded property of the SceneSO
+        public static void SetAsLoaded(this SceneSO scene, bool isLoaded)
+        {
+            lock (scene) scene.IsLoaded = isLoaded;
+        }
+    }
+}

package/Runtime/Extensions/SceneSOExtensions.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 85ed896f5c9f4e8f8bcd0775005d0606
+timeCreated: 1734784842

package/Runtime/Initialization/InitializationLoader.cs

@@ -62,7 +62,7 @@ namespace Xprees.SceneManagement.Initialization
 
         private async UniTask InitializeHandlers(CancellationToken cancellationToken)
         {
-            var initTasks = initializationHandlers
+            var initTasks = initializationHandlers // Initialize all handlers - some need to initialize to decide if they are active 
                 .Select(handler => handler.InitializeHandlerAsync(cancellationToken))
                 .ToList();
 
@@ -97,10 +97,8 @@ namespace Xprees.SceneManagement.Initialization
             var managersScene = await managersSceneDataReference.LoadAssetAsync<SceneSO>()
                 .ToUniTask(cancellationToken: cancellationToken);
 
-            var managersSceneInstance = await managersScene.sceneReference.LoadSceneAsync(LoadSceneMode.Additive, true)
-                .ToUniTask(cancellationToken: cancellationToken);
             // Set as active to make sure if there are any created objects they are in the right scene and initialization scene
-            managersSceneInstance.SetAsActiveScene();
+            await LoadSceneIfNotProcessed(managersScene, true, LoadSceneMode.Additive, cancellationToken);
 
             await UniTask.WaitUntil(IsManagersSceneReady, cancellationToken: cancellationToken);
             return;
@@ -118,5 +116,24 @@ namespace Xprees.SceneManagement.Initialization
                                  $"Only {ActiveHandlers.Count()} are active.");
             }
         }
+
+        private async UniTask LoadSceneIfNotProcessed(
+            SceneSO scene,
+            bool setActive = false,
+            LoadSceneMode loadMode = LoadSceneMode.Additive,
+            CancellationToken token = default
+        )
+        {
+            if (scene.IsBeingProcessed || scene.IsLoaded) return;
+
+            scene.SetAsProcessed(true);
+            var sceneInstance = await scene.sceneReference
+                .LoadSceneAsync(loadMode, true)
+                .ToUniTask(cancellationToken: token);
+
+            if (setActive) sceneInstance.SetAsActiveScene();
+
+            scene.SetAsProcessed(false);
+        }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cz.xprees.scene-management",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "displayName": "Scene Management",
   "description": "Scene Management package for multi-scene workflow. Adds wrapper for addressable scenes and provides event-driven scene loader.",
   "unity": "2021.3",