rename: AbstractComponentIndex<> -> GenericComponentIndex<>

friflo · Dec 1, 2024 · 6489ec2 · 6489ec2
1 parent bd3b89f
commit 6489ec2
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 19 deletions.
diff --git a/src/ECS/Index/ComponentIndex.cs b/src/ECS/Index/ComponentIndex.cs
@@ -10,9 +10,9 @@ namespace Friflo.Engine.ECS;
 public readonly struct ComponentIndex <TIndexedComponent,TValue>
     where TIndexedComponent : struct, IIndexedComponent<TValue>
 {
-    private readonly AbstractComponentIndex<TValue> index;
+    private readonly GenericComponentIndex<TValue> index;
 
-    internal ComponentIndex(AbstractComponentIndex<TValue> index) {
+    internal ComponentIndex(GenericComponentIndex<TValue> index) {
         this.index = index;
     }
 

diff --git a/src/ECS/Index/Conditions/HasValue.cs b/src/ECS/Index/Conditions/HasValue.cs
@@ -17,7 +17,7 @@ internal HasValueCondition(TValue value) {
 
     internal override void AddMatchingEntities(EntityStore store, HashSet<int> idSet)
     {
-        var index = (AbstractComponentIndex<TValue>)StoreIndex.GetIndex(store, StructInfo<TComponent>.Index);
+        var index = (GenericComponentIndex<TValue>)StoreIndex.GetIndex(store, StructInfo<TComponent>.Index);
         var entities = index.GetHasValueEntities(value);
         foreach (var id in entities.Ids) {
             idSet.Add(id);

diff --git a/src/ECS/Index/Conditions/ValueInRange.cs b/src/ECS/Index/Conditions/ValueInRange.cs
@@ -21,7 +21,7 @@ internal ValueInRangeCondition(TValue min, TValue max) {
 
     internal override void AddMatchingEntities(EntityStore store, HashSet<int> idSet)
     {
-        var index = (AbstractComponentIndex<TValue>)StoreIndex.GetIndex(store, StructInfo<TComponent>.Index);
+        var index = (GenericComponentIndex<TValue>)StoreIndex.GetIndex(store, StructInfo<TComponent>.Index);
         index.AddValueInRangeEntities(min, max, idSet);
     }
 }
diff --git a/src/ECS/Index/IndexExtensions.cs b/src/ECS/Index/IndexExtensions.cs
@@ -24,7 +24,7 @@ public static EntityLinks<TComponent> GetIncomingLinks<TComponent>(this Entity t
         where TComponent: struct, ILinkComponent
     {
         if (target.IsNull) throw EntityStoreBase.EntityNullException(target);
-        var index = (AbstractComponentIndex<Entity>)StoreIndex.GetIndex(target.store, StructInfo<TComponent>.Index);
+        var index = (GenericComponentIndex<Entity>)StoreIndex.GetIndex(target.store, StructInfo<TComponent>.Index);
         return new EntityLinks<TComponent>(target, index.GetHasValueEntities(target), null);
     }
     #endregion
@@ -37,7 +37,7 @@ public static EntityLinks<TComponent> GetIncomingLinks<TComponent>(this Entity t
     public static ComponentIndex<TIndexedComponent,TValue> ComponentIndex<TIndexedComponent, TValue>(this EntityStore store)
         where TIndexedComponent: struct, IIndexedComponent<TValue>
     {
-        var index = (AbstractComponentIndex<TValue>)StoreIndex.GetIndex(store, StructInfo<TIndexedComponent>.Index);
+        var index = (GenericComponentIndex<TValue>)StoreIndex.GetIndex(store, StructInfo<TIndexedComponent>.Index);
         return new ComponentIndex<TIndexedComponent, TValue>(index);
     }
 
@@ -48,7 +48,7 @@ public static ComponentIndex<TIndexedComponent,TValue> ComponentIndex<TIndexedCo
     public static LinkComponentIndex<TLinkComponent> LinkComponentIndex<TLinkComponent>(this EntityStore store)
         where TLinkComponent: struct, ILinkComponent
     {
-        var index = (AbstractComponentIndex<Entity>)StoreIndex.GetIndex(store, StructInfo<TLinkComponent>.Index);
+        var index = (GenericComponentIndex<Entity>)StoreIndex.GetIndex(store, StructInfo<TLinkComponent>.Index);
         return new LinkComponentIndex<TLinkComponent>(index);
     }
 
@@ -61,7 +61,7 @@ public static LinkComponentIndex<TLinkComponent> LinkComponentIndex<TLinkCompone
     public static Entities GetEntitiesWithComponentValue<TComponent, TValue>(this EntityStore store, TValue value)
         where TComponent: struct, IIndexedComponent<TValue>
     {
-        var index = (AbstractComponentIndex<TValue>)StoreIndex.GetIndex(store, StructInfo<TComponent>.Index);
+        var index = (GenericComponentIndex<TValue>)StoreIndex.GetIndex(store, StructInfo<TComponent>.Index);
         return index.GetHasValueEntities(value);
     }
 
@@ -88,7 +88,7 @@ public static Entities GetEntitiesWithComponentValue<TComponent, TValue>(this En
     public static  IReadOnlyCollection<TValue> GetAllIndexedComponentValues<TComponent, TValue>(this EntityStore store)
         where TComponent: struct, IIndexedComponent<TValue>
     {
-        var index = (AbstractComponentIndex<TValue>)StoreIndex.GetIndex(store, StructInfo<TComponent>.Index);
+        var index = (GenericComponentIndex<TValue>)StoreIndex.GetIndex(store, StructInfo<TComponent>.Index);
         return index.IndexedComponentValues;
     }
 
@@ -115,7 +115,7 @@ public static  IReadOnlyCollection<TValue> GetAllIndexedComponentValues<TCompone
     public static IReadOnlyCollection<Entity> GetAllLinkedEntities<TComponent>(this EntityStore store)
         where TComponent: struct, ILinkComponent
     {
-        var index = (AbstractComponentIndex<Entity>)StoreIndex.GetIndex(store, StructInfo<TComponent>.Index);
+        var index = (GenericComponentIndex<Entity>)StoreIndex.GetIndex(store, StructInfo<TComponent>.Index);
         return index.IndexedComponentValues;
     }
     #endregion

diff --git a/src/ECS/Index/Indexes/AbstractComponentIndex.cs b/src/ECS/Index/Indexes/AbstractComponentIndex.cs
@@ -52,13 +52,13 @@ internal AbstractComponentIndex(EntityStore store, ComponentType componentType)
 /// <summary>
 /// Generic base class required to implement a custom component index.
 /// </summary>
-public abstract class AbstractComponentIndex<TValue> : AbstractComponentIndex
+public abstract class GenericComponentIndex<TValue> : AbstractComponentIndex
 {
     internal            TValue[]                    sortBuffer  = Array.Empty<TValue>();
 
     internal abstract   IReadOnlyCollection<TValue> IndexedComponentValues        { get; }
     internal abstract   Entities                    GetHasValueEntities    (TValue value);
     internal virtual    void                        AddValueInRangeEntities(TValue min, TValue max, HashSet<int> idSet) => throw NotSupportedException("ValueInRange()");
 
-    internal AbstractComponentIndex(EntityStore store, ComponentType componentType) : base(store, componentType) { }
+    internal GenericComponentIndex(EntityStore store, ComponentType componentType) : base(store, componentType) { }
 }
diff --git a/src/ECS/Index/Indexes/EntityIndex.cs b/src/ECS/Index/Indexes/EntityIndex.cs
@@ -9,7 +9,7 @@
 // ReSharper disable once CheckNamespace
 namespace Friflo.Engine.ECS.Index;
 
-internal abstract class EntityIndex : AbstractComponentIndex<Entity>
+internal abstract class EntityIndex : GenericComponentIndex<Entity>
 {
     internal override   int                         Count       => entityMap.Count;
 

diff --git a/src/ECS/Index/Indexes/RangeIndex.cs b/src/ECS/Index/Indexes/RangeIndex.cs
@@ -16,7 +16,7 @@ namespace Friflo.Engine.ECS.Index;
 /// The default index executes in O(1) when adding, removing or updating indexed component values. 
 /// </summary>
 [ExcludeFromCodeCoverage] // not used - kept only for reference
-public sealed class RangeIndex<TIndexedComponent,TValue> : AbstractComponentIndex<TValue>
+public sealed class RangeIndex<TIndexedComponent,TValue> : GenericComponentIndex<TValue>
     where TIndexedComponent : struct, IIndexedComponent<TValue>
 {
     internal override   int                         Count       => entityMap.Count;

diff --git a/src/ECS/Index/Indexes/ValueClassIndex.cs b/src/ECS/Index/Indexes/ValueClassIndex.cs
@@ -8,7 +8,7 @@
 // ReSharper disable once CheckNamespace
 namespace Friflo.Engine.ECS.Index;
 
-internal sealed class ValueClassIndex<TIndexedComponent,TValue> : AbstractComponentIndex<TValue>
+internal sealed class ValueClassIndex<TIndexedComponent,TValue> : GenericComponentIndex<TValue>
     where TIndexedComponent : struct, IIndexedComponent<TValue>
     where TValue            : class
 {

diff --git a/src/ECS/Index/Indexes/ValueStructIndex.cs b/src/ECS/Index/Indexes/ValueStructIndex.cs
@@ -9,7 +9,7 @@
 // ReSharper disable once CheckNamespace
 namespace Friflo.Engine.ECS.Index;
 
-internal sealed class ValueStructIndex<TIndexedComponent,TValue>  : AbstractComponentIndex<TValue>
+internal sealed class ValueStructIndex<TIndexedComponent,TValue>  : GenericComponentIndex<TValue>
     where TIndexedComponent : struct, IIndexedComponent<TValue>
     where TValue            : struct
 {

diff --git a/src/ECS/Index/LinkComponentIndex.cs b/src/ECS/Index/LinkComponentIndex.cs
@@ -11,9 +11,9 @@ namespace Friflo.Engine.ECS;
 public readonly struct LinkComponentIndex <TLinkComponent>
     where TLinkComponent: struct, ILinkComponent
 {
-    private readonly AbstractComponentIndex<Entity> index;
+    private readonly GenericComponentIndex<Entity> index;
 
-    internal LinkComponentIndex(AbstractComponentIndex<Entity> index) {
+    internal LinkComponentIndex(GenericComponentIndex<Entity> index) {
         this.index = index;
     }
 

diff --git a/src/ECS/Index/Utils/SortUtils.cs b/src/ECS/Index/Utils/SortUtils.cs
@@ -10,7 +10,7 @@ namespace Friflo.Engine.ECS.Index;
 
 internal static class SortUtils<TValue>
 {
-    internal static void AddValueInRangeEntities(TValue min, TValue max, HashSet<int> idSet, Dictionary<TValue, IdArray> map, AbstractComponentIndex<TValue> componentIndex)
+    internal static void AddValueInRangeEntities(TValue min, TValue max, HashSet<int> idSet, Dictionary<TValue, IdArray> map, GenericComponentIndex<TValue> componentIndex)
     {
         int count   = map.Count;
         var buffer  = componentIndex.sortBuffer;