Remove DesperateDevs dependencies from Entitas project

sschmid · Jul 27, 2023 · 841bdf0 · 841bdf0
1 parent 1dbba27
commit 841bdf0
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 162 deletions.
diff --git a/src/Entitas.Unity.Editor/Entitas.Unity.Editor.csproj b/src/Entitas.Unity.Editor/Entitas.Unity.Editor.csproj
@@ -6,6 +6,7 @@
  </PropertyGroup>
 
  <ItemGroup>
+ <PackageReference Include="DesperateDevs.Reflection" Version="1.*" />
  <PackageReference Include="DesperateDevs.Unity.Editor" Version="2.*" />
  </ItemGroup>
 

diff --git a/src/Entitas/Context/Context.cs b/src/Entitas/Context/Context.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using DesperateDevs.Caching;
 
 namespace Entitas
 {
@@ -108,17 +107,16 @@ public Context(int totalComponents, int startCreationIndex, ContextInfo contextI
  _componentPools = new Stack<IComponent>[totalComponents];
  _entityIndexes = new Dictionary<string, IEntityIndex>();
 
- var groupChangedListPool = new ObjectPool<List<GroupChanged<TEntity>>>(
- () => new List<GroupChanged<TEntity>>(),
- list => list.Clear()
- );
-
+ var groupChangedListPool = new Stack<List<GroupChanged<TEntity>>>();
  _onEntityChangedDelegate = (entity, index, component) =>
  {
  var groups = _groupsForIndex[index];
  if (groups != null)
  {
- var events = groupChangedListPool.Get();
+ var events = groupChangedListPool.Count != 0
+ ? groupChangedListPool.Pop()
+ : new List<GroupChanged<TEntity>>();
+
  var tEntity = (TEntity)entity;
 
  for (var i = 0; i < groups.Count; i++)
@@ -127,6 +125,7 @@ public Context(int totalComponents, int startCreationIndex, ContextInfo contextI
  for (var i = 0; i < events.Count; i++)
  events[i]?.Invoke(groups[i], tEntity, index, component);
 
+ events.Clear();
  groupChangedListPool.Push(events);
  }
  };
@@ -238,6 +237,12 @@ public TEntity[] GetEntities()
  return _entitiesCache ??= _entities.ToArray();
  }
 
+ /// Returns all entities matching the specified matcher.
+ public TEntity[] GetEntities(IMatcher<TEntity> matcher)
+ {
+ return GetGroup(matcher).GetEntities();
+ }
+
  /// Returns a group for the specified matcher.
  /// Calling context.GetGroup(matcher) with the same matcher will always
  /// return the same instance of the group.

diff --git a/src/Entitas/Context/ContextExtension.cs b/src/Entitas/Context/ContextExtension.cs
diff --git a/src/Entitas/Context/IContext.cs b/src/Entitas/Context/IContext.cs
@@ -41,7 +41,7 @@ public interface IContext<TEntity> : IContext where TEntity : Entity
 
  bool HasEntity(TEntity entity);
  TEntity[] GetEntities();
-
+ TEntity[] GetEntities(IMatcher<TEntity> matcher);
  IGroup<TEntity> GetGroup(IMatcher<TEntity> matcher);
  }
 }
diff --git a/src/Entitas/Entitas.csproj b/src/Entitas/Entitas.csproj
@@ -12,9 +12,4 @@
  </EmbeddedResource>
  </ItemGroup>
 
- <ItemGroup>
- <PackageReference Include="DesperateDevs.Caching" Version="1.*" />
- <PackageReference Include="DesperateDevs.Reflection" Version="1.*" />
- </ItemGroup>
-
 </Project>
diff --git a/src/Entitas/Extensions/PublicMemberInfoEntityExtension.cs b/src/Entitas/Extensions/PublicMemberInfoEntityExtension.cs
diff --git a/tests/Entitas.Tests/PublicMemberInfoEntityExtensionTests.cs b/tests/Entitas.Tests/PublicMemberInfoEntityExtensionTests.cs