AlicizaX/DragonECS
1
0
Fork 0
mirror of https://github.com/DCFApixels/DragonECS.git synced 2026-04-22 01:45:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update EcsValuePool.cs

Browse Source
This commit is contained in:
Mikhail 2026-03-17 15:34:54 +08:00
parent cc834c4a92
commit 492416aba1
1 changed files with 31 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/Pools/EcsValuePool.cs
View File

@ -47,7 +47,8 @@ namespace DCFApixels.DragonECS
public sealed unsafe class EcsValuePool<T> : IEcsPoolImplementation<T>, IEcsStructPool<T>, IEnumerable<T> //IEnumerable<T> - IntelliSense hack public sealed unsafe class EcsValuePool<T> : IEcsPoolImplementation<T>, IEcsStructPool<T>, IEnumerable<T> //IEnumerable<T> - IntelliSense hack
where T : unmanaged, IEcsValueComponent where T : unmanaged, IEcsValueComponent
{ {
private EcsWorld _source; private short _worldID;
private EcsWorld _world;
private int _componentTypeID; private int _componentTypeID;
private EcsMaskChunck _maskBit; private EcsMaskChunck _maskBit;
@ -60,10 +61,10 @@ namespace DCFApixels.DragonECS
public int _recycledItemsCount; public int _recycledItemsCount;
private readonly EcsValuePoolSharedStore* _sharedStore; private readonly EcsValuePoolSharedStore* _sharedStore;
private readonly IEcsComponentLifecycle<T> _componentLifecycleHandler = EcsComponentLifecycleHandler<T>.instance; private readonly IEcsComponentLifecycle<T> _customLifecycle = EcsComponentLifecycle<T>.CustomHandler;
private readonly bool _isHasComponentLifecycleHandler = EcsComponentLifecycleHandler<T>.isHasHandler; private readonly bool _isCustomLifecycle = EcsComponentLifecycle<T>.IsCustom;
private readonly IEcsComponentCopy<T> _componentCopyHandler = EcsComponentCopyHandler<T>.instance; private readonly IEcsComponentCopy<T> _customCopy = EcsComponentCopy<T>.CustomHandler;
private readonly bool _isHasComponentCopyHandler = EcsComponentCopyHandler<T>.isHasHandler; private readonly bool _isCustomCopy = EcsComponentCopy<T>.IsCustom;
private bool _isLocked; private bool _isLocked;
@ -88,7 +89,7 @@ namespace DCFApixels.DragonECS
} }
public EcsWorld World public EcsWorld World
{ {
get { return _source; } get { return _world; }
} }
public bool IsReadOnly public bool IsReadOnly
{ {
@ -106,14 +107,14 @@ namespace DCFApixels.DragonECS
{ {
if (_sharedStore == null) if (_sharedStore == null)
{ {
_sharedStore = MemoryAllocator.Alloc<EcsValuePoolSharedStore>(1).As<EcsValuePoolSharedStore>(); _sharedStore = MemoryAllocator.Alloc<EcsValuePoolSharedStore>(1).Ptr;
} }
} }
public EcsValuePool(int capacity, int recycledCapacity = -1) public EcsValuePool(int capacity, int recycledCapacity = -1)
{ {
if (_sharedStore == null) if (_sharedStore == null)
{ {
_sharedStore = MemoryAllocator.Alloc<EcsValuePoolSharedStore>(1).As<EcsValuePoolSharedStore>(); _sharedStore = MemoryAllocator.Alloc<EcsValuePoolSharedStore>(1).Ptr;
} }
capacity = ArrayUtility.NextPow2(capacity); capacity = ArrayUtility.NextPow2(capacity);
if (recycledCapacity < 0) if (recycledCapacity < 0)
@ -121,31 +122,31 @@ namespace DCFApixels.DragonECS
recycledCapacity = capacity / 2; recycledCapacity = capacity / 2;
} }
_itemsLength = capacity; _itemsLength = capacity;
_items = MemoryAllocator.Alloc<T>(_itemsLength).As<T>(); _items = MemoryAllocator.Alloc<T>(_itemsLength).Ptr;
_sharedStore->_items = _items; _sharedStore->_items = _items;
_recycledItemsLength = recycledCapacity; _recycledItemsLength = recycledCapacity;
_recycledItems = MemoryAllocator.Alloc<int>(_recycledItemsLength).As<int>(); _recycledItems = MemoryAllocator.Alloc<int>(_recycledItemsLength).Ptr;
} }
void IEcsPoolImplementation.OnInit(EcsWorld world, EcsWorld.PoolsMediator mediator, int componentTypeID) void IEcsPoolImplementation.OnInit(EcsWorld world, EcsWorld.PoolsMediator mediator, int componentTypeID)
{ {
_source = world; _world = world;
_mediator = mediator; _mediator = mediator;
_componentTypeID = componentTypeID; _componentTypeID = componentTypeID;
_maskBit = EcsMaskChunck.FromID(componentTypeID); _maskBit = EcsMaskChunck.FromID(componentTypeID);
_mapping = MemoryAllocator.Alloc<int>(world.Capacity).As<int>(); _mapping = MemoryAllocator.Alloc<int>(world.Capacity).Ptr;
_sharedStore->_mapping = _mapping; _sharedStore->_mapping = _mapping;
var worldConfig = world.Configs.GetWorldConfigOrDefault(); var worldConfig = world.Configs.GetWorldConfigOrDefault();
if (_items == null) if (_items == null)
{ {
_itemsLength = ArrayUtility.NextPow2(worldConfig.PoolComponentsCapacity); _itemsLength = ArrayUtility.NextPow2(worldConfig.PoolComponentsCapacity);
_items = MemoryAllocator.Alloc<T>(_itemsLength).As<T>(); _items = MemoryAllocator.Alloc<T>(_itemsLength).Ptr;
_sharedStore->_items = _items; _sharedStore->_items = _items;
} }
if (_recycledItems == null) if (_recycledItems == null)
{ {
_recycledItemsLength = worldConfig.PoolRecycledComponentsCapacity; _recycledItemsLength = worldConfig.PoolRecycledComponentsCapacity;
_recycledItems = MemoryAllocator.Alloc<int>(_recycledItemsLength).As<int>(); _recycledItems = MemoryAllocator.Alloc<int>(_recycledItemsLength).Ptr;
} }
} }
void IEcsPoolImplementation.OnWorldDestroy() { } void IEcsPoolImplementation.OnWorldDestroy() { }
@ -162,13 +163,13 @@ namespace DCFApixels.DragonECS
{ {
ref int itemIndex = ref _mapping[entityID]; ref int itemIndex = ref _mapping[entityID];
#if DEBUG #if DEBUG
if (entityID == EcsConsts.NULL_ENTITY_ID) { Throw.Ent_ThrowIsNotAlive(_source, entityID); } if (entityID == EcsConsts.NULL_ENTITY_ID) { Throw.Ent_ThrowIsNotAlive(_world, entityID); }
if (_source.IsUsed(entityID) == false) { Throw.Ent_ThrowIsNotAlive(_source, entityID); } if (_world.IsUsed(entityID) == false) { Throw.Ent_ThrowIsNotAlive(_world, entityID); }
if (itemIndex > 0) { EcsPoolThrowHelper.ThrowAlreadyHasComponent<T>(entityID); } if (itemIndex > 0) { EcsPoolThrowHelper.ThrowAlreadyHasComponent<T>(entityID); }
if (_isLocked) { EcsPoolThrowHelper.ThrowPoolLocked(); } if (_isLocked) { EcsPoolThrowHelper.ThrowPoolLocked(); }
#elif DRAGONECS_STABILITY_MODE #elif DRAGONECS_STABILITY_MODE
if (itemIndex > 0) { return ref Get(entityID); } if (itemIndex > 0) { return ref Get(entityID); }
if (_isLocked | _source.IsUsed(entityID) == false) { return ref _items[0]; } if (_isLocked | _world.IsUsed(entityID) == false) { return ref _items[0]; }
#endif #endif
if (_recycledItemsCount > 0) if (_recycledItemsCount > 0)
{ {
@ -181,13 +182,13 @@ namespace DCFApixels.DragonECS
if (itemIndex >= _itemsLength) if (itemIndex >= _itemsLength)
{ {
_itemsLength = ArrayUtility.NextPow2(_itemsLength << 1); _itemsLength = ArrayUtility.NextPow2(_itemsLength << 1);
_items = MemoryAllocator.Realloc(_items, _itemsLength).As<T>(); _items = MemoryAllocator.Realloc(_items, _itemsLength).Ptr;
_sharedStore->_items = _items; _sharedStore->_items = _items;
} }
} }
_mediator.RegisterComponent(entityID, _componentTypeID, _maskBit); _mediator.RegisterComponent(entityID, _componentTypeID, _maskBit);
ref T result = ref ((T*)_items)[itemIndex]; ref T result = ref ((T*)_items)[itemIndex];
EnableComponent(ref result); EcsComponentLifecycle<T>.OnAdd(_isCustomLifecycle, _customLifecycle, ref result, _worldID, entityID);
return ref result; return ref result;
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
@ -209,7 +210,7 @@ namespace DCFApixels.DragonECS
public ref T TryAddOrGet(int entityID) public ref T TryAddOrGet(int entityID)
{ {
#if DEBUG #if DEBUG
if (entityID == EcsConsts.NULL_ENTITY_ID) { Throw.Ent_ThrowIsNotAlive(_source, entityID); } if (entityID == EcsConsts.NULL_ENTITY_ID) { Throw.Ent_ThrowIsNotAlive(_world, entityID); }
#endif #endif
ref int itemIndex = ref _mapping[entityID]; ref int itemIndex = ref _mapping[entityID];
if (itemIndex <= 0) if (itemIndex <= 0)
@ -230,12 +231,12 @@ namespace DCFApixels.DragonECS
if (itemIndex >= _itemsLength) if (itemIndex >= _itemsLength)
{ {
_itemsLength = ArrayUtility.NextPow2(_itemsLength << 1); _itemsLength = ArrayUtility.NextPow2(_itemsLength << 1);
_items = MemoryAllocator.Realloc(_items, _itemsLength).As<T>(); _items = MemoryAllocator.Realloc(_items, _itemsLength).Ptr;
_sharedStore->_items = _items; _sharedStore->_items = _items;
} }
} }
_mediator.RegisterComponent(entityID, _componentTypeID, _maskBit); _mediator.RegisterComponent(entityID, _componentTypeID, _maskBit);
EnableComponent(ref ((T*)_items)[itemIndex]); EcsComponentLifecycle<T>.OnAdd(_isCustomLifecycle, _customLifecycle, ref ((T*)_items)[itemIndex], _worldID, entityID);
} //Add block end } //Add block end
return ref ((T*)_items)[itemIndex]; return ref ((T*)_items)[itemIndex];
} }
@ -248,18 +249,18 @@ namespace DCFApixels.DragonECS
{ {
ref int itemIndex = ref _mapping[entityID]; ref int itemIndex = ref _mapping[entityID];
#if DEBUG #if DEBUG
if (entityID == EcsConsts.NULL_ENTITY_ID) { Throw.Ent_ThrowIsNotAlive(_source, entityID); } if (entityID == EcsConsts.NULL_ENTITY_ID) { Throw.Ent_ThrowIsNotAlive(_world, entityID); }
if (itemIndex <= 0) { EcsPoolThrowHelper.ThrowNotHaveComponent<T>(entityID); } if (itemIndex <= 0) { EcsPoolThrowHelper.ThrowNotHaveComponent<T>(entityID); }
if (_isLocked) { EcsPoolThrowHelper.ThrowPoolLocked(); } if (_isLocked) { EcsPoolThrowHelper.ThrowPoolLocked(); }
#elif DRAGONECS_STABILITY_MODE #elif DRAGONECS_STABILITY_MODE
if (itemIndex <= 0) { return; } if (itemIndex <= 0) { return; }
if (_isLocked) { return; } if (_isLocked) { return; }
#endif #endif
DisableComponent(ref ((T*)_items)[itemIndex]); EcsComponentLifecycle<T>.OnDel( _isCustomLifecycle, _customLifecycle, ref ((T*)_items)[itemIndex], _worldID, entityID);
if (_recycledItemsCount >= _recycledItemsLength) if (_recycledItemsCount >= _recycledItemsLength)
{ {
_recycledItemsLength = ArrayUtility.NextPow2(_recycledItemsLength << 1); _recycledItemsLength = ArrayUtility.NextPow2(_recycledItemsLength << 1);
_recycledItems = MemoryAllocator.Realloc<int>(_recycledItems, _recycledItemsLength).As<int>(); _recycledItems = MemoryAllocator.Realloc<int>(_recycledItems, _recycledItemsLength).Ptr;
} }
_recycledItems[_recycledItemsCount++] = itemIndex; _recycledItems[_recycledItemsCount++] = itemIndex;
itemIndex = 0; itemIndex = 0;
@ -280,7 +281,7 @@ namespace DCFApixels.DragonECS
#elif DRAGONECS_STABILITY_MODE #elif DRAGONECS_STABILITY_MODE
if (!Has(fromEntityID)) { return; } if (!Has(fromEntityID)) { return; }
#endif #endif
CopyComponent(ref Get(fromEntityID), ref TryAddOrGet(toEntityID)); EcsComponentCopy<T>.Copy(_isCustomCopy, _customCopy, ref Get(fromEntityID), ref TryAddOrGet(toEntityID));
} }
public void Copy(int fromEntityID, EcsWorld toWorld, int toEntityID) public void Copy(int fromEntityID, EcsWorld toWorld, int toEntityID)
{ {
@ -289,7 +290,7 @@ namespace DCFApixels.DragonECS
#elif DRAGONECS_STABILITY_MODE #elif DRAGONECS_STABILITY_MODE
if (!Has(fromEntityID)) { return; } if (!Has(fromEntityID)) { return; }
#endif #endif
CopyComponent(ref Get(fromEntityID), ref toWorld.GetPool<T>().TryAddOrGet(toEntityID)); EcsComponentCopy<T>.Copy(_isCustomCopy, _customCopy, ref Get(fromEntityID), ref toWorld.GetPool<T>().TryAddOrGet(toEntityID));
} }
public void ClearAll() public void ClearAll()
@ -301,11 +302,11 @@ namespace DCFApixels.DragonECS
#endif #endif
_recycledItemsCount = 0; // спереди чтобы обнулялось, так как Del не обнуляет _recycledItemsCount = 0; // спереди чтобы обнулялось, так как Del не обнуляет
if (_itemsCount <= 0) { return; } if (_itemsCount <= 0) { return; }
var span = _source.Where(out SinglePoolAspect<EcsValuePool<T>> _); var span = _world.Where(out SinglePoolAspect<EcsValuePool<T>> _);
foreach (var entityID in span) foreach (var entityID in span)
{ {
ref int itemIndex = ref _mapping[entityID]; ref int itemIndex = ref _mapping[entityID];
DisableComponent(ref ((T*)_items)[itemIndex]); EcsComponentLifecycle<T>.OnDel(_isCustomLifecycle, _customLifecycle, ref ((T*)_items)[itemIndex], _worldID, entityID);
itemIndex = 0; itemIndex = 0;
_mediator.UnregisterComponent(entityID, _componentTypeID, _maskBit); _mediator.UnregisterComponent(entityID, _componentTypeID, _maskBit);
} }
@ -317,7 +318,7 @@ namespace DCFApixels.DragonECS
#region Callbacks #region Callbacks
void IEcsPoolImplementation.OnWorldResize(int newSize) void IEcsPoolImplementation.OnWorldResize(int newSize)
{ {
_mapping = MemoryAllocator.Realloc(_mapping, newSize).As<int>(); _mapping = MemoryAllocator.Realloc(_mapping, newSize).Ptr;
_sharedStore->_mapping = _mapping; _sharedStore->_mapping = _mapping;
} }
void IEcsPoolImplementation.OnReleaseDelEntityBuffer(ReadOnlySpan<int> buffer) void IEcsPoolImplementation.OnReleaseDelEntityBuffer(ReadOnlySpan<int> buffer)
@ -360,45 +361,6 @@ namespace DCFApixels.DragonECS
#endif #endif
#endregion #endregion
#region Enable/Disable/Copy
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private void EnableComponent(ref T component)
{
if (_isHasComponentLifecycleHandler)
{
_componentLifecycleHandler.Enable(ref component);
}
else
{
component = default;
}
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private void DisableComponent(ref T component)
{
if (_isHasComponentLifecycleHandler)
{
_componentLifecycleHandler.Disable(ref component);
}
else
{
component = default;
}
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private void CopyComponent(ref T from, ref T to)
{
if (_isHasComponentCopyHandler)
{
_componentCopyHandler.Copy(ref from, ref to);
}
else
{
to = from;
}
}
#endregion
#region IEnumerator - IntelliSense hack #region IEnumerator - IntelliSense hack
IEnumerator<T> IEnumerable<T>.GetEnumerator() { throw new NotImplementedException(); } IEnumerator<T> IEnumerable<T>.GetEnumerator() { throw new NotImplementedException(); }
IEnumerator IEnumerable.GetEnumerator() { throw new NotImplementedException(); } IEnumerator IEnumerable.GetEnumerator() { throw new NotImplementedException(); }