Update

Fixes: * ProcessorTimer works correctly after changing scene * ProcessorScene works correctly when no multiscene feature used Changes: DataGameSession removed. If you used this stuff make sure to handle it yourself DataGameSettings removed. If you used this stuff make sure to handle it yourself You don't need to have scene kernel anymore to run framework
PixeyeHQ · Jun 24, 2019 · ef1b0b2 · ef1b0b2
1 parent 94875dc
commit ef1b0b2
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 38 deletions.
diff --git a/Install/0 Project Template.unitypackage b/Install/0 Project Template.unitypackage
diff --git a/Runtime/LibProcessors/ProcessorScene.cs b/Runtime/LibProcessors/ProcessorScene.cs
@@ -63,6 +63,7 @@ public void Setup(List<SceneReference> scenesToKeep, List<SceneReference> sceneD
 			this.scenesToKeep.Clear();
 			this.sceneDependsOn.Clear();
 
+
 			for (var i = 0; i < scenesToKeep.Count; i++)
 			{
 				this.scenesToKeep.Add(scenesToKeep[i].Path);
@@ -103,6 +104,11 @@ IEnumerator _Setup(Starter starter)
 				scenes.Add(name, SceneManager.GetSceneByName(name));
 			}
 
+			if (sceneDependsOn.Count == 0)
+			{
+				yield return 0;
+			}
+
 			sceneLoaded();
 
 			starter.BindScene();
@@ -114,6 +120,15 @@ IEnumerator _Load(string name)
 			Toolbox.changingScene = true;
 			Toolbox.Instance.ClearSessionData();
 
+			if (scenes.Keys.Count == 1)
+			{
+				scenes.Clear();
+				SceneManager.LoadScene(name);
+				SceneManager.SetActiveScene(SceneManager.GetSceneByName(name));
+				Toolbox.changingScene = false;
+				yield break;
+			}
+
 			var s = SceneManager.GetActiveScene();
 			var sName = s.name;
 
@@ -162,34 +177,48 @@ IEnumerator _Load(int id)
 			Toolbox.changingScene = true;
 			Toolbox.Instance.ClearSessionData();
 
-			var s = SceneManager.GetActiveScene();
-			var sName = s.name;
-
-			var job = SceneManager.UnloadSceneAsync(s);
-
-			while (!job.isDone)
+			if (scenes.Keys.Count == 1)
 			{
-				yield return 0;
+				scenes.Clear();
+				SceneManager.LoadScene(id);
+				SceneManager.SetActiveScene(SceneManager.GetSceneByBuildIndex(id));
+				Toolbox.changingScene    = false;
+				yield break;
 			}
 
-			scenes.Remove(sName);
-			foreach (var key in scenes.Keys)
-			{
-				if (scenesToKeep.Contains(key)) continue;
+			var s     = SceneManager.GetActiveScene();
+				var sName = s.name;
 
-				job = SceneManager.UnloadSceneAsync(scenes[key]);
+				var job = SceneManager.UnloadSceneAsync(s);
 
 				while (!job.isDone)
 				{
 					yield return 0;
 				}
-			}
 
-			job = Resources.UnloadUnusedAssets();
-			while (!job.isDone)
-			{
-				yield return 0;
-			}
+				scenes.Remove(sName);
+
+				if (scenes.Keys.Count != 1)
+				{
+					foreach (var key in scenes.Keys)
+					{
+						if (scenesToKeep.Contains(key)) continue;
+
+						job = SceneManager.UnloadSceneAsync(scenes[key]);
+
+						while (!job.isDone)
+						{
+							yield return 0;
+						}
+					}
+
+					job = Resources.UnloadUnusedAssets();
+					while (!job.isDone)
+					{
+						yield return 0;
+					}
+				}
+
 
 			scenes.Clear();
 

diff --git a/Runtime/LibProcessors/ProcessorTimer.cs b/Runtime/LibProcessors/ProcessorTimer.cs
@@ -5,11 +5,11 @@
 using System.Runtime.CompilerServices;
 using Pixeye.Framework;
 using Unity.IL2CPP.CompilerServices;
-
+ 
 namespace Pixeye.Source
 {
 	[Il2CppSetOption(Option.NullChecks | Option.ArrayBoundsChecks | Option.DivideByZeroChecks, false)]
-	sealed class ProcessorTimer : Processor, ITick, IKernel
+	sealed class ProcessorTimer : ITick, IKernel
 	{
 
 		internal static ProcessorTimer Default = new ProcessorTimer();
@@ -79,7 +79,7 @@ internal int Restart(float t, Action action)
 			return index;
 		}
 
-		protected override void OnDispose()
+		public void Dispose()
 		{
 			for (int i = 0; i < length; i++)
 			{

diff --git a/Runtime/LibProcessors/ProcessorUpdate.cs b/Runtime/LibProcessors/ProcessorUpdate.cs
@@ -155,7 +155,7 @@ public void Dispose()
 			countTicksLate = 0;
 
 			ticks.RemoveAll(t => t is IKernel == false);
-
+			
 			ticksFixed.Clear();
 			ticksLate.Clear();
 

diff --git a/Runtime/LibSingleton/Toolbox.cs b/Runtime/LibSingleton/Toolbox.cs
@@ -105,17 +105,19 @@ internal void ClearSessionData()
 			foreach (var pair in data)
 			{
 				var isKernel = pair.Value as IKernel;
-				if (isKernel == null) toWipe.Add(pair.Key);
+				if (isKernel == null)
+					toWipe.Add(pair.Key);
+
 
 				var needToBeCleaned = pair.Value as IDisposable;
 				if (needToBeCleaned == null) continue;
-
+				 
 				needToBeCleaned.Dispose();
 			}
 
 			HandlePool.Dispose();
 			ProcessorGroups.Dispose();
-			ProcessorTimer.Default.Dispose();
+	  	ProcessorTimer.Default.Dispose();
 			ProcessorScene.Default.Dispose();
 			ProcessorUpdate.Default.Dispose();
 			Box.Default.Dispose();

diff --git a/Runtime/LibStarter/StarterKernel.cs b/Runtime/LibStarter/StarterKernel.cs
@@ -13,11 +13,11 @@ namespace Pixeye.Framework
 	public class StarterKernel : MonoBehaviour
 	{
 
-		[FoldoutGroup("SetupData")]
-		public DataSession gameSession;
-
-		[FoldoutGroup("SetupData")]
-		public DataSession gameSettings;
+		// [FoldoutGroup("SetupData")]
+		// public DataSession gameSession;
+		//
+		// [FoldoutGroup("SetupData")]
+		// public DataSession gameSettings;
 
 		[FoldoutGroup("SetupData")]
 		public List<Pluggable> pluggables = new List<Pluggable>();
@@ -34,14 +34,14 @@ void Awake()
 				pluggables[i].Plug();
 			}
 
-			if (gameSession != null)
-			{
-				Toolbox.Add(gameSession);
-			}
-			if (gameSettings != null)
-			{
-				Toolbox.Add(gameSettings);
-			}
+			// if (gameSession != null)
+			// {
+			// 	Toolbox.Add(gameSession);
+			// }
+			// if (gameSettings != null)
+			// {
+			// 	Toolbox.Add(gameSettings);
+			// }
 		}
 
 		IEnumerator OnApplicationFocus(bool hasFocus)