flecs cleanup

blackbone · Jul 14, 2024 · 1d0512b · 1d0512b
1 parent ff341c3
commit 1d0512b
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/Benchmark.FlecsNET/FlecsNETContext.cs b/Benchmark.FlecsNET/FlecsNETContext.cs
@@ -12,7 +12,6 @@ public sealed class FlecsNETContext(int entityCount = 4096) : IBenchmarkContext
 #pragma warning restore CS9113 // Parameter is unread.
 {
     private readonly Dictionary<int, Query>? _queries = new();
-    private readonly List<Action<float>>? _systems = new();
     private World _world;
 
     public bool DeletesEntityOnLastComponentDeletion => false;
@@ -204,8 +203,9 @@ public void AddComponent<T1>(in Array entitySet, in int poolId = -1, in T1 c1 =
         var entities = (Entity[])entitySet;
         for (var i = 0; i < entities.Length; i++)
         {
-            if (entities[i].IsAlive() && entities[i].Has<T1>()) entities[i].Remove<T1>();
-            if (entities[i].IsAlive() && entities[i].Has<T2>()) entities[i].Remove<T2>();
+            if (!entities[i].IsAlive()) return;
+            if (entities[i].Has<T1>()) entities[i].Remove<T1>();
+            if (entities[i].Has<T2>()) entities[i].Remove<T2>();
         }
     }
 
@@ -217,9 +217,10 @@ public void AddComponent<T1>(in Array entitySet, in int poolId = -1, in T1 c1 =
         var entities = (Entity[])entitySet;
         for (var i = 0; i < entities.Length; i++)
         {
-            if (entities[i].IsAlive() && entities[i].Has<T1>()) entities[i].Remove<T1>();
-            if (entities[i].IsAlive() && entities[i].Has<T2>()) entities[i].Remove<T2>();
-            if (entities[i].IsAlive() && entities[i].Has<T3>()) entities[i].Remove<T3>();
+            if (!entities[i].IsAlive()) return;
+            if (entities[i].Has<T1>()) entities[i].Remove<T1>();
+            if (entities[i].Has<T2>()) entities[i].Remove<T2>();
+            if (entities[i].Has<T3>()) entities[i].Remove<T3>();
         }
     }
 
@@ -232,10 +233,11 @@ public void AddComponent<T1>(in Array entitySet, in int poolId = -1, in T1 c1 =
         var entities = (Entity[])entitySet;
         for (var i = 0; i < entities.Length; i++)
         {
-            if (entities[i].IsAlive() && entities[i].Has<T1>()) entities[i].Remove<T1>();
-            if (entities[i].IsAlive() && entities[i].Has<T2>()) entities[i].Remove<T2>();
-            if (entities[i].IsAlive() && entities[i].Has<T3>()) entities[i].Remove<T3>();
-            if (entities[i].IsAlive() && entities[i].Has<T4>()) entities[i].Remove<T4>();
+            if (!entities[i].IsAlive()) return;
+            if (entities[i].Has<T1>()) entities[i].Remove<T1>();
+            if (entities[i].Has<T2>()) entities[i].Remove<T2>();
+            if (entities[i].Has<T3>()) entities[i].Remove<T3>();
+            if (entities[i].Has<T4>()) entities[i].Remove<T4>();
         }
     }