Merge pull request #16 from mackysoft/fix/blank-scene-active

Navigathema blank scene is now unloaded when scene loaded

Assets/MackySoft/MackySoft.Navigathena/Runtime/SceneManagement/SceneIdentifier/NavigathenaBlankSceneIdentifier.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Threading;
+using Cysharp.Threading.Tasks;
+using UnityEngine.SceneManagement;
+
+namespace MackySoft.Navigathena.SceneManagement
+{
+	internal sealed class NavigathenaBlankSceneIdentifier : ISceneIdentifier
+	{
+
+		public static readonly NavigathenaBlankSceneIdentifier Instance = new NavigathenaBlankSceneIdentifier();
+
+		public ISceneHandle CreateHandle ()
+		{
+			return NavigathenaBlankSceneHandle.Instance;
+		}
+
+		sealed class NavigathenaBlankSceneHandle : ISceneHandle
+		{
+
+			public static readonly NavigathenaBlankSceneHandle Instance = new NavigathenaBlankSceneHandle();
+
+			const string kSceneName = "Navigathena Blank";
+
+			public UniTask<Scene> Load (IProgress<float> progress = null, CancellationToken cancellationToken = default)
+			{
+				if (SceneManager.GetSceneByName(kSceneName).IsValid())
+				{
+					return UniTask.FromResult(SceneManager.GetSceneByName(kSceneName));
+				}
+				return UniTask.FromResult(SceneManager.CreateScene(kSceneName));
+			}
+
+			public async UniTask Unload (IProgress<float> progress = null, CancellationToken cancellationToken = default)
+			{
+				Scene scene = SceneManager.GetSceneByName(kSceneName);
+				if (!scene.isLoaded && !scene.IsValid())
+				{
+					return;
+				}
+
+				await SceneManager.UnloadSceneAsync(kSceneName)
+					.ToUniTask(progress, cancellationToken: cancellationToken);
+			}
+		}
+	}
+}

Assets/MackySoft/MackySoft.Navigathena/Runtime/SceneManagement/SceneNavigator/StandardSceneNavigator.cs

@@ -327,7 +327,7 @@ async UniTask TryFinalizeAndUnloadCurrentScene (SceneHistoryEntry currentSceneEn
 				// NOTE: If the current scene is the only scene, create an empty scene to prevent an exception from being thrown when unloading.
 				if (SceneManager.sceneCount < 2)
 				{
-					SceneManager.CreateScene("Navigathena Blank");
+					await NavigathenaBlankSceneIdentifier.Instance.CreateHandle().Load(cancellationToken: cancellationToken);
 				}
 
 				await m_CurrentSceneState.Value.Handle.Unload(m_SceneProgressFactory.CreateProgress(progressDataStore, progress), cancellationToken);

Assets/MackySoft/MackySoft.Navigathena/Runtime/SceneManagement/SceneNavigatorHelper.cs

@@ -67,6 +67,9 @@ public static async UniTask<SceneState> LoadSceneAndGetEntryPoint (ISceneIdentif
 			Scene loadedScene = await sceneHandle.Load(sceneProgressFactory.CreateProgress(progressDataStore, progress), cancellationToken);
 			cancellationToken.ThrowIfCancellationRequested();
 
+			await NavigathenaBlankSceneIdentifier.Instance.CreateHandle().Unload(cancellationToken: cancellationToken);
+			cancellationToken.ThrowIfCancellationRequested();
+
 			var sceneEntryPoint = loadedScene.GetComponentInScene<ISceneEntryPoint>(true);
 			return new SceneState(scene, sceneHandle, sceneEntryPoint); 
 		}