[v0.0.6] Added dependencies; Fix for unloading

Depra-Inc · Jan 26, 2024 · 802275d · 802275d
1 parent bc82cb7
commit 802275d
Show file tree

Hide file tree

Showing 19 changed files with 32 additions and 12 deletions.
diff --git a/Runtime/Definitions.meta b/Runtime/Definitions.meta
diff --git a/Runtime/SceneDatabase.cs → Runtime/Definitions/SceneDatabase.cs b/Runtime/SceneDatabase.cs → Runtime/Definitions/SceneDatabase.cs
@@ -5,7 +5,7 @@
 using UnityEngine;
 using static Depra.Scenes.Module;
 
-namespace Depra.Scenes
+namespace Depra.Scenes.Definitions
 {
 	[CreateAssetMenu(fileName = FILE_NAME, menuName = MENU_PATH + FILE_NAME, order = DEFAULT_ORDER)]
 	public sealed class SceneDatabase : ScriptableObject

diff --git a/Runtime/SceneDatabase.cs.meta → Runtime/Definitions/SceneDatabase.cs.meta b/Runtime/SceneDatabase.cs.meta → Runtime/Definitions/SceneDatabase.cs.meta
diff --git a/Runtime/SceneDefinition.cs → Runtime/Definitions/SceneDefinition.cs b/Runtime/SceneDefinition.cs → Runtime/Definitions/SceneDefinition.cs
@@ -6,7 +6,7 @@
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
-namespace Depra.Scenes
+namespace Depra.Scenes.Definitions
 {
 	[Serializable]
 	public sealed partial class SceneDefinition

diff --git a/Runtime/SceneDefinition.cs.meta → Runtime/Definitions/SceneDefinition.cs.meta b/Runtime/SceneDefinition.cs.meta → Runtime/Definitions/SceneDefinition.cs.meta
diff --git a/Runtime/Exceptions.meta b/Runtime/Exceptions.meta
diff --git a/Runtime/UnexpectedSceneSwitch.cs → Runtime/Exceptions/UnexpectedSceneSwitch.cs b/Runtime/UnexpectedSceneSwitch.cs → Runtime/Exceptions/UnexpectedSceneSwitch.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Depra.Scenes
+namespace Depra.Scenes.Exceptions
 {
 	internal sealed class UnexpectedSceneSwitch : Exception
 	{

diff --git a/Runtime/UnexpectedSceneSwitch.cs.meta → .../Exceptions/UnexpectedSceneSwitch.cs.meta b/Runtime/UnexpectedSceneSwitch.cs.meta → .../Exceptions/UnexpectedSceneSwitch.cs.meta
diff --git a/Runtime/Operations.meta b/Runtime/Operations.meta
diff --git a/Runtime/SceneLoadingOperation.cs → Runtime/Operations/SceneLoadingOperation.cs b/Runtime/SceneLoadingOperation.cs → Runtime/Operations/SceneLoadingOperation.cs
@@ -6,9 +6,10 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Depra.Loading.Operations;
+using Depra.Scenes.Definitions;
 using UnityEngine.SceneManagement;
 
-namespace Depra.Scenes
+namespace Depra.Scenes.Operations
 {
 	public sealed class SceneLoadingOperation : ILoadingOperation
 	{

diff --git a/Runtime/SceneLoadingOperation.cs.meta → .../Operations/SceneLoadingOperation.cs.meta b/Runtime/SceneLoadingOperation.cs.meta → .../Operations/SceneLoadingOperation.cs.meta
diff --git a/Runtime/SceneUnloadingOperation.cs → ...ime/Operations/SceneUnloadingOperation.cs b/Runtime/SceneUnloadingOperation.cs → ...ime/Operations/SceneUnloadingOperation.cs
@@ -5,9 +5,10 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Depra.Loading.Operations;
+using Depra.Scenes.Definitions;
 using UnityEngine.SceneManagement;
 
-namespace Depra.Scenes
+namespace Depra.Scenes.Operations
 {
 	public sealed class SceneUnloadingOperation : ILoadingOperation
 	{

diff --git a/Runtime/SceneUnloadingOperation.cs.meta → ...perations/SceneUnloadingOperation.cs.meta b/Runtime/SceneUnloadingOperation.cs.meta → ...perations/SceneUnloadingOperation.cs.meta
diff --git a/Runtime/Services.meta b/Runtime/Services.meta
diff --git a/Runtime/ISceneChange.cs → Runtime/Services/ISceneChange.cs b/Runtime/ISceneChange.cs → Runtime/Services/ISceneChange.cs
@@ -5,8 +5,9 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Depra.Loading.Operations;
+using Depra.Scenes.Definitions;
 
-namespace Depra.Scenes
+namespace Depra.Scenes.Services
 {
 	public interface ISceneChange
 	{

diff --git a/Runtime/ISceneChange.cs.meta → Runtime/Services/ISceneChange.cs.meta b/Runtime/ISceneChange.cs.meta → Runtime/Services/ISceneChange.cs.meta
diff --git a/Runtime/SceneChange.cs → Runtime/Services/SceneChange.cs b/Runtime/SceneChange.cs → Runtime/Services/SceneChange.cs
@@ -1,16 +1,18 @@
 // SPDX-License-Identifier: Apache-2.0
 // © 2023-2024 Nikolay Melnikov <[email protected]>
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Depra.Loading.Curtain;
 using Depra.Loading.Operations;
+using Depra.Scenes.Definitions;
+using Depra.Scenes.Exceptions;
+using Depra.Scenes.Operations;
 using UnityEngine.SceneManagement;
 
-namespace Depra.Scenes
+namespace Depra.Scenes.Services
 {
 	public sealed class SceneChange : ISceneChange
 	{
@@ -47,9 +49,8 @@ Task ISceneChange.Load(SceneDefinition scene, IEnumerable<ILoadingOperation> add
 
 		async Task ISceneChange.Unload(SceneDefinition scene, CancellationToken token)
 		{
-			var operations = new[] { new SceneLoadingOperation(scene, OperationDescription.Default(scene.Name)) };
-			ILoadingCurtain cleanCurtain = new CleanLoadingCurtain();
-			await cleanCurtain.Load(operations, token);
+			var operations = new[] { new SceneUnloadingOperation(scene, OperationDescription.Default(scene.Name)) };
+			await new CleanLoadingCurtain().Load(operations, token);
 		}
 
 		Task ISceneChange.Reload(IEnumerable<ILoadingOperation> addOperations, CancellationToken token) =>

diff --git a/Runtime/SceneChange.cs.meta → Runtime/Services/SceneChange.cs.meta b/Runtime/SceneChange.cs.meta → Runtime/Services/SceneChange.cs.meta
diff --git a/package.json b/package.json
@@ -1,10 +1,14 @@
 {
 	"name": "com.depra.scenes",
-	"version": "0.0.5",
+	"version": "0.0.6",
 	"displayName": "Depra.Scenes",
 	"description": "",
 	"unity": "2022.3",
 	"license": "Apache-2.0",
+	"dependencies": {
+		"com.depra.loading.unity": "0.0.5",
+		"com.depra.inspector.unity": "0.0.5"
+	},
 	"keywords": [
 		"depra",
 		"unity",