com.elestrago.unity.entitas-redux 3.7.3 → 3.7.5

package/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 ---
 
+## [3.7.5](https://gitlab.com/elestrago-pkg/entitas-redux/-/tags/3.7.5)
+
+### Added
+
+- `IInitializeAsyncSystem`
+
+---
+
+## [3.7.4](https://gitlab.com/elestrago-pkg/entitas-redux/-/tags/3.7.4)
+
+### Fixed
+
+- `ContextObserver` do not add already created entities to observe
+
+---
+
 ## [3.7.3](https://gitlab.com/elestrago-pkg/entitas-redux/-/tags/3.7.3)
 
 ### Changed

package/Core/Context/Context.cs

@@ -341,6 +341,8 @@ namespace JCMG.EntitasRedux
 			return entity;
 		}
 
+		IEntity[] IContext.GetEntities() => GetEntities();
+
 		/// <summary>
 		/// Destroys all entities in the context.
 		/// Throws an exception if there are still retained entities.

package/Core/Context/IContext.cs

@@ -46,6 +46,8 @@ namespace JCMG.EntitasRedux
 
 		event ContextGroupChanged OnGroupCreated;
 
+		IEntity[] GetEntities();
+
 		void DestroyAllEntities();
 
 		void AddEntityIndex(IEntityIndex entityIndex);
@@ -67,7 +69,7 @@ namespace JCMG.EntitasRedux
 
 		bool HasEntity(TEntity entity);
 
-		TEntity[] GetEntities();
+		new TEntity[] GetEntities();
 
 		ArrayDisposable<TEntity> GetEntities(out Span<TEntity> entities);
 

package/Core/Systems/Interfaces/IInitializeAsyncSystem.cs

@@ -0,0 +1,10 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace JCMG.EntitasRedux
+{
+	public interface IInitializeAsyncSystem : ISystem
+	{
+		Task InitializeAsync(CancellationToken ct = default);
+	}
+}

package/Core/Systems/Interfaces/IInitializeAsyncSystem.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 317b63b5a6dc4edfa94787ffaacb1298
+timeCreated: 1765385799

package/Core/Systems/Interfaces/IInitializeSystem.cs

@@ -35,4 +35,4 @@ namespace JCMG.EntitasRedux
 		/// </summary>
 		void Initialize();
 	}
-}
+}

package/Core/Systems/Systems.cs

@@ -25,6 +25,8 @@ THE SOFTWARE.
 
 using System;
 using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
 using EntitasRedux.Core.Libs;
 
 namespace JCMG.EntitasRedux
@@ -37,6 +39,7 @@ namespace JCMG.EntitasRedux
 	/// you added them.
 	/// </summary>
 	public class Systems : IInitializeSystem,
+		IInitializeAsyncSystem,
 		IUpdateSystem,
 		IFixedUpdateSystem,
 		ILateUpdateSystem,
@@ -44,35 +47,21 @@ namespace JCMG.EntitasRedux
 		ICleanupSystem,
 		ITearDownSystem
 	{
-		protected readonly List<IFixedUpdateSystem> _fixedUpdateSystems;
-		protected readonly List<IUpdateSystem> _updateSystems;
-		protected readonly List<ILateUpdateSystem> _lateUpdateSystems;
-		protected readonly List<IReactiveSystem> _reactiveSystems;
+		protected readonly List<IFixedUpdateSystem> _fixedUpdateSystems = new();
+		protected readonly List<IUpdateSystem> _updateSystems = new();
+		protected readonly List<ILateUpdateSystem> _lateUpdateSystems = new();
+		protected readonly List<IReactiveSystem> _reactiveSystems = new();
 
-		protected readonly List<IInitializeSystem> _initializeSystems;
-		protected readonly List<ICleanupSystem> _cleanupSystems;
-		protected readonly List<ITearDownSystem> _tearDownSystems;
+		protected readonly List<IInitializeSystem> _initializeSystems = new();
+		protected readonly List<IInitializeAsyncSystem> _initializeAsyncSystems = new();
+		protected readonly List<ICleanupSystem> _cleanupSystems = new();
+		protected readonly List<ITearDownSystem> _tearDownSystems = new();
 
 		private Memory<IFixedUpdateSystem> _fixedUpdateSystemsMemory;
 		private Memory<IUpdateSystem> _updateSystemsMemory;
 		private Memory<ILateUpdateSystem> _lateUpdateSystemsMemory;
 		private Memory<ICleanupSystem> _cleanupSystemsMemory;
 
-		/// <summary>
-		/// Creates a new Systems instance.
-		/// </summary>
-		public Systems()
-		{
-			_fixedUpdateSystems = new List<IFixedUpdateSystem>();
-			_updateSystems = new List<IUpdateSystem>();
-			_lateUpdateSystems = new List<ILateUpdateSystem>();
-			_reactiveSystems = new List<IReactiveSystem>();
-
-			_initializeSystems = new List<IInitializeSystem>();
-			_cleanupSystems = new List<ICleanupSystem>();
-			_tearDownSystems = new List<ITearDownSystem>();
-		}
-
 		/// <summary>
 		/// Adds the <see cref="ISystem"/> instance to the systems list.
 		/// </summary>
@@ -85,6 +74,11 @@ namespace JCMG.EntitasRedux
 				_initializeSystems.Add(initializeSystem);
 			}
 
+			if (system is IInitializeAsyncSystem initializeAsyncSystem)
+			{
+				_initializeAsyncSystems.Add(initializeAsyncSystem);
+			}
+
 			if (system is IFixedUpdateSystem fixedUpdateSystem)
 			{
 				_fixedUpdateSystems.Add(fixedUpdateSystem);
@@ -208,6 +202,16 @@ namespace JCMG.EntitasRedux
 			}
 		}
 
+		public virtual async Task InitializeAsync(CancellationToken ct)
+		{
+			for (var i = 0; i < _initializeAsyncSystems.Count; i++)
+			{
+				ct.ThrowIfCancellationRequested();
+
+				await _initializeAsyncSystems[i].InitializeAsync(ct);
+			}
+		}
+
 		/// <summary>
 		/// Calls Cleanup() on all <see cref="ICleanupSystem"/> and other nested systems instances in the order you
 		/// added them.

package/Runtime/VisualDebugging/ContextObserver/ContextObserver.cs

@@ -54,6 +54,12 @@ namespace JCMG.EntitasRedux.VisualDebugging
 
 			_context.OnEntityCreated += OnEntityCreated;
 			_context.OnGroupCreated += OnGroupCreated;
+
+			var entities = _context.GetEntities();
+			foreach (var entity in entities)
+			{
+				OnEntityCreated(_context, entity);
+			}
 		}
 
 		public void Deactivate()
@@ -104,4 +110,4 @@ namespace JCMG.EntitasRedux.VisualDebugging
 			return str;
 		}
 	}
-}
+}

package/Runtime/VisualDebugging/DebugSystems/DebugSystems.cs

@@ -26,6 +26,8 @@ THE SOFTWARE.
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using UnityEngine;
 
 namespace JCMG.EntitasRedux.VisualDebugging
@@ -51,6 +53,21 @@ namespace JCMG.EntitasRedux.VisualDebugging
 			}
 		}
 
+		public int TotalInitializeAsyncSystemsCount
+		{
+			get
+			{
+				var total = 0;
+				for (var i = 0; i < _initializeAsyncSystems.Count; i++)
+				{
+					var system = _initializeAsyncSystems[i];
+					total += system is DebugSystems debugSystems ? debugSystems.TotalInitializeAsyncSystemsCount : 1;
+				}
+
+				return total;
+			}
+		}
+
 		/// <summary>
 		/// Returns the total number of <see cref="IUpdateSystem"/> instances in this <see cref="DebugSystems"/> and
 		/// any child <see cref="DebugSystems"/>.
@@ -192,9 +209,11 @@ namespace JCMG.EntitasRedux.VisualDebugging
 
 		public double AverageUpdateDuration => _updateSystemInfos.Select(x => x.AverageUpdateDuration).Sum();
 
-		public double AverageFixedUpdateDuration => _fixedUpdateSystemInfos.Select(x => x.AverageFixedUpdateDuration).Sum();
+		public double AverageFixedUpdateDuration
+			=> _fixedUpdateSystemInfos.Select(x => x.AverageFixedUpdateDuration).Sum();
 
-		public double AverageLateUpdateDuration => _lateUpdateSystemInfos.Select(x => x.AverageLateUpdateDuration).Sum();
+		public double AverageLateUpdateDuration
+			=> _lateUpdateSystemInfos.Select(x => x.AverageLateUpdateDuration).Sum();
 
 		public double AverageReactiveDuration => _lateUpdateSystemInfos.Select(x => x.AverageReactiveDuration).Sum();
 
@@ -212,6 +231,8 @@ namespace JCMG.EntitasRedux.VisualDebugging
 
 		public IReadOnlyList<SystemInfo> InitializeSystemInfos => _initializeSystemInfos;
 
+		public IReadOnlyList<SystemInfo> InitializeAsyncSystemInfos => _initializeAsyncSystemInfos;
+
 		public IReadOnlyList<SystemInfo> UpdateSystemInfos => _updateSystemInfos;
 
 		public IReadOnlyList<SystemInfo> FixedUpdateSystemInfos => _fixedUpdateSystemInfos;
@@ -235,6 +256,7 @@ namespace JCMG.EntitasRedux.VisualDebugging
 
 		private List<SystemInfo> _allSystemInfos;
 		private List<SystemInfo> _initializeSystemInfos;
+		private List<SystemInfo> _initializeAsyncSystemInfos;
 		private List<SystemInfo> _updateSystemInfos;
 		private List<SystemInfo> _fixedUpdateSystemInfos;
 		private List<SystemInfo> _lateUpdateSystemInfos;
@@ -273,6 +295,7 @@ namespace JCMG.EntitasRedux.VisualDebugging
 
 			_allSystemInfos = new List<SystemInfo>();
 			_initializeSystemInfos = new List<SystemInfo>();
+			_initializeAsyncSystemInfos = new List<SystemInfo>();
 			_updateSystemInfos = new List<SystemInfo>();
 			_fixedUpdateSystemInfos = new List<SystemInfo>();
 			_lateUpdateSystemInfos = new List<SystemInfo>();
@@ -310,6 +333,11 @@ namespace JCMG.EntitasRedux.VisualDebugging
 				_initializeSystemInfos.Add(childSystemInfo);
 			}
 
+			if (childSystemInfo.IsInitializeAsyncSystems)
+			{
+				_initializeAsyncSystemInfos.Add(childSystemInfo);
+			}
+
 			if (childSystemInfo.IsUpdateSystems || childSystemInfo.IsReactiveSystems)
 			{
 				_updateSystemInfos.Add(childSystemInfo);
@@ -366,14 +394,32 @@ namespace JCMG.EntitasRedux.VisualDebugging
 			for (var i = 0; i < _initializeSystems.Count; i++)
 			{
 				var systemInfo = _initializeSystemInfos[i];
-				if (systemInfo.isActive)
-				{
-					_stopwatch.Reset();
-					_stopwatch.Start();
-					_initializeSystems[i].Initialize();
-					_stopwatch.Stop();
-					systemInfo.InitializationDuration = _stopwatch.Elapsed.TotalMilliseconds;
-				}
+				if (!systemInfo.isActive)
+					continue;
+
+				_stopwatch.Reset();
+				_stopwatch.Start();
+				_initializeSystems[i].Initialize();
+				_stopwatch.Stop();
+				systemInfo.InitializationDuration = _stopwatch.Elapsed.TotalMilliseconds;
+			}
+		}
+
+		public override async Task InitializeAsync(CancellationToken ct)
+		{
+			for (var i = 0; i < _initializeAsyncSystems.Count; i++)
+			{
+				ct.ThrowIfCancellationRequested();
+
+				var systemInfo = _initializeAsyncSystemInfos[i];
+				if (!systemInfo.isActive)
+					continue;
+
+				_stopwatch.Reset();
+				_stopwatch.Start();
+				await _initializeAsyncSystems[i].InitializeAsync(ct);
+				_stopwatch.Stop();
+				systemInfo.InitializationDuration = _stopwatch.Elapsed.TotalMilliseconds;
 			}
 		}
 
@@ -474,4 +520,4 @@ namespace JCMG.EntitasRedux.VisualDebugging
 			}
 		}
 	}
-}
+}

package/Runtime/VisualDebugging/DebugSystems/SystemInfo.cs

@@ -31,15 +31,17 @@ namespace JCMG.EntitasRedux.VisualDebugging
 	public enum SystemInterfaceFlags
 	{
 		None = 0,
-		InitializeSystem = 1 << 1,
-		FixedUpdateSystem = 1 << 6,
+		InitializeSystem = 1 << 0,
+		InitializeAsyncSystem = 1 << 1,
 		UpdateSystem = 1 << 2,
-		LateUpdateSystem = 1 << 7,
-		ReactiveSystem = 1 << 5,
 		CleanupSystem = 1 << 3,
-		TearDownSystem = 1 << 4
+		TearDownSystem = 1 << 4,
+		ReactiveSystem = 1 << 5,
+		FixedUpdateSystem = 1 << 6,
+		LateUpdateSystem = 1 << 7,
 	}
 
+
 	public class SystemInfo
 	{
 		public ISystem System { get; }
@@ -54,6 +56,9 @@ namespace JCMG.EntitasRedux.VisualDebugging
 		public bool IsInitializeSystems =>
 			(_interfaceFlags & SystemInterfaceFlags.InitializeSystem) == SystemInterfaceFlags.InitializeSystem;
 
+		public bool IsInitializeAsyncSystems =>
+			(_interfaceFlags & SystemInterfaceFlags.InitializeAsyncSystem) == SystemInterfaceFlags.InitializeAsyncSystem;
+
 		public bool IsUpdateSystems =>
 			(_interfaceFlags & SystemInterfaceFlags.UpdateSystem) == SystemInterfaceFlags.UpdateSystem;
 
@@ -311,6 +316,11 @@ namespace JCMG.EntitasRedux.VisualDebugging
 				flags |= SystemInterfaceFlags.InitializeSystem;
 			}
 
+			if (system is IInitializeAsyncSystem)
+			{
+				flags |= SystemInterfaceFlags.InitializeAsyncSystem;
+			}
+
 			if (system is IFixedUpdateSystem)
 			{
 				flags |= SystemInterfaceFlags.FixedUpdateSystem;

package/Runtime/VisualDebugging/Editor/DebugSystems/DebugSystemsBehaviourInspector.cs

@@ -60,6 +60,7 @@ namespace JCMG.EntitasRedux.VisualDebugging.Editor
 		private static bool _showSystemsList = true;
 
 		private static bool _showInitializeSystems = true;
+		private static bool _showInitializeAsyncSystems = true;
 		private static bool _showFixedUpdateSystems = true;
 		private static bool _showUpdateSystems = true;
 		private static bool _showLateUpdateSystems = true;
@@ -94,6 +95,7 @@ namespace JCMG.EntitasRedux.VisualDebugging.Editor
 
 		// System Section Titles
 		private const string INITIALIZE_SYSTEMS_TITLE = "Initialize Systems";
+		private const string INITIALIZE_ASYNC_SYSTEMS_TITLE = "Initialize Async Systems";
 		private const string FIXED_UPDATE_SYSTEMS_TITLE = "Fixed Update Systems";
 		private const string UPDATE_SYSTEMS_TITLE = "Update Systems";
 		private const string LATE_UPDATE_SYSTEMS_TITLE = "Late Update Systems";
@@ -103,6 +105,7 @@ namespace JCMG.EntitasRedux.VisualDebugging.Editor
 
 		// Count Labels
 		private const string INITIALIZE_SYSTEMS_COUNT_LABEL = "Initialize Systems";
+		private const string INITIALIZE_ASYNC_SYSTEMS_COUNT_LABEL = "Initialize Async Systems";
 		private const string FIXED_UPDATE_SYSTEMS_COUNT_LABEL = "Fixed Update Systems";
 		private const string UPDATE_SYSTEMS_COUNT_LABEL = "Update Systems";
 		private const string LATE_UPDATE_SYSTEMS_COUNT_LABEL = "Late Update Systems";
@@ -190,6 +193,7 @@ namespace JCMG.EntitasRedux.VisualDebugging.Editor
 				using (new EditorGUILayout.VerticalScope(EntitasReduxStyles.SectionContent))
 				{
 					EditorGUILayout.LabelField(INITIALIZE_SYSTEMS_COUNT_LABEL, systems.TotalInitializeSystemsCount.ToString());
+					EditorGUILayout.LabelField(INITIALIZE_ASYNC_SYSTEMS_COUNT_LABEL, systems.TotalInitializeAsyncSystemsCount.ToString());
 					EditorGUILayout.LabelField(FIXED_UPDATE_SYSTEMS_COUNT_LABEL, systems.TotalFixedUpdateSystemsCount.ToString());
 					EditorGUILayout.LabelField(UPDATE_SYSTEMS_COUNT_LABEL, systems.TotalUpdateSystemsCount.ToString());
 					EditorGUILayout.LabelField(LATE_UPDATE_SYSTEMS_COUNT_LABEL, systems.TotalLateUpdateSystemsCount.ToString());
@@ -354,6 +358,7 @@ namespace JCMG.EntitasRedux.VisualDebugging.Editor
 					EditorGUILayout.Space();
 
 					DrawSystemSection(INITIALIZE_SYSTEMS_TITLE, ref _showInitializeSystems, systems, SystemInterfaceFlags.InitializeSystem);
+					DrawSystemSection(INITIALIZE_ASYNC_SYSTEMS_TITLE, ref _showInitializeAsyncSystems, systems, SystemInterfaceFlags.InitializeAsyncSystem);
 					DrawSystemSection(FIXED_UPDATE_SYSTEMS_TITLE, ref _showFixedUpdateSystems, systems, SystemInterfaceFlags.FixedUpdateSystem);
 					DrawSystemSection(UPDATE_SYSTEMS_TITLE, ref _showUpdateSystems, systems, SystemInterfaceFlags.UpdateSystem);
 					DrawSystemSection(LATE_UPDATE_SYSTEMS_TITLE, ref _showLateUpdateSystems, systems, SystemInterfaceFlags.LateUpdateSystem);
@@ -393,6 +398,10 @@ namespace JCMG.EntitasRedux.VisualDebugging.Editor
 					systemInfos = systems.InitializeSystemInfos
 						.Where(systemInfo => systemInfo.InitializationDuration >= _threshold);
 					break;
+				case SystemInterfaceFlags.InitializeAsyncSystem:
+					systemInfos = systems.InitializeAsyncSystemInfos
+						.Where(systemInfo => systemInfo.InitializationDuration >= _threshold);
+					break;
 				case SystemInterfaceFlags.FixedUpdateSystem:
 					systemInfos = systems.FixedUpdateSystemInfos
 						.Where(systemInfo => systemInfo.AverageFixedUpdateDuration >= _threshold);
@@ -479,6 +488,7 @@ namespace JCMG.EntitasRedux.VisualDebugging.Editor
 							switch (type)
 							{
 								case SystemInterfaceFlags.InitializeSystem:
+								case SystemInterfaceFlags.InitializeAsyncSystem:
 									DrawSimpleSystemInfoPerformance(
 										systemInfo.SystemName,
 										systemInfo.InitializationDuration,
@@ -614,6 +624,8 @@ namespace JCMG.EntitasRedux.VisualDebugging.Editor
 			{
 				case SystemInterfaceFlags.InitializeSystem:
 					return systems.TotalInitializeSystemsCount > 0;
+				case SystemInterfaceFlags.InitializeAsyncSystem:
+					return systems.TotalInitializeAsyncSystemsCount > 0;
 				case SystemInterfaceFlags.FixedUpdateSystem:
 					return systems.TotalFixedUpdateSystemsCount > 0;
 				case SystemInterfaceFlags.UpdateSystem:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.elestrago.unity.entitas-redux",
-  "version": "3.7.3",
+  "version": "3.7.5",
   "displayName": "JCMG Entitas Redux",
   "description": "Entitas Redux is an fast, accessible, and feature-rich ECS framework for Unity. It leverages code generation and an extensible plugin framework to make life easier for developers.",
   "category": "Unity",