AlicizaX/DragonECS
1
0
Fork 0
mirror of https://github.com/DCFApixels/DragonECS.git synced 2025-09-18 18:14:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update EcsPool.cs

Browse Source
This commit is contained in:
DCFApixels 2025-03-12 23:24:48 +08:00
parent 2d9499cd9e
commit c715ddd3b1
1 changed files with 55 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/Pools/EcsPool.cs
View File

@ -49,6 +49,7 @@ namespace DCFApixels.DragonECS
private int[] _denseEntitiesDelayed; private int[] _denseEntitiesDelayed;
private int _denseEntitiesDelayedCount = 0; private int _denseEntitiesDelayedCount = 0;
private bool _isDenseEntitiesDelayedValid = false; private bool _isDenseEntitiesDelayedValid = false;
private int _recycledCount = 0;
private readonly IEcsComponentLifecycle<T> _componentLifecycleHandler = EcsComponentResetHandler<T>.instance; private readonly IEcsComponentLifecycle<T> _componentLifecycleHandler = EcsComponentResetHandler<T>.instance;
private readonly bool _isHasComponentLifecycleHandler = EcsComponentResetHandler<T>.isHasHandler; private readonly bool _isHasComponentLifecycleHandler = EcsComponentResetHandler<T>.isHasHandler;
@ -56,7 +57,7 @@ namespace DCFApixels.DragonECS
private readonly bool _isHasComponentCopyHandler = EcsComponentCopyHandler<T>.isHasHandler; private readonly bool _isHasComponentCopyHandler = EcsComponentCopyHandler<T>.isHasHandler;
#if !DISABLE_POOLS_EVENTS #if !DISABLE_POOLS_EVENTS
private readonly StructList<IEcsPoolEventListener> _listeners = new StructList<IEcsPoolEventListener>(2); private StructList<IEcsPoolEventListener> _listeners = new StructList<IEcsPoolEventListener>(2);
private int _listenersCachedCount = 0; private int _listenersCachedCount = 0;
#endif #endif
private bool _isLocked; private bool _isLocked;
@ -137,43 +138,43 @@ namespace DCFApixels.DragonECS
} }
public ref T TryAddOrGet(int entityID) public ref T TryAddOrGet(int entityID)
{ {
if (Has(entityID)) //if (Has(entityID))
//{
// return ref Get(entityID);
//}
//else
//{
// return ref Add(entityID);
//}
#if (DEBUG && !DISABLE_DEBUG) || ENABLE_DRAGONECS_ASSERT_CHEKS
if (_isLocked) { EcsPoolThrowHelper.ThrowPoolLocked(); }
#endif
ref int itemIndex = ref _mapping[entityID];
if (itemIndex <= 0)
{ //Add block
itemIndex = GetFreeItemIndex(entityID);
_mediator.RegisterComponent(entityID, _componentTypeID, _maskBit);
_sparseEntities[itemIndex] = entityID;
EnableComponent(ref _items[itemIndex]);
#if !DISABLE_POOLS_EVENTS
_listeners.InvokeOnAdd(entityID, _listenersCachedCount);
#endif
} //Add block end
#if !DISABLE_POOLS_EVENTS
_listeners.InvokeOnGet(entityID, _listenersCachedCount);
#endif
#if DRAGONECS_DEEP_DEBUG
if (_mediator.GetComponentCount(_componentTypeID) != _itemsCount)
{ {
return ref Get(entityID); Throw.UndefinedException();
} }
else #endif
{ return ref _items[itemIndex];
return ref Add(entityID);
}
//#if (DEBUG && !DISABLE_DEBUG) || ENABLE_DRAGONECS_ASSERT_CHEKS
// if (_isLocked) { EcsPoolThrowHelper.ThrowPoolLocked(); }
//#endif
// ref int itemIndex = ref _mapping[entityID];
// if (itemIndex <= 0)
// { //Add block
// itemIndex = GetFreeItemIndex(entityID);
// _mediator.RegisterComponent(entityID, _componentTypeID, _maskBit);
// _sparseEntities[itemIndex] = entityID;
// EnableComponent(ref _items[itemIndex]);
//#if !DISABLE_POOLS_EVENTS
// _listeners.InvokeOnAdd(entityID, _listenersCachedCount);
//#endif
// } //Add block end
//#if !DISABLE_POOLS_EVENTS
// _listeners.InvokeOnGet(entityID, _listenersCachedCount);
//#endif
//
//
//#if DRAGONECS_DEEP_DEBUG
// if (_mediator.GetComponentCount(_componentTypeID) != _itemsCount)
// {
// Throw.UndefinedException();
// }
//#endif
// return ref _items[itemIndex];
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public bool Has(int entityID) public bool Has(int entityID)
@ -329,12 +330,14 @@ namespace DCFApixels.DragonECS
if (_isDenseEntitiesDelayedValid) { return; } if (_isDenseEntitiesDelayedValid) { return; }
_denseEntitiesDelayedCount = 1; _denseEntitiesDelayedCount = 1;
_denseEntitiesDelayed[0] = 0; _denseEntitiesDelayed[0] = 0;
for (int i = 1, jRight = _itemsCount + 1; i < _capacity; i++) _recycledCount = 0;
for (int i = 1, jRight = _itemsCount + 1; _denseEntitiesDelayedCount <= _itemsCount; i++)
{ {
if (_sparseEntities[i] == 0) if (_sparseEntities[i] == 0)
{ {
_denseEntitiesDelayed[jRight] = i; _denseEntitiesDelayed[jRight] = i;
jRight++; jRight++;
_recycledCount++;
} }
else else
{ {
@ -366,7 +369,7 @@ namespace DCFApixels.DragonECS
} }
} }
_lockToSpan = false; _lockToSpan = false;
for (int i = _denseEntitiesDelayedCount; i < _capacity; i++) for (int i = _denseEntitiesDelayedCount; i < _denseEntitiesDelayedCount + _recycledCount; i++)
{ {
var index = _denseEntitiesDelayed[i]; var index = _denseEntitiesDelayed[i];
if (_sparseEntities[index] != 0) if (_sparseEntities[index] != 0)
@ -388,12 +391,25 @@ namespace DCFApixels.DragonECS
{ {
Resize(_items.Length << 1); Resize(_items.Length << 1);
} }
int result = 0;
int result = _denseEntitiesDelayed[_denseEntitiesDelayedCount]; if(_recycledCount > 0)
{
_recycledCount--;
result = _denseEntitiesDelayed[_denseEntitiesDelayedCount];
}
else
{
result = _denseEntitiesDelayedCount;
}
_denseEntitiesDelayed[_denseEntitiesDelayedCount] = entityID; _denseEntitiesDelayed[_denseEntitiesDelayedCount] = entityID;
_itemsCount++; _itemsCount++;
_denseEntitiesDelayedCount++; _denseEntitiesDelayedCount++;
#if DRAGONECS_DEEP_DEBUG #if DRAGONECS_DEEP_DEBUG
if (_sparseEntities[result] != 0)
{
Throw.UndefinedException();
}
if (result == 0) if (result == 0)
{ {
Throw.UndefinedException(); Throw.UndefinedException();