From 4512245e57e5d947bfdc57446edc0e9cfeb781f0 Mon Sep 17 00:00:00 2001 From: DCFApixels <99481254+DCFApixels@users.noreply.github.com> Date: Tue, 26 Aug 2025 15:50:11 +0800 Subject: [PATCH] hot fix up version to 0.9.20 --- DragonECS.csproj | 2 +- package.json | 2 +- src/Collections/EcsGroup.cs | 6 ++--- src/Collections/EcsSpan.cs | 4 +-- src/EcsMask.cs | 4 +-- src/EcsPipeline.Builder.cs | 4 +-- src/EcsWorld.cs | 8 +++--- src/EcsWorld.static.cs | 6 ++--- src/Executors/MaskQueryExecutor.cs | 2 +- src/Injections/Injector.cs | 6 ++--- src/Internal/ArrayUtility.cs | 41 +++++++++++++++++++----------- src/Internal/IdDispenser.cs | 2 +- src/Internal/StructList.cs | 6 ++--- src/Pools/EcsPool.cs | 6 ++--- 14 files changed, 55 insertions(+), 44 deletions(-) diff --git a/DragonECS.csproj b/DragonECS.csproj index a597b72..44dcf4f 100644 --- a/DragonECS.csproj +++ b/DragonECS.csproj @@ -10,7 +10,7 @@ DCFApixels.DragonECS DragonECS - 0.9.19 + 0.9.20 DCFApixels ECS Framework for Game Engines with C# and .Net Platform DCFApixels diff --git a/package.json b/package.json index eab1673..e596002 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "displayName": "DragonECS", "description": "C# Entity Component System Framework", "unity": "2020.3", - "version": "0.9.19", + "version": "0.9.20", "repository": { "type": "git", "url": "https://github.com/DCFApixels/DragonECS.git" diff --git a/src/Collections/EcsGroup.cs b/src/Collections/EcsGroup.cs index b7b2cce..ee7fd30 100644 --- a/src/Collections/EcsGroup.cs +++ b/src/Collections/EcsGroup.cs @@ -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) diff --git a/src/Collections/EcsSpan.cs b/src/Collections/EcsSpan.cs index 86a0ce2..d68ee27 100644 --- a/src/Collections/EcsSpan.cs +++ b/src/Collections/EcsSpan.cs @@ -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) diff --git a/src/EcsMask.cs b/src/EcsMask.cs index 3521ad0..2aa5376 100644 --- a/src/EcsMask.cs +++ b/src/EcsMask.cs @@ -75,7 +75,7 @@ namespace DCFApixels.DragonECS get { return _anys; } } public EcsMaskFlags Flags - { + { [MethodImpl(MethodImplOptions.AggressiveInlining)] get { return _flags; } } @@ -876,7 +876,7 @@ namespace DCFApixels.DragonECS } } - if(_sortAnyChunckBuffer.Length != 0) + if (_sortAnyChunckBuffer.Length != 0) { for (int i = 0; i < _sortAnyChunckBuffer.Length; i++) { diff --git a/src/EcsPipeline.Builder.cs b/src/EcsPipeline.Builder.cs index 64b6309..e06c7ae 100644 --- a/src/EcsPipeline.Builder.cs +++ b/src/EcsPipeline.Builder.cs @@ -245,7 +245,7 @@ namespace DCFApixels.DragonECS Configs.Instance.Set(config.Key, config.Value); } Layers.MergeWith(other.Layers); - + foreach (ref readonly SystemNode otherRecord in new LinkedListCountIterator(_systemNodes, _systemNodesCount, _startIndex)) { AddNode_Internal(otherRecord.system, otherRecord.layerName, otherRecord.sortOrder, otherRecord.isUnique); @@ -351,7 +351,7 @@ namespace DCFApixels.DragonECS //} } - + IEcsProcess[] allSystems = new IEcsProcess[allSystemsLength]; { int i = 0; diff --git a/src/EcsWorld.cs b/src/EcsWorld.cs index 441dab5..2ce52bb 100644 --- a/src/EcsWorld.cs +++ b/src/EcsWorld.cs @@ -205,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); @@ -570,12 +570,12 @@ namespace DCFApixels.DragonECS count++; } } - if(count == 0) + if (count == 0) { return false; } } - + return true; } bool deepDebug = IsMatchesMaskDeepDebug(mask, entityID); diff --git a/src/EcsWorld.static.cs b/src/EcsWorld.static.cs index fbb52d7..033321a 100644 --- a/src/EcsWorld.static.cs +++ b/src/EcsWorld.static.cs @@ -235,9 +235,9 @@ namespace DCFApixels.DragonECS } ref short itemIndex = ref _mapping[worldID]; #if DEBUG && DRAGONECS_DEEP_DEBUG - if (itemIndex >= _worlds.Length) - { - Throw.UndefinedException(); + if (itemIndex >= _worlds.Length) + { + Throw.UndefinedException(); } #endif if (itemIndex != 0) diff --git a/src/Executors/MaskQueryExecutor.cs b/src/Executors/MaskQueryExecutor.cs index 9008aad..e835c66 100644 --- a/src/Executors/MaskQueryExecutor.cs +++ b/src/Executors/MaskQueryExecutor.cs @@ -157,7 +157,7 @@ namespace DCFApixels.DragonECS.Core var slots = _world._poolSlots; for (int i = 1; i < _count; i++) { - if(_versions[i] == slots[_componentIDs[i]].version) + if (_versions[i] == slots[_componentIDs[i]].version) { return false; } diff --git a/src/Injections/Injector.cs b/src/Injections/Injector.cs index 8786867..df558b0 100644 --- a/src/Injections/Injector.cs +++ b/src/Injections/Injector.cs @@ -16,7 +16,7 @@ namespace DCFApixels.DragonECS private readonly Dictionary _nodes = new Dictionary(32); private ReadOnlySpan GetNodes(Type type) { - if(_branches.TryGetValue(type, out InjectionBranch branch)) + if (_branches.TryGetValue(type, out InjectionBranch branch)) { return branch.Nodes; } @@ -34,7 +34,7 @@ namespace DCFApixels.DragonECS private ReadOnlySpan EndReadHistory_Internal(int startIndex) { _injectionTempHistoryReadersCount--; - if(_injectionTempHistoryReadersCount < 0) + if (_injectionTempHistoryReadersCount < 0) { Throw.OpeningClosingMethodsBalanceError(); } @@ -45,7 +45,7 @@ namespace DCFApixels.DragonECS } return result; } - public readonly struct InjectionHistorySpanReader + public readonly struct InjectionHistorySpanReader { private readonly Injector _injector; private readonly int _startIndex; diff --git a/src/Internal/ArrayUtility.cs b/src/Internal/ArrayUtility.cs index 7d2f7ac..1dbbb2d 100644 --- a/src/Internal/ArrayUtility.cs +++ b/src/Internal/ArrayUtility.cs @@ -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(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(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 { diff --git a/src/Internal/IdDispenser.cs b/src/Internal/IdDispenser.cs index 97ae478..d0b531e 100644 --- a/src/Internal/IdDispenser.cs +++ b/src/Internal/IdDispenser.cs @@ -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) { diff --git a/src/Internal/StructList.cs b/src/Internal/StructList.cs index 4331c09..497cc92 100644 --- a/src/Internal/StructList.cs +++ b/src/Internal/StructList.cs @@ -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)] diff --git a/src/Pools/EcsPool.cs b/src/Pools/EcsPool.cs index 7a6ee06..943d6c7 100644 --- a/src/Pools/EcsPool.cs +++ b/src/Pools/EcsPool.cs @@ -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) { @@ -232,7 +232,7 @@ namespace DCFApixels.DragonECS DisableComponent(ref _items[itemIndex]); if (_recycledItemsCount >= _recycledItems.Length) { - Array.Resize(ref _recycledItems, ArrayUtility.NextPow2(_recycledItemsCount)); + Array.Resize(ref _recycledItems, ArrayUtility.NextPow2Safe(_recycledItemsCount)); } _recycledItems[_recycledItemsCount++] = itemIndex; itemIndex = 0;