Compare commits

...

5 Commits

Author SHA1 Message Date
DCFApixels
4512245e57 hot fix up version to 0.9.20 2025-08-26 15:50:11 +08:00
DCFApixels
2e1b22c129 Squashed commit of the following:
commit 1914307cbab5ee9b69d71014505d4b371b14eb75
Author: DCFApixels <99481254+DCFApixels@users.noreply.github.com>
Date:   Tue Aug 26 14:50:20 2025 +0800

    up version to 0.9.19

commit d15d4412f1a5a31aaf227e5893c1b3aaba35bf05
Author: DCFApixels <99481254+DCFApixels@users.noreply.github.com>
Date:   Tue Aug 26 14:47:55 2025 +0800

    fix array growth

commit 7015bbcc1b
Author: DCFApixels <99481254+DCFApixels@users.noreply.github.com>
Date:   Sat Aug 23 22:48:39 2025 +0800

    fix

commit 64fd11b072
Author: DCFApixels <99481254+DCFApixels@users.noreply.github.com>
Date:   Sat Aug 23 22:45:32 2025 +0800

    fix
2025-08-26 14:50:36 +08:00
DCFApixels
1605108e49 Merge branch 'main' of github.com:DCFApixels/DragonECS 2025-08-11 20:39:25 +08:00
DCFApixels
0a9bf9d906 up version to 0.9.18 2025-08-11 20:38:59 +08:00
Karpik
d67afc74a0
Fix NullReferenceException 2025-08-11 20:38:12 +08:00
18 changed files with 82 additions and 56 deletions

View File

@ -10,7 +10,7 @@
<RootNamespace>DCFApixels.DragonECS</RootNamespace>
<Title>DragonECS</Title>
<Version>0.9.17</Version>
<Version>0.9.20</Version>
<Authors>DCFApixels</Authors>
<Description>ECS Framework for Game Engines with C# and .Net Platform</Description>
<Copyright>DCFApixels</Copyright>

View File

@ -8,7 +8,7 @@
"displayName": "DragonECS",
"description": "C# Entity Component System Framework",
"unity": "2020.3",
"version": "0.9.17",
"version": "0.9.20",
"repository": {
"type": "git",
"url": "https://github.com/DCFApixels/DragonECS.git"

View File

@ -442,7 +442,7 @@ namespace DCFApixels.DragonECS
{
if (++_count >= _dense.Length)
{
Array.Resize(ref _dense, ArrayUtility.NextPow2(_count << 1));
Array.Resize(ref _dense, ArrayUtility.NextPow2(_count));
}
_dense[_count] = entityID;
@ -576,7 +576,7 @@ namespace DCFApixels.DragonECS
{
if (minSize >= _dense.Length)
{
Array.Resize(ref _dense, ArrayUtility.NextPow2_ClampOverflow(minSize));
Array.Resize(ref _dense, ArrayUtility.CeilPow2_ClampOverflow(minSize));
}
}
@ -663,7 +663,7 @@ namespace DCFApixels.DragonECS
{
if (dynamicBuffer.Length < _count)
{
Array.Resize(ref dynamicBuffer, ArrayUtility.NextPow2(_count));
Array.Resize(ref dynamicBuffer, ArrayUtility.CeilPow2(_count));
}
int i = 0;
foreach (var e in this)

View File

@ -98,7 +98,7 @@ namespace DCFApixels.DragonECS
{
if (dynamicBuffer.Length < _values.Length)
{
Array.Resize(ref dynamicBuffer, ArrayUtility.NextPow2(_values.Length));
Array.Resize(ref dynamicBuffer, ArrayUtility.CeilPow2(_values.Length));
}
int i = 0;
foreach (var e in this)
@ -247,7 +247,7 @@ namespace DCFApixels.DragonECS
{
if (dynamicBuffer.Length < _source.Count)
{
Array.Resize(ref dynamicBuffer, ArrayUtility.NextPow2(_source.Count));
Array.Resize(ref dynamicBuffer, ArrayUtility.CeilPow2(_source.Count));
}
int i = 0;
foreach (var e in this)

View File

@ -525,7 +525,7 @@ namespace DCFApixels.DragonECS.Core
{
if (id >= _stopwatchs.Length)
{
Array.Resize(ref _stopwatchs, id << 1);
Array.Resize(ref _stopwatchs, ArrayUtility.NextPow2(id));
}
_stopwatchs[id] = new MarkerData(new System.Diagnostics.Stopwatch(), name, id);
}

View File

@ -182,7 +182,11 @@ namespace DCFApixels.DragonECS
if (worldID < 0 || (worldID == NULL_WORLD_ID && nullWorld == false))
{
worldID = (short)_worldIdDispenser.UseFree();
int newID = _worldIdDispenser.UseFree();
#if DEBUG && DRAGONECS_DEEP_DEBUG
if (newID > short.MaxValue) { Throw.DeepDebugException(); }
#endif
worldID = (short)newID;
}
else
{
@ -201,12 +205,12 @@ namespace DCFApixels.DragonECS
_poolsMediator = new PoolsMediator(this);
int poolsCapacity = ArrayUtility.NextPow2(config.PoolsCapacity);
int poolsCapacity = ArrayUtility.CeilPow2Safe(config.PoolsCapacity);
_pools = new IEcsPoolImplementation[poolsCapacity];
_poolSlots = new PoolSlot[poolsCapacity];
ArrayUtility.Fill(_pools, _nullPool);
int entitiesCapacity = ArrayUtility.NextPow2(config.EntitiesCapacity);
int entitiesCapacity = ArrayUtility.CeilPow2Safe(config.EntitiesCapacity);
_entityDispenser = new IdDispenser(entitiesCapacity, 0, OnEntityDispenserResized);
_executorCoures = new Dictionary<(Type, object), IQueryExecutorImplementation>(config.PoolComponentsCapacity);
@ -1105,7 +1109,7 @@ namespace DCFApixels.DragonECS
public ReadOnlySpan<object> GetComponentsFor(int entityID)
{
int count = GetComponentTypeIDsFor_Internal(entityID, ref _componentIDsBuffer);
ArrayUtility.UpsizeWithoutCopy(ref _componentIDsBuffer, count);
ArrayUtility.UpsizeWithoutCopy(ref _componentsBuffer, count);
for (int i = 0; i < count; i++)
{

View File

@ -202,7 +202,7 @@ namespace DCFApixels.DragonECS
if (_items.Length <= itemIndex)
{
Array.Resize(ref _items, _items.Length << 1);
Array.Resize(ref _items, ArrayUtility.NextPow2(itemIndex));
}
#if DEBUG
@ -234,15 +234,21 @@ namespace DCFApixels.DragonECS
Array.Resize(ref _mapping, _worlds.Length);
}
ref short itemIndex = ref _mapping[worldID];
#if DEBUG && DRAGONECS_DEEP_DEBUG
if (itemIndex >= _worlds.Length)
{
Throw.UndefinedException();
}
#endif
if (itemIndex != 0)
{
_interface.OnDestroy(ref _items[itemIndex], _worlds[worldID]);
if (_recycledItemsCount >= _recycledItems.Length)
{
Array.Resize(ref _recycledItems, _recycledItems.Length << 1);
Array.Resize(ref _recycledItems, ArrayUtility.NextPow2(_recycledItemsCount));
}
_items[itemIndex] = default;
_recycledItems[_recycledItemsCount++] = itemIndex;
_items[itemIndex] = default;
itemIndex = 0;
}
}

View File

@ -60,7 +60,7 @@ namespace DCFApixels.DragonECS.Core.Internal
{
if (_debugInfos.Length <= _idDispenser.Count)
{
Array.Resize(ref _debugInfos, _debugInfos.Length << 1);
Array.Resize(ref _debugInfos, ArrayUtility.NextPow2(_idDispenser.Count));
}
id = _idDispenser.UseFree();
}

View File

@ -144,7 +144,19 @@ namespace DCFApixels.DragonECS.Core.Internal
array = result;
}
public static int NextPow2Safe(int v, int min = 4)
{
return NextPow2(v < min ? min : v);
}
public static int NextPow2(int v)
{
return CeilPow2(v | 1);
}
public static int CeilPow2Safe(int v, int min = 4)
{
return CeilPow2(v < min ? min : v);
}
public static int CeilPow2(int v)
{
unchecked
{
@ -157,7 +169,7 @@ namespace DCFApixels.DragonECS.Core.Internal
return ++v;
}
}
public static int NextPow2_ClampOverflow(int v)
public static int CeilPow2_ClampOverflow(int v)
{
unchecked
{
@ -166,7 +178,7 @@ namespace DCFApixels.DragonECS.Core.Internal
{
return int.MaxValue;
}
return NextPow2(v);
return CeilPow2(v);
}
}
@ -205,19 +217,18 @@ namespace DCFApixels.DragonECS.Core.Internal
Array.Resize(ref array, minSize);
}
}
public static void UpsizeToNextPow2<T>(ref T[] array, int minSize)
{
if (array == null)
{
minSize = NextPow2(minSize);
array = new T[minSize];
}
else if (minSize > array.Length)
{
minSize = NextPow2(minSize);
Array.Resize(ref array, minSize);
}
}
//public static void UpsizeToCeilPow2<T>(ref T[] array, int newSize, int minSize = 4)
//{
// newSize = CeilPow2(newSize < minSize ? minSize : newSize);
// if (array == null)
// {
// array = new T[newSize];
// }
// else if (newSize > array.Length)
// {
// Array.Resize(ref array, newSize);
// }
//}
}
internal readonly struct EnumerableInt : IEnumerable<int>
{

View File

@ -248,7 +248,7 @@ namespace DCFApixels.DragonECS.Core.Internal
[MethodImpl(MethodImplOptions.NoInlining)]
private void Upsize_Internal(int minSize)
{
Resize(ArrayUtility.NextPow2_ClampOverflow(minSize));
Resize(ArrayUtility.CeilPow2_ClampOverflow(minSize));
}
private void Resize(int newSize)
{

View File

@ -30,7 +30,7 @@ namespace DCFApixels.DragonECS.Core.Internal
set
{
if (value <= _items.Length) { return; }
value = ArrayUtility.NextPow2(value);
value = ArrayUtility.CeilPow2Safe(value);
Array.Resize(ref _items, value);
}
}
@ -64,7 +64,7 @@ namespace DCFApixels.DragonECS.Core.Internal
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public StructList(int capacity)
{
_items = new T[ArrayUtility.NextPow2(capacity)];
_items = new T[ArrayUtility.CeilPow2Safe(capacity)];
_count = 0;
}
#endregion
@ -226,7 +226,7 @@ namespace DCFApixels.DragonECS.Core.Internal
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void Recreate(int newSize)
{
_items = new T[ArrayUtility.NextPow2(newSize)];
_items = new T[ArrayUtility.CeilPow2Safe(newSize)];
_count = 0;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]

View File

@ -94,7 +94,7 @@ namespace DCFApixels.DragonECS
public EcsPool() { }
public EcsPool(int capacity, int recycledCapacity = -1)
{
capacity = ArrayUtility.NextPow2(capacity);
capacity = ArrayUtility.CeilPow2Safe(capacity);
if (recycledCapacity < 0)
{
recycledCapacity = capacity / 2;
@ -113,7 +113,7 @@ namespace DCFApixels.DragonECS
var worldConfig = world.Configs.GetWorldConfigOrDefault();
if (_items == null)
{
_items = new T[ArrayUtility.NextPow2(worldConfig.PoolComponentsCapacity)];
_items = new T[ArrayUtility.CeilPow2Safe(worldConfig.PoolComponentsCapacity)];
}
if (_recycledItems == null)
{
@ -128,8 +128,8 @@ namespace DCFApixels.DragonECS
{
ref int itemIndex = ref _mapping[entityID];
#if DEBUG
if (entityID == EcsConsts.NULL_ENTITY_ID) { Throw.Ent_ThrowIsNotAlive(_source, entityID); }
if (_source.IsUsed(entityID) == false) { Throw.Ent_ThrowIsNotAlive(_source, entityID); }
if (entityID == EcsConsts.NULL_ENTITY_ID) { EcsPoolThrowHelper.ThrowEntityIsNotAlive(_source, entityID); }
if (_source.IsUsed(entityID) == false) { EcsPoolThrowHelper.ThrowEntityIsNotAlive(_source, entityID); }
if (itemIndex > 0) { EcsPoolThrowHelper.ThrowAlreadyHasComponent<T>(entityID); }
if (_isLocked) { EcsPoolThrowHelper.ThrowPoolLocked(); }
#elif DRAGONECS_STABILITY_MODE
@ -146,7 +146,7 @@ namespace DCFApixels.DragonECS
itemIndex = ++_itemsCount;
if (itemIndex >= _items.Length)
{
Array.Resize(ref _items, _items.Length << 1);
Array.Resize(ref _items, ArrayUtility.NextPow2(itemIndex));
}
}
_mediator.RegisterComponent(entityID, _componentTypeID, _maskBit);
@ -179,7 +179,7 @@ namespace DCFApixels.DragonECS
public ref T TryAddOrGet(int entityID)
{
#if DEBUG
if (entityID == EcsConsts.NULL_ENTITY_ID) { Throw.Ent_ThrowIsNotAlive(_source, entityID); }
if (entityID == EcsConsts.NULL_ENTITY_ID) { EcsPoolThrowHelper.ThrowEntityIsNotAlive(_source, entityID); }
#endif
ref int itemIndex = ref _mapping[entityID];
if (itemIndex <= 0)
@ -199,7 +199,7 @@ namespace DCFApixels.DragonECS
itemIndex = ++_itemsCount;
if (itemIndex >= _items.Length)
{
Array.Resize(ref _items, _items.Length << 1);
Array.Resize(ref _items, ArrayUtility.NextPow2(itemIndex));
}
}
_mediator.RegisterComponent(entityID, _componentTypeID, _maskBit);
@ -222,7 +222,7 @@ namespace DCFApixels.DragonECS
{
ref int itemIndex = ref _mapping[entityID];
#if DEBUG
if (entityID == EcsConsts.NULL_ENTITY_ID) { Throw.Ent_ThrowIsNotAlive(_source, entityID); }
if (entityID == EcsConsts.NULL_ENTITY_ID) { EcsPoolThrowHelper.ThrowEntityIsNotAlive(_source, entityID); }
if (itemIndex <= 0) { EcsPoolThrowHelper.ThrowNotHaveComponent<T>(entityID); }
if (_isLocked) { EcsPoolThrowHelper.ThrowPoolLocked(); }
#elif DRAGONECS_STABILITY_MODE
@ -232,7 +232,7 @@ namespace DCFApixels.DragonECS
DisableComponent(ref _items[itemIndex]);
if (_recycledItemsCount >= _recycledItems.Length)
{
Array.Resize(ref _recycledItems, _recycledItems.Length << 1);
Array.Resize(ref _recycledItems, ArrayUtility.NextPow2Safe(_recycledItemsCount));
}
_recycledItems[_recycledItemsCount++] = itemIndex;
itemIndex = 0;

View File

@ -45,6 +45,11 @@ namespace DCFApixels.DragonECS.PoolsCore
throw new ArgumentException($"Entity({entityID}) has no component {EcsDebugUtility.GetGenericTypeName<T>()}.");
}
[MethodImpl(MethodImplOptions.NoInlining)]
public static void ThrowEntityIsNotAlive(EcsWorld world, int entityID)
{
Throw.Ent_ThrowIsNotAlive((world, entityID));
}
[MethodImpl(MethodImplOptions.NoInlining)]
public static void ThrowAlreadyHasComponent(Type type, int entityID)
{
throw new ArgumentException($"Entity({entityID}) already has component {EcsDebugUtility.GetGenericTypeName(type)}.");
@ -316,7 +321,7 @@ namespace DCFApixels.DragonECS
self.InvokeOnGet(entityID, self.Count);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
internal static void InvokeOnGet(this List<IEcsPoolEventListener> self, int entityID, int cachedCount)
public static void InvokeOnGet(this List<IEcsPoolEventListener> self, int entityID, int cachedCount)
{
for (int i = 1; i < cachedCount; i++) { self[i].OnGet(entityID); }
}

View File

@ -116,7 +116,7 @@ namespace DCFApixels.DragonECS
public void Add(int entityID)
{
#if DEBUG
if (_source.IsUsed(entityID) == false) { Throw.Ent_ThrowIsNotAlive(_source, entityID); }
if (_source.IsUsed(entityID) == false) { EcsPoolThrowHelper.ThrowEntityIsNotAlive(_source, entityID); }
if (Has(entityID)) { EcsPoolThrowHelper.ThrowAlreadyHasComponent<T>(entityID); }
if (_isLocked) { EcsPoolThrowHelper.ThrowPoolLocked(); }
#elif DRAGONECS_STABILITY_MODE