com.elestrago.unity.entitas-redux 3.4.2 → 3.5.0

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ---
 
+## [3.5.0](https://gitlab.com/elestrago-pkg/entitas-redux/-/tags/3.5.0)
+
+### Changed
+
+- Use SingleMatcher for context component matchers
+
+---
+
 ## [3.4.2](https://gitlab.com/elestrago-pkg/entitas-redux/-/tags/3.4.2)
 
 ### Added

package/Core/Matcher/Interfaces/IMatcher.cs

@@ -28,7 +28,13 @@ namespace JCMG.EntitasRedux
 	public interface IMatcher<TEntity>
 		where TEntity : class, IEntity
 	{
+		/// <summary>
+		/// Initialized in context matcher implementation
+		/// </summary>
+		public static string[] ComponentNames;
+
 		int[] Indices { get; }
+
 		bool Matches(TEntity entity);
 	}
-}
+}

package/Core/Matcher/Matcher.cs

@@ -28,26 +28,13 @@ namespace JCMG.EntitasRedux
 	public partial class Matcher<TEntity> : IAllOfMatcher<TEntity>
 		where TEntity : class, IEntity
 	{
-		public string[] ComponentNames { get; set; }
-
 		private int[] _allOfIndices;
 		private int[] _anyOfIndices;
 
 		private int[] _indices;
 		private int[] _noneOfIndices;
 
-		public int[] Indices
-		{
-			get
-			{
-				if (_indices == null)
-				{
-					_indices = MergeIndices(_allOfIndices, _anyOfIndices, _noneOfIndices);
-				}
-
-				return _indices;
-			}
-		}
+		public int[] Indices => _indices ??= MergeIndices(_allOfIndices, _anyOfIndices, _noneOfIndices);
 
 		public int[] AllOfIndices => _allOfIndices;
 
@@ -84,8 +71,8 @@ namespace JCMG.EntitasRedux
 		public bool Matches(TEntity entity)
 		{
 			return (_allOfIndices == null || entity.HasComponents(_allOfIndices)) &&
-				   (_anyOfIndices == null || entity.HasAnyComponent(_anyOfIndices)) &&
-				   (_noneOfIndices == null || !entity.HasAnyComponent(_noneOfIndices));
+			       (_anyOfIndices == null || entity.HasAnyComponent(_anyOfIndices)) &&
+			       (_noneOfIndices == null || !entity.HasAnyComponent(_noneOfIndices));
 		}
 	}
-}
+}

package/Core/Matcher/MatcherStatic.cs

@@ -33,46 +33,32 @@ namespace JCMG.EntitasRedux
 		/// <summary>
 		/// Lazy-loaded index buffer (ThreadStatic)
 		/// </summary>
-		private static List<int> IndexBuffer => _indexBufferThreadStatic = _indexBufferThreadStatic ?? new List<int>();
+		private static List<int> IndexBuffer => _indexBufferThreadStatic ??= new List<int>();
 
 		/// <summary>
 		/// Lazy-loaded index set buffer (ThreadStatic)
 		/// </summary>
-		private static HashSet<int> IndexSetBuffer => _indexSetBufferThreadStatic = _indexSetBufferThreadStatic ?? new HashSet<int>();
+		private static HashSet<int> IndexSetBuffer => _indexSetBufferThreadStatic ??= new HashSet<int>();
 
-		[ThreadStatic]
-		private static List<int> _indexBufferThreadStatic = new();
+		[ThreadStatic] private static List<int> _indexBufferThreadStatic = new();
 
-		[ThreadStatic]
-		private static HashSet<int> _indexSetBufferThreadStatic = new();
+		[ThreadStatic] private static HashSet<int> _indexSetBufferThreadStatic = new();
 
-		public static IAllOfMatcher<TEntity> AllOf(params int[] indices)
+		public static IAllOfMatcher<TEntity> AllOf(params int[] indices) => new Matcher<TEntity>
 		{
-			var matcher = new Matcher<TEntity>();
-			matcher._allOfIndices = DistinctIndices(indices);
-			return matcher;
-		}
+			_allOfIndices = DistinctIndices(indices)
+		};
 
 		public static IAllOfMatcher<TEntity> AllOf(params IMatcher<TEntity>[] matchers)
-		{
-			var allOfMatcher = (Matcher<TEntity>)AllOf(MergeIndices(matchers));
-			SetComponentNames(ref allOfMatcher, matchers);
-			return allOfMatcher;
-		}
+			=> AllOf(MergeIndices(matchers));
 
-		public static IAnyOfMatcher<TEntity> AnyOf(params int[] indices)
+		public static IAnyOfMatcher<TEntity> AnyOf(params int[] indices) => new Matcher<TEntity>
 		{
-			var matcher = new Matcher<TEntity>();
-			matcher._anyOfIndices = DistinctIndices(indices);
-			return matcher;
-		}
+			_anyOfIndices = DistinctIndices(indices)
+		};
 
 		public static IAnyOfMatcher<TEntity> AnyOf(params IMatcher<TEntity>[] matchers)
-		{
-			var anyOfMatcher = (Matcher<TEntity>)AnyOf(MergeIndices(matchers));
-			SetComponentNames(ref anyOfMatcher, matchers);
-			return anyOfMatcher;
-		}
+			=> AnyOf(MergeIndices(matchers));
 
 		private static int[] MergeIndices(int[] allOfIndices, int[] anyOfIndices, int[] noneOfIndices)
 		{
@@ -115,28 +101,6 @@ namespace JCMG.EntitasRedux
 			return indices;
 		}
 
-		private static string[] GetComponentNames(IMatcher<TEntity>[] matchers)
-		{
-			for (var i = 0; i < matchers.Length; i++)
-			{
-				if (matchers[i] is Matcher<TEntity> matcher && matcher.ComponentNames != null)
-				{
-					return matcher.ComponentNames;
-				}
-			}
-
-			return null;
-		}
-
-		private static void SetComponentNames(ref Matcher<TEntity> matcher, IMatcher<TEntity>[] matchers)
-		{
-			var componentNames = GetComponentNames(matchers);
-			if (componentNames != null)
-			{
-				matcher.ComponentNames = componentNames;
-			}
-		}
-
 		private static int[] DistinctIndices(IList<int> indices)
 		{
 			foreach (var index in indices)
@@ -153,4 +117,4 @@ namespace JCMG.EntitasRedux
 			return uniqueIndices;
 		}
 	}
-}
+}

package/Core/Matcher/MatcherToString.cs

@@ -29,55 +29,36 @@ namespace JCMG.EntitasRedux
 {
 	public partial class Matcher<TEntity>
 	{
-		private StringBuilder _toStringBuilder;
+		private static StringBuilder _toStringBuilder;
 
 		private string _toStringCache;
 
 		public override string ToString()
 		{
-			if (_toStringCache == null)
-			{
-				if (_toStringBuilder == null)
-				{
-					_toStringBuilder = new StringBuilder();
-				}
+			if (_toStringCache != null)
+				return _toStringCache;
 
-				_toStringBuilder.Length = 0;
-				if (_allOfIndices != null)
-				{
-					AppendIndices(
-						_toStringBuilder,
-						"AllOf",
-						_allOfIndices,
-						ComponentNames);
-				}
+			_toStringBuilder ??= new StringBuilder();
+			_toStringBuilder.Length = 0;
 
-				if (_anyOfIndices != null)
-				{
-					if (_allOfIndices != null)
-					{
-						_toStringBuilder.Append(".");
-					}
-
-					AppendIndices(
-						_toStringBuilder,
-						"AnyOf",
-						_anyOfIndices,
-						ComponentNames);
-				}
+			var componentNames = IMatcher<TEntity>.ComponentNames;
 
-				if (_noneOfIndices != null)
-				{
-					AppendIndices(
-						_toStringBuilder,
-						".NoneOf",
-						_noneOfIndices,
-						ComponentNames);
-				}
+			if (_allOfIndices != null)
+				AppendIndices(_toStringBuilder, "AllOf", _allOfIndices, componentNames);
 
-				_toStringCache = _toStringBuilder.ToString();
+			if (_anyOfIndices != null)
+			{
+				if (_allOfIndices != null)
+					_toStringBuilder.Append(".");
+
+				AppendIndices(_toStringBuilder, "AnyOf", _anyOfIndices, componentNames);
 			}
 
+			if (_noneOfIndices != null)
+				AppendIndices(_toStringBuilder, ".NoneOf", _noneOfIndices, componentNames);
+
+			_toStringCache = _toStringBuilder.ToString();
+
 			return _toStringCache;
 		}
 
@@ -108,4 +89,4 @@ namespace JCMG.EntitasRedux
 			sb.Append(")");
 		}
 	}
-}
+}

package/Core/Matcher/SingleMatcher.cs

@@ -0,0 +1,27 @@
+namespace JCMG.EntitasRedux
+{
+	public class SingleMatcher<TEntity> : IMatcher<TEntity>
+		where TEntity : class, IEntity
+	{
+		private readonly int _index;
+
+		private string _toStringCache;
+
+		public SingleMatcher(int index)
+		{
+			_index = index;
+			Indices = new[] { index };
+		}
+
+		public int[] Indices { get; }
+
+		public bool Matches(TEntity entity) => entity.HasComponent(_index);
+
+		public override string ToString()
+		{
+			return string.IsNullOrEmpty(_toStringCache)
+				? _toStringCache = $"AllOf({IMatcher<TEntity>.ComponentNames[_index]})"
+				: _toStringCache;
+		}
+	}
+}

package/Core/Matcher/SingleMatcher.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 0de81d27fdf948639fc5064d90d0bd2a
+timeCreated: 1754409881

package/package.json

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