MoonsideGames
/
MoonTools.ECS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

start rewriting component storage

storage_conversion
cosmonaut 2023-12-18 17:58:08 -08:00
parent 2adecf771a
commit cbdcca5bbf
8 changed files with 125 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Collections/NativeArray.cs
View File

@ -7,7 +7,7 @@ namespace MoonTools.ECS.Collections;
public unsafe class NativeArray<T> : IDisposable where T : unmanaged
{
private T* Elements;
public int Count { get; private set;}
public int Count { get; private set; }
private int Capacity;
private int ElementSize;
@ -61,7 +61,7 @@ public unsafe class NativeArray<T> : IDisposable where T : unmanaged
Count = 0;
}
private void ResizeTo(int size)
public void ResizeTo(int size)
{
Capacity = size;
Elements = (T*) NativeMemory.Realloc((void*) Elements, (nuint) (ElementSize * Capacity));

11
src/Collections/NativeArrayUntyped.cs
View File

@ -7,8 +7,8 @@ namespace MoonTools.ECS.Collections;
internal unsafe class NativeArray : IDisposable
{
private nint Elements;
public int Count { get; private set;}
private int Capacity;
public int Count { get; private set; }
public int Capacity { get; private set; }
public readonly int ElementSize;
private bool IsDisposed;
@ -44,7 +44,7 @@ internal unsafe class NativeArray : IDisposable
Elements = (nint) NativeMemory.Realloc((void*) Elements, (nuint) (ElementSize * Capacity));
}
private void ResizeTo(int capacity)
public void ResizeTo(int capacity)
{
Capacity = capacity;
Elements = (nint) NativeMemory.Realloc((void*) Elements, (nuint) (ElementSize * Capacity));
@ -65,6 +65,11 @@ internal unsafe class NativeArray : IDisposable
Count -= 1;
}
public void RemoveLastElement()
{
Count -= 1;
}
public void Append<T>(T component) where T : unmanaged
{
if (Count >= Capacity)

145
src/ComponentStorage.cs
View File

@ -1,90 +1,98 @@
using System;
using System.Collections.Generic;
using System;
using MoonTools.ECS.Collections;
namespace MoonTools.ECS;
internal class ComponentStorage : IDisposable
public class ComponentStorage : IDisposable
{
internal readonly Dictionary<Entity, int> EntityIDToStorageIndex = new Dictionary<Entity, int>(16);
internal readonly NativeArray Components;
internal readonly NativeArray<Entity> EntityIDs;
internal readonly TypeId TypeId;
internal readonly int ElementSize;
internal readonly NativeArray<Entity> DenseArray = new NativeArray<Entity>();
internal readonly NativeArray<Entity> SparseArray = new NativeArray<Entity>();
internal readonly NativeArray ElementArray;
private bool IsDisposed;
public ComponentStorage(TypeId typeId, int elementSize)
public int ElementSize { get; private set; }
public int Count => DenseArray.Count;
public ComponentStorage(int elementSize)
{
for (var i = 0; i < 16; i += 1)
{
SparseArray.Append(Entity.Null); // sentinel value
}
ElementArray = new NativeArray(elementSize);
ElementSize = elementSize;
Components = new NativeArray(elementSize);
EntityIDs = new NativeArray<Entity>();
TypeId = typeId;
}
public bool Any()
{
return Components.Count > 0;
}
public bool Any() => DenseArray.Count > 0;
public bool Has(Entity entity)
public ref T Get<T>(Entity entity) where T : unmanaged
{
return EntityIDToStorageIndex.ContainsKey(entity);
if (entity.ID >= ElementArray.Capacity)
{
throw new Exception("oh noes");
}
public ref T Get<T>(in Entity entity) where T : unmanaged
{
return ref Components.Get<T>(EntityIDToStorageIndex[entity]);
return ref ElementArray.Get<T>(entity.ID);
}
public ref T GetFirst<T>() where T : unmanaged
{
#if DEBUG
if (Components.Count == 0)
if (DenseArray.Count == 0)
{
throw new IndexOutOfRangeException("Component storage is empty!");
}
#endif
return ref Components.Get<T>(0);
return ref ElementArray.Get<T>(DenseArray[0].ID);
}
// Returns true if the entity had this component.
public bool Set<T>(in Entity entity, in T component) where T : unmanaged
public bool Set<T>(Entity entity, T component) where T : unmanaged
{
if (EntityIDToStorageIndex.TryGetValue(entity, out var index))
var newEntity = SparseArray[entity.ID] == Entity.Null;
if (newEntity)
{
Components.Set(index, component);
return true;
// the entity is being added! let's do some record keeping
var index = DenseArray.Count;
DenseArray.Append(entity);
if (entity.ID >= SparseArray.Count)
{
var oldCount = SparseArray.Count;
SparseArray.ResizeTo(entity.ID + 1);
for (var i = oldCount; i < SparseArray.Count; i += 1)
{
SparseArray.Append(Entity.Null); // sentinel value
}
else
}
SparseArray[entity.ID] = entity;
// FIXME: something is not right here
if (entity.ID >= ElementArray.Count)
{
EntityIDToStorageIndex[entity] = Components.Count;
EntityIDs.Append(entity);
Components.Append(component);
return false;
ElementArray.ResizeTo(entity.ID + 1);
}
}
// Returns true if the entity had this component.
public bool Remove(in Entity entity)
{
if (EntityIDToStorageIndex.TryGetValue(entity, out int index))
{
var lastElementIndex = Components.Count - 1;
var lastEntity = EntityIDs[lastElementIndex];
// move a component into the hole to maintain contiguous memory
Components.Delete(index);
EntityIDs.Delete(index);
EntityIDToStorageIndex.Remove(entity);
// update the index if it changed
if (lastElementIndex != index)
{
EntityIDToStorageIndex[lastEntity] = index;
ElementArray.Set(entity.ID, component);
return !newEntity;
}
public bool Has(Entity entity)
{
return SparseArray[entity.ID] != Entity.Null;
}
public bool Remove(Entity entity)
{
if (Has(entity))
{
var denseIndex = SparseArray[entity.ID];
var lastItem = DenseArray[DenseArray.Count - 1];
DenseArray[denseIndex.ID] = lastItem;
SparseArray[lastItem.ID] = denseIndex;
SparseArray[entity.ID] = Entity.Null; // sentinel value
DenseArray.RemoveLastElement();
ElementArray.RemoveLastElement();
return true;
}
@ -93,26 +101,29 @@ internal class ComponentStorage : IDisposable
public void Clear()
{
Components.Clear();
EntityIDs.Clear();
EntityIDToStorageIndex.Clear();
DenseArray.Clear();
ElementArray.Clear();
for (var i = 0; i < SparseArray.Count; i += 1)
{
SparseArray[i] = Entity.Null;
}
}
public Entity FirstEntity()
{
#if DEBUG
if (EntityIDs.Count == 0)
if (DenseArray.Count == 0)
{
throw new IndexOutOfRangeException("Component storage is empty!");
}
#endif
return EntityIDs[0];
return DenseArray[0];
}
#if DEBUG
internal IEnumerable<Entity> Debug_GetEntities()
internal Span<Entity> Debug_GetEntities()
{
return EntityIDToStorageIndex.Keys;
return DenseArray.ToSpan();
}
#endif
@ -120,19 +131,17 @@ internal class ComponentStorage : IDisposable
{
if (!IsDisposed)
{
Components.Dispose();
EntityIDs.Dispose();
if (disposing)
{
DenseArray.Dispose();
SparseArray.Dispose();
ElementArray.Dispose();
}
IsDisposed = true;
}
}
// ~ComponentStorage()
// {
// // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
// Dispose(disposing: false);
// }
public void Dispose()
{
// Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method

2
src/DebugSystem.cs
View File

@ -11,7 +11,7 @@ public abstract class DebugSystem : System
protected DebugSystem(World world) : base(world) { }
protected World.ComponentTypeEnumerator Debug_GetAllComponentTypes(Entity entity) => World.Debug_GetAllComponentTypes(entity);
protected IEnumerable<Entity> Debug_GetEntities(Type componentType) => World.Debug_GetEntities(componentType);
protected Span<Entity> Debug_GetEntities(Type componentType) => World.Debug_GetEntities(componentType);
protected IEnumerable<Type> Debug_SearchComponentType(string typeString) => World.Debug_SearchComponentType(typeString);
}
#endif

5
src/Entity.cs
View File

@ -1,3 +1,6 @@
namespace MoonTools.ECS;
public readonly record struct Entity(uint ID);
public readonly record struct Entity(int ID)
{
public static readonly Entity Null = new Entity(int.MaxValue);
}

15
src/IdAssigner.cs
View File

@ -5,12 +5,12 @@ namespace MoonTools.ECS;
internal class IdAssigner : IDisposable
{
uint Next;
NativeArray<uint> AvailableIds = new NativeArray<uint>();
int Next = 0;
NativeArray<int> AvailableIds = new NativeArray<int>();
private bool IsDisposed;
public uint Assign()
public int Assign()
{
if (AvailableIds.TryPop(out var id))
{
@ -22,7 +22,7 @@ internal class IdAssigner : IDisposable
return id;
}
public void Unassign(uint id)
public void Unassign(int id)
{
AvailableIds.Append(id);
}
@ -46,13 +46,6 @@ internal class IdAssigner : IDisposable
}
}
// // TODO: override finalizer only if 'Dispose(bool disposing)' has code to free unmanaged resources
// ~IdAssigner()
// {
// // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
// Dispose(disposing: false);
// }
public void Dispose()
{
// Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method

32
src/Snapshot.cs
View File

@ -206,34 +206,31 @@ public class Snapshot : IDisposable
private class ComponentSnapshot : IDisposable
{
private readonly NativeArray Components;
private readonly NativeArray<Entity> EntityIDs;
private readonly NativeArray<Entity> DenseArray = new NativeArray<Entity>();
private readonly NativeArray<Entity> SparseArray = new NativeArray<Entity>();
private readonly NativeArray ElementArray;
private bool IsDisposed;
public ComponentSnapshot(int elementSize)
{
Components = new NativeArray(elementSize);
EntityIDs = new NativeArray<Entity>();
ElementArray = new NativeArray(elementSize);
DenseArray = new NativeArray<Entity>(elementSize);
SparseArray = new NativeArray<Entity>(elementSize);
}
public void Take(ComponentStorage componentStorage)
{
componentStorage.Components.CopyAllTo(Components);
componentStorage.EntityIDs.CopyTo(EntityIDs);
componentStorage.DenseArray.CopyTo(DenseArray);
componentStorage.SparseArray.CopyTo(SparseArray);
componentStorage.ElementArray.CopyAllTo(ElementArray);
}
public void Restore(ComponentStorage componentStorage)
{
Components.CopyAllTo(componentStorage.Components);
EntityIDs.CopyTo(componentStorage.EntityIDs);
componentStorage.EntityIDToStorageIndex.Clear();
for (int i = 0; i < EntityIDs.Count; i += 1)
{
var entityID = EntityIDs[i];
componentStorage.EntityIDToStorageIndex[entityID] = i;
}
DenseArray.CopyTo(componentStorage.DenseArray);
SparseArray.CopyTo(componentStorage.SparseArray);
ElementArray.CopyAllTo(componentStorage.ElementArray);
}
protected virtual void Dispose(bool disposing)
@ -242,8 +239,9 @@ public class Snapshot : IDisposable
{
if (disposing)
{
Components.Dispose();
EntityIDs.Dispose();
DenseArray.Dispose();
SparseArray.Dispose();
ElementArray.Dispose();
}
IsDisposed = true;

18
src/World.cs
View File

@ -51,8 +51,7 @@ public class World : IDisposable
// add missing storages, it's possible for there to be multiples in multi-world scenarios
for (var i = ComponentIndex.Count; i <= typeId; i += 1)
{
var missingTypeId = new TypeId((uint) i);
var componentStorage = new ComponentStorage(missingTypeId, ComponentTypeElementSizes[i]);
var componentStorage = new ComponentStorage(ComponentTypeElementSizes[i]);
ComponentIndex.Add(componentStorage);
ComponentTypeToFilter.Add(new List<Filter>());
}
@ -149,8 +148,7 @@ public class World : IDisposable
public bool Has<T>(in Entity entity) where T : unmanaged
{
var storage = GetComponentStorage<T>();
return storage.Has(entity);
return EntityComponentIndex[entity].Contains(new TypeId(ComponentTypeIdAssigner<T>.Id));
}
internal bool Has(in Entity entity, in TypeId typeId)
@ -185,12 +183,13 @@ public class World : IDisposable
public void Set<T>(in Entity entity, in T component) where T : unmanaged
{
var componentStorage = GetComponentStorage<T>();
var typeId = new TypeId(ComponentTypeIdAssigner<T>.Id);
if (!componentStorage.Set(entity, component))
{
EntityComponentIndex[entity].Add(componentStorage.TypeId);
EntityComponentIndex[entity].Add(typeId);
foreach (var filter in ComponentTypeToFilter[componentStorage.TypeId])
foreach (var filter in ComponentTypeToFilter[typeId])
{
filter.Check(entity);
}
@ -200,12 +199,13 @@ public class World : IDisposable
public void Remove<T>(in Entity entity) where T : unmanaged
{
var componentStorage = GetComponentStorage<T>();
var typeId = new TypeId(ComponentTypeIdAssigner<T>.Id);
if (componentStorage.Remove(entity))
{
EntityComponentIndex[entity].Remove(componentStorage.TypeId);
EntityComponentIndex[entity].Remove(typeId);
foreach (var filter in ComponentTypeToFilter[componentStorage.TypeId])
foreach (var filter in ComponentTypeToFilter[typeId])
{
filter.Check(entity);
}
@ -391,7 +391,7 @@ public class World : IDisposable
return new ComponentTypeEnumerator(this, EntityComponentIndex[entity]);
}
public IEnumerable<Entity> Debug_GetEntities(Type componentType)
public Span<Entity> Debug_GetEntities(Type componentType)
{
var storage = ComponentIndex[ComponentTypeToId[componentType]];
return storage.Debug_GetEntities();