Merge pull request #44 from mewlist/fix-scene-loading

Fix scene loading
mewlist · Feb 22, 2024 · 02b057a · 02b057a
2 parents 6752e87 + c65319f
commit 02b057a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/Runtime/Context/AutoContextLoader.cs b/Runtime/Context/AutoContextLoader.cs
@@ -26,7 +26,7 @@ public async Task Construct(IContext context)
         public async Task AfterInject()
         {
             // If this context is loaded from child scene context, do not load child scene contexts.
-            if (Context.IsReverseLoaded) return;
+            if (!enabled || Context.IsReverseLoaded) return;
 
             foreach (var sceneContext in sceneContexts)
                 await Context.SceneContextLoader.LoadAsync(sceneContext, active: true);

diff --git a/Runtime/Context/ParentSceneContextRequirement.cs b/Runtime/Context/ParentSceneContextRequirement.cs
@@ -18,8 +18,8 @@ public async Task<IContext> ResolveParentContext(SceneContext current)
 #if UNITY_EDITOR
             using var scope = new ParentContextLoadingScope(gameObject.scene);
 
-            handle = await UnifiedSceneLoader.LoadAsync(Scene, destroyCancellationToken);
-            var scene = await handle.GetScene();
+            handle = UnifiedSceneLoader.LoadAsync(Scene);
+            var scene = await handle.GetScene(destroyCancellationToken);
 
             var sceneContext = scene.FindFirstObjectByType<SceneContext>();
             if (!sceneContext)

diff --git a/Runtime/Context/SceneContext.cs b/Runtime/Context/SceneContext.cs
@@ -112,14 +112,26 @@ var gameObjectContexts
                 = GetComponentsUnderContext<GameObjectContext>()
                     .Where(x => x.enabled);
 
-            await ContextInternal.RawContainer.GenerateResolvers();
+            try
+            {
+                await ContextInternal.RawContainer.GenerateResolvers();
 
-            await Task.WhenAll(injectableComponents.Select(x
-                => ContextInternal.RawContainer.InjectIntoAsync(x).AsTask()));
+                await Task.WhenAll(injectableComponents.Select(x
+                    => ContextInternal.RawContainer.InjectIntoAsync(x).AsTask()));
 
-            while (InjectionProcessing)
-                await TaskHelper.NextFrame(destroyCancellationToken);
+                while (InjectionProcessing)
+                    await TaskHelper.NextFrame(destroyCancellationToken);
 
+            }
+            catch (Exception _)
+            {
+                if (ParentContext is not null && !ParentContext.Loaded)
+                {
+                    Debug.LogWarning("Parent context is not loaded. Shutdown SceneContext.");
+                    await Shutdown();
+                    return;
+                }
+            }
             using (new ContextSpaceScope(this))
             {
                 foreach (var gameObjectContext in gameObjectContexts)

diff --git a/Runtime/Context/SceneContextLoader.cs b/Runtime/Context/SceneContextLoader.cs
@@ -17,6 +17,7 @@ public class SceneContextLoader : MonoBehaviour, IAsyncDisposable
         private IContext Context { get; set; }
         private List<IContext> ChildSceneContexts { get; } = new();
         public IReadOnlyList<IContext> ReadonlyChildSceneContexts => ChildSceneContexts;
+        public float Progression => SceneLoader.Progression;
         private TaskQueue TaskQueue { get; } = new();
         private bool Disposed { get; set; }