com.elestrago.unity.entitas-redux 3.7.2 → 3.7.4

package/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 ---
 
+## [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
+
+- Simplified `LinkableView` component subscription pattern by removing `IUnsubscribeEvent` dependency and replacing with
+  direct `OnEntityLinked`/`OnEntityUnlinked` lifecycle methods
+- Updated event listener API to support `invokeOnSubscribe` parameter in add event listener method
+
+### Removed
+
+- `UnsubscribeEvent` class and related utilities
+
+---
+
 ## [3.7.2](https://gitlab.com/elestrago-pkg/entitas-redux/-/tags/3.7.2)
 
 ### Fixed

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/Runtime/Core/View/Impls/LinkableView.cs

@@ -1,4 +1,3 @@
-using JCMG.EntitasRedux.Core.Utils;
 using UnityEngine;
 
 namespace JCMG.EntitasRedux.Core.View.Impls
@@ -6,10 +5,15 @@ namespace JCMG.EntitasRedux.Core.View.Impls
 	public abstract class LinkableView<TEntity> : LinkableView
 		where TEntity : class, IEntity
 	{
-		protected sealed override void Subscribe(IEntity entity, IUnsubscribeEvent unsubscribe)
-			=> Subscribe(entity as TEntity, unsubscribe);
+		protected sealed override void OnEntityLinked(IEntity entity) => OnEntityLinked(entity as TEntity);
 
-		protected virtual void Subscribe(TEntity entity, IUnsubscribeEvent unsubscribe)
+		protected virtual void OnEntityLinked(TEntity entity)
+		{
+		}
+
+		protected sealed override void OnEntityUnlinked(IEntity entity) => OnEntityUnlinked(entity as TEntity);
+
+		protected virtual void OnEntityUnlinked(TEntity entity)
 		{
 		}
 	}
@@ -17,8 +21,6 @@ namespace JCMG.EntitasRedux.Core.View.Impls
 	[RequireComponent(typeof(EntityLink))]
 	public abstract partial class LinkableView : MonoBehaviour, ILinkable
 	{
-		private readonly UnsubscribeEvent _unsubscribeEvent = new();
-
 		[SerializeField] protected EntityLink entityLink;
 
 		private bool _destroyed;
@@ -40,7 +42,7 @@ namespace JCMG.EntitasRedux.Core.View.Impls
 				return;
 
 			entity.OnBeforeDestroyEntity += OnDestroyEntity;
-			Subscribe(entity, _unsubscribeEvent);
+			OnEntityLinked(entity);
 		}
 
 		public void Unlink()
@@ -59,26 +61,18 @@ namespace JCMG.EntitasRedux.Core.View.Impls
 			if (entity.Enabled)
 			{
 				entity.OnBeforeDestroyEntity -= OnDestroyEntity;
-				Unsubscribe();
+				OnEntityUnlinked(entity);
 			}
 
 			if (!_destroyed)
-				OnClear();
+				OnEntityDestroy();
 		}
 
-		protected abstract void Subscribe(IEntity entity, IUnsubscribeEvent unsubscribe);
+		protected abstract void OnEntityLinked(IEntity entity);
 
-		private void Unsubscribe()
-		{
-			_unsubscribeEvent.Clear();
-			OnUnsubscribe();
-		}
-
-		protected virtual void OnUnsubscribe()
-		{
-		}
+		protected abstract void OnEntityUnlinked(IEntity entity);
 
-		protected virtual void OnClear()
+		protected virtual void OnEntityDestroy()
 		{
 		}
 

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.elestrago.unity.entitas-redux",
-  "version": "3.7.2",
+  "version": "3.7.4",
   "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",

package/Runtime/Core/Utils/UnsubscribeEvent.cs

@@ -1,30 +0,0 @@
-using System;
-using EntitasRedux.Core.Libs;
-
-namespace JCMG.EntitasRedux.Core.Utils
-{
-	public class UnsubscribeEvent : IUnsubscribeEvent
-	{
-		private readonly Event<Action> _events = new();
-
-		public event Action Value
-		{
-			add => _events.AddListener(value);
-			remove => _events.RemoveListener(value);
-		}
-
-		public void Clear()
-		{
-			using var _ = _events.Invokable(out var listeners);
-			_events.RemoveAllListeners();
-
-			foreach (var listener in listeners)
-				listener();
-		}
-	}
-
-	public interface IUnsubscribeEvent
-	{
-		event Action Value;
-	}
-}

package/Runtime/Core/Utils/UnsubscribeEvent.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: b07e7461736e4e0e922ac0177723ceb2
-timeCreated: 1678487489

package/Runtime/Core/Utils/UnsubscribeEventExtensions.cs

@@ -1,13 +0,0 @@
-using System;
-
-namespace JCMG.EntitasRedux.Core.Utils
-{
-	public static class UnsubscribeEventExtensions
-	{
-		public static IDisposable AddTo(this IDisposable disposable, IUnsubscribeEvent unsubscribe)
-		{
-			unsubscribe.Value += disposable.Dispose;
-			return disposable;
-		}
-	}
-}

package/Runtime/Core/Utils/UnsubscribeEventExtensions.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 8c9e182590544717a4755da46f9f806f
-timeCreated: 1678487883

package/Runtime/Core/Utils.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 823e28aebd324636ab22d6c8d563ed6a
-timeCreated: 1678487365