DragonECS.csproj

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

package.json

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

src/Collections/EcsGroup.cs

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

src/Collections/EcsSpan.cs

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

src/DebugUtils/EcsDebug.cs

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

src/EcsMask.cs

@@ -876,7 +876,7 @@ namespace DCFApixels.DragonECS
                             }
                         }
 
-                        if (_sortAnyChunckBuffer.Length != 0)
+                        if(_sortAnyChunckBuffer.Length != 0)
                         {
                             for (int i = 0; i < _sortAnyChunckBuffer.Length; i++)
                             {

src/EcsWorld.cs

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

src/EcsWorld.static.cs

@@ -202,7 +202,7 @@ namespace DCFApixels.DragonECS
 
                             if (_items.Length <= itemIndex)
                             {
-                                Array.Resize(ref _items, ArrayUtility.NextPow2(itemIndex));
+                                Array.Resize(ref _items, _items.Length << 1);
                             }
 
 #if DEBUG
@@ -234,21 +234,15 @@ 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, ArrayUtility.NextPow2(_recycledItemsCount));
+                            Array.Resize(ref _recycledItems, _recycledItems.Length << 1);
                         }
-                        _recycledItems[_recycledItemsCount++] = itemIndex;
                         _items[itemIndex] = default;
+                        _recycledItems[_recycledItemsCount++] = itemIndex;
                         itemIndex = 0;
                     }
                 }

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;
                 }

src/Injections/Injector.cs

@@ -16,7 +16,7 @@ namespace DCFApixels.DragonECS
         private readonly Dictionary<Type, InjectionNodeBase> _nodes = new Dictionary<Type, InjectionNodeBase>(32);
         private ReadOnlySpan<InjectionNodeBase> 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<object> EndReadHistory_Internal(int startIndex)
         {
             _injectionTempHistoryReadersCount--;
-            if (_injectionTempHistoryReadersCount < 0)
+            if(_injectionTempHistoryReadersCount < 0)
             {
                 Throw.OpeningClosingMethodsBalanceError();
             }

src/Internal/Allocators/MemoryAllocator.cs

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

src/Internal/ArrayUtility.cs

@@ -144,19 +144,7 @@ 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
             {
@@ -169,7 +157,7 @@ namespace DCFApixels.DragonECS.Core.Internal
                 return ++v;
             }
         }
-        public static int CeilPow2_ClampOverflow(int v)
+        public static int NextPow2_ClampOverflow(int v)
         {
             unchecked
             {
@@ -178,7 +166,7 @@ namespace DCFApixels.DragonECS.Core.Internal
                 {
                     return int.MaxValue;
                 }
-                return CeilPow2(v);
+                return NextPow2(v);
             }
         }
 
@@ -217,18 +205,19 @@ namespace DCFApixels.DragonECS.Core.Internal
                 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);
-        //    }
-        //}
+        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);
+            }
+        }
     }
     internal readonly struct EnumerableInt : IEnumerable<int>
     {

src/Internal/IdDispenser.cs

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

src/Internal/StructList.cs

@@ -30,7 +30,7 @@ namespace DCFApixels.DragonECS.Core.Internal
             set
             {
                 if (value <= _items.Length) { return; }
-                value = ArrayUtility.CeilPow2Safe(value);
+                value = ArrayUtility.NextPow2(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.CeilPow2Safe(capacity)];
+            _items = new T[ArrayUtility.NextPow2(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.CeilPow2Safe(newSize)];
+            _items = new T[ArrayUtility.NextPow2(newSize)];
             _count = 0;
         }
         [MethodImpl(MethodImplOptions.AggressiveInlining)]

src/Pools/EcsPool.cs

@@ -94,7 +94,7 @@ namespace DCFApixels.DragonECS
         public EcsPool() { }
         public EcsPool(int capacity, int recycledCapacity = -1)
         {
-            capacity = ArrayUtility.CeilPow2Safe(capacity);
+            capacity = ArrayUtility.NextPow2(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.CeilPow2Safe(worldConfig.PoolComponentsCapacity)];
+                _items = new T[ArrayUtility.NextPow2(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) { EcsPoolThrowHelper.ThrowEntityIsNotAlive(_source, entityID); }
-            if (_source.IsUsed(entityID) == false) { EcsPoolThrowHelper.ThrowEntityIsNotAlive(_source, entityID); }
+            if (entityID == EcsConsts.NULL_ENTITY_ID) { Throw.Ent_ThrowIsNotAlive(_source, entityID); }
+            if (_source.IsUsed(entityID) == false) { Throw.Ent_ThrowIsNotAlive(_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, ArrayUtility.NextPow2(itemIndex));
+                    Array.Resize(ref _items, _items.Length << 1);
                 }
             }
             _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) { EcsPoolThrowHelper.ThrowEntityIsNotAlive(_source, entityID); }
+            if (entityID == EcsConsts.NULL_ENTITY_ID) { Throw.Ent_ThrowIsNotAlive(_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, ArrayUtility.NextPow2(itemIndex));
+                        Array.Resize(ref _items, _items.Length << 1);
                     }
                 }
                 _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) { EcsPoolThrowHelper.ThrowEntityIsNotAlive(_source, entityID); }
+            if (entityID == EcsConsts.NULL_ENTITY_ID) { Throw.Ent_ThrowIsNotAlive(_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, ArrayUtility.NextPow2Safe(_recycledItemsCount));
+                Array.Resize(ref _recycledItems, _recycledItems.Length << 1);
             }
             _recycledItems[_recycledItemsCount++] = itemIndex;
             itemIndex = 0;

src/Pools/EcsPoolBase.cs

@@ -45,11 +45,6 @@ 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)}.");
@@ -321,7 +316,7 @@ namespace DCFApixels.DragonECS
             self.InvokeOnGet(entityID, self.Count);
         }
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void InvokeOnGet(this List<IEcsPoolEventListener> self, int entityID, int cachedCount)
+        internal static void InvokeOnGet(this List<IEcsPoolEventListener> self, int entityID, int cachedCount)
         {
             for (int i = 1; i < cachedCount; i++) { self[i].OnGet(entityID); }
         }

src/Pools/EcsTagPool.cs

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