[v0.2.0] Cleaning; AuthoringAspect improvements

Depra-Inc · May 30, 2024 · 42a3b75 · 42a3b75
1 parent b96595d
commit 42a3b75
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 19 deletions.
diff --git a/Runtime/Attributes.meta b/Runtime/Attributes.meta
diff --git a/Runtime/Components/AuthoringAspect.cs b/Runtime/Components/AuthoringAspect.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using Depra.Ecs.Hybrid.Internal;
 using Depra.Ecs.Worlds;
 using UnityEngine;
 using static Depra.Ecs.Hybrid.Module;
@@ -12,8 +13,15 @@ namespace Depra.Ecs.Hybrid.Components
 	[AddComponentMenu(MENU_PATH + nameof(AuthoringAspect), DEFAULT_ORDER)]
 	public sealed class AuthoringAspect : MonoBehaviour, IAuthoring
 	{
+		[Tooltip("GameObjects with IAuthoring components to be baked.")]
 		[SerializeField] private GameObject _scope;
 
+		[Tooltip("What to do with the scope after baking.\n" +
+		         "None - do nothing,\n" +
+		         "Destroy Object - destroy this component and the scope,\n" +
+		         "Destroy Component - destroy this components and all IAuthoring components on the scope.")]
+		[SerializeField] private DestructionMode _destructionMode;
+
 		public IEnumerable<IAuthoring> Scoped => _scope
 			? _scope.GetComponents<IAuthoring>()
 			: Array.Empty<IAuthoring>();
@@ -31,7 +39,30 @@ void IBaker.Bake(IAuthoring authoring, World world)
 				foreach (var component in _aspect.Scoped)
 				{
 					component.CreateBaker().Bake(authoring, world);
-					Destroy((Component) component);
+					if (_aspect._destructionMode == DestructionMode.DESTROY_COMPONENT)
+					{
+						Destroy((Component) component);
+					}
+				}
+
+				FinalizeConversion();
+			}
+
+			private void FinalizeConversion()
+			{
+				switch (_aspect._destructionMode)
+				{
+					case DestructionMode.NONE:
+						break;
+					case DestructionMode.DESTROY_OBJECT:
+						Destroy(_aspect);
+						Destroy(_aspect._scope);
+						break;
+					case DestructionMode.DESTROY_COMPONENT:
+						Destroy(_aspect);
+						break;
+					default:
+						throw new ArgumentOutOfRangeException();
 				}
 			}
 		}

diff --git a/Runtime/Entities/AuthoringEntity.cs b/Runtime/Entities/AuthoringEntity.cs
@@ -6,7 +6,7 @@
 using System.Linq;
 using Depra.Ecs.Entities;
 using Depra.Ecs.Hybrid.Components;
-using Depra.Ecs.QoL.Components;
+using Depra.Ecs.Hybrid.Internal;
 using Depra.Ecs.QoL.Entities;
 using Depra.Ecs.QoL.Worlds;
 using Depra.Ecs.Unity;
@@ -33,7 +33,7 @@ private void OnEnable()
 			}
 
 			var world = UnityWorlds.Instance.Default;
-			world.Pools.Get<BakingEntityRef>().Allocate(world.CreateEntity()).Value = gameObject;
+			world.Pool<BakingEntityRef>().Allocate(world.CreateEntity()).Value = gameObject;
 		}
 
 		public IEnumerable<IAuthoring> Nested => GetComponents<IAuthoring>()

diff --git a/Runtime/Internal.meta b/Runtime/Internal.meta
diff --git a/Runtime/Entities/DestructionMode.cs → Runtime/Internal/DestructionMode.cs b/Runtime/Entities/DestructionMode.cs → Runtime/Internal/DestructionMode.cs
@@ -3,7 +3,7 @@
 
 using UnityEngine;
 
-namespace Depra.Ecs.Hybrid.Entities
+namespace Depra.Ecs.Hybrid.Internal
 {
 	internal enum DestructionMode
 	{

diff --git a/Runtime/Entities/DestructionMode.cs.meta → Runtime/Internal/DestructionMode.cs.meta b/Runtime/Entities/DestructionMode.cs.meta → Runtime/Internal/DestructionMode.cs.meta
diff --git a/...me/Attributes/Il2CppSetOptionAttribute.cs → Runtime/Internal/Il2CppSetOptionAttribute.cs b/...me/Attributes/Il2CppSetOptionAttribute.cs → Runtime/Internal/Il2CppSetOptionAttribute.cs
diff --git a/...tributes/Il2CppSetOptionAttribute.cs.meta → ...Internal/Il2CppSetOptionAttribute.cs.meta b/...tributes/Il2CppSetOptionAttribute.cs.meta → ...Internal/Il2CppSetOptionAttribute.cs.meta
diff --git a/Runtime/Systems/ContinuousBakingSystem.cs b/Runtime/Systems/ContinuousBakingSystem.cs
@@ -4,8 +4,8 @@
 using Depra.Ecs.Components;
 using Depra.Ecs.Entities;
 using Depra.Ecs.Hybrid.Entities;
-using Depra.Ecs.QoL.Components;
 using Depra.Ecs.QoL.Entities;
+using Depra.Ecs.QoL.Worlds;
 using Depra.Ecs.Systems;
 using Depra.Ecs.Worlds;
 #if ENABLE_IL2CPP
@@ -26,19 +26,22 @@ public sealed class ContinuousBakingSystem : IPreInitializationSystem, IExecutio
 		void IPreInitializationSystem.PreInitialize(IWorldGroup worlds)
 		{
 			var world = worlds.Default;
-			_bakingEntities = world.Pools.Get<BakingEntityRef>();
+			_bakingEntities = world.Pool<BakingEntityRef>();
 			_entities = new EntityQuery(typeof(BakingEntityRef)).Initialize(world);
 		}
 
-		void IExecutionSystem.Execute(float frameTime) => _entities.ForEach(entity =>
+		void IExecutionSystem.Execute(float frameTime)
 		{
-			var bakingObject = _bakingEntities[entity].Value;
-			if (bakingObject && bakingObject.TryGetComponent(out IAuthoringEntity authoring))
+			foreach (var entity in _entities)
 			{
-				authoring.CreateBaker().Bake(authoring, _bakingEntities.World);
-			}
+				var bakingObject = _bakingEntities[entity].Value;
+				if (bakingObject && bakingObject.TryGetComponent(out IAuthoringEntity authoring))
+				{
+					authoring.CreateBaker().Bake(authoring, _bakingEntities.World);
+				}
 
-			_bakingEntities.World.DeleteEntity(entity);
-		});
+				_bakingEntities.World.DeleteEntity(entity);
+			}
+		}
 	}
 }
diff --git a/Runtime/Worlds/RuntimeSceneBakeModule.cs b/Runtime/Worlds/RuntimeSceneBakeModule.cs
@@ -10,7 +10,7 @@
 
 namespace Depra.Ecs.Hybrid.Worlds
 {
-	public readonly struct RuntimeSceneBakeModule : IModule
+	public sealed class RuntimeSceneBakeModule : IModule
 	{
 		IEnumerable<IModule> IModule.Modules => Array.Empty<IModule>();
 

diff --git a/package.json b/package.json
@@ -1,12 +1,12 @@
 {
 	"name": "com.depra.ecs.hybrid",
-	"version": "0.1.11",
+	"version": "0.2.0",
 	"displayName": "Depra.Ecs.Hybrid",
 	"description": "Unity Conversion Workflow for Depra.Ecs. Easy convert GameObjects to Entity.",
 	"unity": "2022.3",
 	"license": "Apache-2.0",
 	"dependencies": {
-		"com.depra.ecs.unity": "0.2.6",
+		"com.depra.ecs.unity": "0.2.7",
 		"com.depra.serialize-reference.extensions": "0.0.14"
 	},
 	"keywords": [