Engine - Index: optimize - removed callvirt using StoreIndex.GetIndex()

friflo · Jun 21, 2024 · f7424e9 · f7424e9
1 parent 0e71b07
commit f7424e9
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 13 deletions.
diff --git a/Engine/src/ECS/Archetype/StructHeap.cs b/Engine/src/ECS/Archetype/StructHeap.cs
@@ -48,7 +48,7 @@ internal void RemoveIndex<TComponent>(EntityStoreBase store, int id)
 
     private static ComponentIndex CreateIndex(EntityStoreBase store, int structIndex) {
         var entityStore = (EntityStore)store;
-        return entityStore.extension.indexes[structIndex].GetIndex(entityStore);
+        return StoreIndex.GetIndex(entityStore, structIndex);
     }
 }
 

diff --git a/Engine/src/ECS/Entity.cs b/Engine/src/ECS/Entity.cs
@@ -670,7 +670,7 @@ public void  EmitSignal<TEvent> (in TEvent ev) where TEvent : struct {
     /// Executes in O(1) with default index. O(log n) when using <see cref="ValueInRangeIndex{TValue}"/>. 
     /// </summary>
     internal Entities GetForeignEntities<TComponent>() where TComponent: struct, IIndexedComponent<Entity> {
-        var index = (ComponentIndex<Entity>)store.GetIndex(StructInfo<TComponent>.Index);
+        var index = (ComponentIndex<Entity>)StoreIndex.GetIndex(store, StructInfo<TComponent>.Index);
         return index.GetHasValueEntities(this);
     }
     #endregion

diff --git a/Engine/src/ECS/EntityStore.cs b/Engine/src/ECS/EntityStore.cs
@@ -260,11 +260,7 @@ public  bool  TryGetEntityByPid(long pid, out Entity value)
     /// Executes in O(1) with default index. O(log n) when using <see cref="ValueInRangeIndex{TValue}"/>. 
     /// </summary>
     internal Entities GetEntitiesWithComponentValue<TComponent, TValue>(TValue value) where TComponent: struct, IIndexedComponent<TValue> {
-        var index = (ComponentIndex<TValue>)GetIndex(StructInfo<TComponent>.Index);
+        var index = (ComponentIndex<TValue>)StoreIndex.GetIndex(this, StructInfo<TComponent>.Index);
         return index.GetHasValueEntities(value);
     }
-
-    internal ComponentIndex GetIndex(int index) {
-        return extension.indexes[index].GetIndex(this);
-    }
 }
diff --git a/Engine/src/ECS/Lab/Conditions/HasValue.cs b/Engine/src/ECS/Lab/Conditions/HasValue.cs
@@ -17,7 +17,7 @@ internal HasValueCondition(TValue value) {
 
     internal override void AddMatchingEntities(EntityStore store, HashSet<int> idSet)
     {
-        var index = (ComponentIndex<TValue>)store.GetIndex(StructInfo<TComponent>.Index);
+        var index = (ComponentIndex<TValue>)StoreIndex.GetIndex(store, StructInfo<TComponent>.Index);
         var entities = index.GetHasValueEntities(value);
         foreach (var id in entities.Ids) {
             idSet.Add(id);

diff --git a/Engine/src/ECS/Lab/Conditions/ValueInRange.cs b/Engine/src/ECS/Lab/Conditions/ValueInRange.cs
@@ -21,7 +21,7 @@ internal ValueInRangeCondition(TValue min, TValue max) {
 
     internal override void AddMatchingEntities(EntityStore store, HashSet<int> idSet)
     {
-        var index = (ComponentIndex<TValue>)store.GetIndex(StructInfo<TComponent>.Index);
+        var index = (ComponentIndex<TValue>)StoreIndex.GetIndex(store, StructInfo<TComponent>.Index);
         index.AddValueInRangeEntities(min, max, idSet);
     }
 }
diff --git a/Engine/src/ECS/Lab/Indexes/ComponentIndex.cs b/Engine/src/ECS/Lab/Indexes/ComponentIndex.cs
@@ -68,10 +68,13 @@ internal StoreIndex(IndexedComponentType type) {
         this.type   = type;
     }
 
-    internal ComponentIndex GetIndex(EntityStore store) {
+    internal static ComponentIndex GetIndex(EntityStore store, int structIndex)
+    {
+        var index = store.extension.indexes[structIndex].index;
         if (index != null) {
             return index;
         }
-        return index = type.CreateComponentIndex(store);
+        ref var storeIndex      = ref store.extension.indexes[structIndex];
+        return storeIndex.index = storeIndex.type.CreateComponentIndex(store);
     }
 }
diff --git a/Engine/src/Tests-internal/ECS/Test_Index.cs b/Engine/src/Tests-internal/ECS/Test_Index.cs
@@ -250,7 +250,7 @@ public static void Test_Index_already_added()
 
         entity.AddComponent(new IndexedName { name = "added" });
 
-        var index = (HasValueIndex<string>)world.GetIndex(StructInfo<IndexedName>.Index);
+        var index = (HasValueIndex<string>)StoreIndex.GetIndex(world, StructInfo<IndexedName>.Index);
         index.Add(1, new IndexedName { name = "added" });
         AreEqual(1, index.Count);
     }

diff --git a/Engine/src/Tests-internal/ECS/Test_Index_Range.cs b/Engine/src/Tests-internal/ECS/Test_Index_Range.cs
@@ -140,7 +140,7 @@ public static void Test_Index_Range_already_added()
 
         entity.AddComponent(new IndexedIntRange { value =  456 });
 
-        var index = (ValueInRangeIndex<int>)world.GetIndex(StructInfo<IndexedIntRange>.Index);
+        var index = (ValueInRangeIndex<int>)StoreIndex.GetIndex(world, StructInfo<IndexedIntRange>.Index);
         index.Add(1, new IndexedIntRange { value = 456 });
         AreEqual(1, index.Count);
     }