Fixes, improvements and some other stuff.

Author: genaray

src/Arch.Tests/BitSetTest.cs

@@ -1,4 +1,5 @@
 using System.Numerics;
+using Arch.Core;
 using Arch.Core.Utils;
 using static NUnit.Framework.Assert;
 

src/Arch.Tests/WorldTest.cs

@@ -337,7 +337,7 @@ public void TrimExcess()
         var archetype = world.Archetypes[0];
         That(world.Size, Is.EqualTo(1));
         That(world.Capacity, Is.EqualTo(archetype.EntitiesPerChunk));
-        That(archetype.ChunkCount, Is.EqualTo(0));
+        That(archetype.ChunkCount, Is.EqualTo(1));
         That(archetype.ChunkCapacity, Is.EqualTo(1));
 
         // Recycled ids must be trimmed too so that the newest created entity is not out of bounds!

src/Arch/Arch.csproj

@@ -14,7 +14,7 @@
 
     <PackageId>Arch</PackageId>
     <Title>Arch</Title>
-    <Version>2.0.0-beta</Version>
+    <Version>2.0.0</Version>
     <Authors>genaray</Authors>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <Description>A high performance c# net.7 and net.8 archetype based ECS ( Entity component system ).</Description>
@@ -350,11 +350,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>World.Remove.tt</DependentUpon>
     </Compile>
-    <Compile Update="Templates\World.Set.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>World.Set.tt</DependentUpon>
-    </Compile>
     <Compile Update="Templates\World.SetWithQueryDescription.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -590,6 +585,11 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>World.EntityQuery.tt</DependentUpon>
     </Compile>
+    <Compile Update="Templates\World.Set.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>World.Set.tt</DependentUpon>
+    </Compile>
   </ItemGroup>
 
 </Project>

src/Arch/Buffer/CommandBuffer.cs

@@ -330,7 +330,7 @@ public void Playback(World world, bool dispose = true)
             Debug.Assert(world.IsAlive(entity), $"CommandBuffer can not to set components to the dead {wrappedEntity.Entity}");
 
             // Get entity chunk
-            var entityInfo = world.EntityInfo[entity.Id];
+            var entityInfo = world.EntityInfo.GetEntityData(entity.Id);
             var archetype = entityInfo.Archetype;
             ref readonly var chunk = ref archetype.GetChunk(entityInfo.Slot.ChunkIndex);
             var chunkIndex = entityInfo.Slot.Index;

src/Arch/Core/Archetype.cs

@@ -8,6 +8,7 @@
 using Collections.Pooled;
 using CommunityToolkit.HighPerformance;
 using Array = System.Array;
+using System.Runtime.InteropServices;
 
 namespace Arch.Core;
 
@@ -44,7 +45,6 @@ public Slot(int index, int chunkIndex)
     /// <param name="first">The first <see cref="Slot"/>.</param>
     /// <param name="second">The second <see cref="Slot"/>.</param>
     /// <returns>The result <see cref="Slot"/>.</returns>
-
     public static Slot operator +(Slot first, Slot second)
     {
         return new Slot(first.Index + second.Index, first.ChunkIndex + second.ChunkIndex);
@@ -55,7 +55,6 @@ public Slot(int index, int chunkIndex)
     /// </summary>
     /// <param name="slot">The <see cref="Slot"/>.</param>
     /// <returns>The <see cref="Slot"/> with index increased by one..</returns>
-
     public static Slot operator ++(Slot slot)
     {
         slot.Index++;
@@ -66,7 +65,6 @@ public Slot(int index, int chunkIndex)
     ///     Validates the <see cref="Slot"/>, moves the <see cref="Slot"/> if it is outside a <see cref="Chunk.Capacity"/> to match it.
     /// </summary>
     /// <returns></returns>
-
     public void Wrap(int capacity)
     {
         // Result outside valid chunk, wrap into next one
@@ -90,7 +88,6 @@ public void Wrap(int capacity)
     /// <param name="source">The <see cref="Slot"/> to shift by one.</param>
     /// <param name="sourceCapacity">The capacity of the chunk the slot is in.</param>
     /// <returns></returns>
-
     public static Slot Shift(ref Slot source, int sourceCapacity)
     {
         source.Index++;
@@ -106,7 +103,6 @@ public static Slot Shift(ref Slot source, int sourceCapacity)
     /// <param name="destination">The destination <see cref="Slot"/>, a reference point at which the copy or shift operation starts.</param>
     /// <param name="sourceCapacity">The source <see cref="Chunk.Capacity"/>.</param>
     /// <param name="destinationCapacity">The destination <see cref="Chunk.Capacity"/></param>
-
     public static Slot Shift(in Slot source, int sourceCapacity, in Slot destination, int destinationCapacity)
     {
         var freeSpot = destination;
@@ -136,14 +132,14 @@ public class Archetypes : IDisposable
     /// </summary>
     public Archetypes(int capacity)
     {
-        Items = new PooledList<Archetype>(capacity, ClearMode.Never);
+        Items = new NetStandardList<Archetype>(capacity);
         _hashCode = -1;
     }
 
     /// <summary>
     ///     The <see cref="PooledList{T}"/> that contains all <see cref="Archetype"/>s.
     /// </summary>
-    public PooledList<Archetype> Items {  get; }
+    public NetStandardList<Archetype> Items {  get; }
 
     /// <summary>
     ///     The count of this instance.
@@ -184,7 +180,7 @@ public void Remove(Archetype archetype)
     /// <returns>The <see cref="Span{T}"/>.</returns>
     public Span<Archetype> AsSpan()
     {
-        return Items.Span;
+        return Items.AsSpan();
     }
 
     /// <summary>
@@ -253,7 +249,7 @@ public void Clear()
     /// </summary>
     public void Dispose()
     {
-        Items.Dispose();
+        Items.Clear();
     }
 }
 
@@ -264,7 +260,6 @@ public void Dispose()
 /// </summary>
 public sealed partial class Archetype
 {
-
     /// <summary>
     ///     A lookup array that maps the component id to an index within the component array of a <see cref="Chunk"/> to quickly find the correct array for the component type.
     ///     Is being stored here since all <see cref="Chunks"/> share the same instance to reduce allocations.
@@ -298,46 +293,6 @@ internal Archetype(Signature signature, int baseChunkSize, int baseChunkEntityCo
         _removeEdges = new SparseJaggedArray<Archetype>(BucketSize);
     }
 
-    /// <summary>
-    /// Try get the index of a component within this archetype. Returns false if the archetype does not have this
-    /// component.
-    /// </summary>
-    [Pure]
-    internal bool TryIndex<T>(out int i)
-    {
-        var id = Component<T>.ComponentType.Id;
-        Debug.Assert(id != -1, $"Supplied component index is invalid");
-
-        if (id >= _componentIdToArrayIndex.Length)
-        {
-            i = -1;
-            return false;
-        }
-
-        i = _componentIdToArrayIndex.DangerousGetReferenceAt(id);
-        return i != -1;
-    }
-
-    /// <summary>
-    /// Try get the index of a component within this archetype. Returns false if the archetype does not have this
-    /// component.
-    /// </summary>
-    [Pure]
-    internal bool TryIndex(ComponentType type, out int i)
-    {
-        var id = type.Id;
-        Debug.Assert(id != -1, $"Supplied component index is invalid");
-
-        if (id >= _componentIdToArrayIndex.Length)
-        {
-            i = -1;
-            return false;
-        }
-
-        i = _componentIdToArrayIndex.DangerousGetReferenceAt(id);
-        return i != -1;
-    }
-
     /// <summary>
     ///     The component types that the <see cref="Arch.Core.Entity"/>'s stored here have.
     ///     The base size of a <see cref="Chunk"/> within the <see cref="Chunks"/> in KB.
@@ -616,6 +571,52 @@ public bool Has<T>()
         return BitSet.IsSet(id);
     }
 
+    /// <summary>
+    ///     Try get the index of a component within this archetype. Returns false if the archetype does not have this
+    ///     component.
+    /// </summary>
+    /// <param name="i">The index.</param>
+    /// <typeparam name="T">The type.</typeparam>
+    /// <returns>True if it was successfully.</returns>
+    [Pure]
+    internal bool TryIndex<T>(out int i)
+    {
+        var id = Component<T>.ComponentType.Id;
+        Debug.Assert(id != -1, $"Supplied component index is invalid");
+
+        if (id >= _componentIdToArrayIndex.Length)
+        {
+            i = -1;
+            return false;
+        }
+
+        i = _componentIdToArrayIndex.DangerousGetReferenceAt(id);
+        return i != -1;
+    }
+
+    /// <summary>
+    ///     Try get the index of a component within this archetype. Returns false if the archetype does not have this
+    ///     component.
+    /// </summary>
+    /// <param name="type">The <see cref="ComponentType"/>.</param>
+    /// <param name="i">The index.</param>
+    /// <returns>True if it was successfully.</returns>
+    [Pure]
+    internal bool TryIndex(ComponentType type, out int i)
+    {
+        var id = type.Id;
+        Debug.Assert(id != -1, $"Supplied component index is invalid");
+
+        if (id >= _componentIdToArrayIndex.Length)
+        {
+            i = -1;
+            return false;
+        }
+
+        i = _componentIdToArrayIndex.DangerousGetReferenceAt(id);
+        return i != -1;
+    }
+
     /// <summary>
     ///     Returns a reference of the component of an <see cref="Arch.Core.Entity"/> at a given <see cref="Slot"/>.
     /// </summary>
@@ -786,7 +787,7 @@ internal void EnsureEntityCapacity(int newCapacity)
     /// </summary>
     internal void TrimExcess()
     {
-        Chunks.Count = Count; // By setting the Count we will assure that unnecessary chunks are trimmed.
+        Chunks.Count = Count + 1; // By setting the Count we will assure that unnecessary chunks are trimmed.
         Chunks.TrimExcess();
     }
 }

src/Arch/Core/Chunk.cs

@@ -250,35 +250,6 @@ public void Copy<T>(int index, in T cmp)
         Unsafe.Add(ref item, index) = cmp;
     }
 
-    [Pure]
-    internal bool TryIndex<T>(out int i)
-    {
-        var id = Component<T>.ComponentType.Id;
-        return TryIndex(id, out i);
-    }
-
-    [Pure]
-    internal bool TryIndex(int id, out int i)
-    {
-        Debug.Assert(id != -1, $"Supplied component index is invalid");
-
-        if (id >= ComponentIdToArrayIndex.Length)
-        {
-            i = -1;
-            return false;
-        }
-
-        i = ComponentIdToArrayIndex.DangerousGetReferenceAt(id);
-        return i != -1;
-    }
-
-    [Pure]
-    public bool Has(int id)
-    {
-        var idToArrayIndex = ComponentIdToArrayIndex;
-        return id < idToArrayIndex.Length && idToArrayIndex.DangerousGetReferenceAt(id) != -1;
-    }
-
     /// <summary>
     ///     Checks if a component is included in this <see cref="Chunk"/>.
     /// </summary>
@@ -399,6 +370,20 @@ public override string ToString()
 public partial struct Chunk
 {
 
+    /// <summary>
+    ///     Try get the index of a component within this <see cref="Chunk"/>. Returns false if the <see cref="Chunk"/> does not have this
+    ///     component.
+    /// </summary>
+    /// <param name="i">The index.</param>
+    /// <typeparam name="T">The type.</typeparam>
+    /// <returns>True if it was successfully.</returns>
+    [Pure]
+    internal bool TryIndex<T>(out int i)
+    {
+        var id = Component<T>.ComponentType.Id;
+        return TryIndex(id, out i);
+    }
+
     /// <summary>
     ///     Returns the component array index of a component.
     /// </summary>
@@ -470,6 +455,18 @@ public void Copy(int index, object cmp)
         array.SetValue(cmp, index);
     }
 
+    /// <summary>
+    ///     Checks if a component is included in this <see cref="Chunk"/>.
+    /// </summary>
+    /// <param name="id">The <see cref="ComponentType"/> id.</param>
+    /// <returns>True if included, false otherwise.</returns>
+    [Pure]
+    public bool Has(int id)
+    {
+        var idToArrayIndex = ComponentIdToArrayIndex;
+        return id < idToArrayIndex.Length && idToArrayIndex.DangerousGetReferenceAt(id) != -1;
+    }
+
     /// <summary>
     ///     Checks if a component is included in this <see cref="Chunk"/>.
     /// </summary>
@@ -495,6 +492,28 @@ public bool Has(ComponentType t)
         return array.GetValue(index);
     }
 
+    /// <summary>
+    ///     Try get the index of a component within this <see cref="Chunk"/>. Returns false if the <see cref="Chunk"/> does not have this
+    ///     component.
+    /// </summary>
+    /// <param name="id">The <see cref="ComponentType"/> Id.</param>
+    /// <param name="i">The index.</param>
+    /// <returns>True if it was successfully.</returns>
+    [Pure]
+    internal bool TryIndex(int id, out int i)
+    {
+        Debug.Assert(id != -1, $"Supplied component index is invalid");
+
+        if (id >= ComponentIdToArrayIndex.Length)
+        {
+            i = -1;
+            return false;
+        }
+
+        i = ComponentIdToArrayIndex.DangerousGetReferenceAt(id);
+        return i != -1;
+    }
+
     /// <summary>
     ///     Returns the component array index of a component by its type.
     /// </summary>
@@ -600,11 +619,8 @@ internal static void Copy(
     /// <param name="destination">The destination <see cref="Chunk"/>.</param>
     /// <param name="destinationIndex">The start index in the destination <see cref="Chunk"/>.</param>
     /// <param name="length">The length indicating the amount of <see cref="Entity"/>s being copied.</param>
-    internal static void CopyComponents(
-        ref Chunk source, int index, ref Signature sourceSignature,
-        ref Chunk destination, int destinationIndex,
-        int length)
-    {
+    internal static void CopyComponents(ref Chunk source, int index, ref Signature sourceSignature, ref Chunk destination, int destinationIndex, int length) {
+
         // Arrays
         var sourceComponents = source.Components;