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

Merge branch 'dev' into new_system_layers

Browse Source
This commit is contained in:
DCFApixels 2025-04-04 14:51:03 +08:00
commit de751acaa5
6 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/EcsMask.cs
View File

@ -962,29 +962,30 @@ namespace DCFApixels.DragonECS.Internal
internal const int STACK_BUFFER_THRESHOLD = 100;
[MethodImpl(MethodImplOptions.AggressiveInlining)]
internal static void ConvertToChuncks(EcsMaskChunck* ptr, UnsafeArray<int> input, UnsafeArray<EcsMaskChunck> output)
internal static void ConvertToChuncks(EcsMaskChunck* bufferPtr, UnsafeArray<int> input, UnsafeArray<EcsMaskChunck> output)
{
for (int i = 0; i < input.Length; i++)
{
ptr[i] = EcsMaskChunck.FromID(input.ptr[i]);
bufferPtr[i] = EcsMaskChunck.FromID(input.ptr[i]);
}
for (int inputI = 0, outputI = 0; outputI < output.Length; inputI++, ptr++)
for (int inputI = 0, outputI = 0; outputI < output.Length; inputI++, bufferPtr++)
{
int maskX = ptr->mask;
if (maskX == 0) { continue; }
int chunkIndexX = ptr->chunkIndex;
int stackingMask = bufferPtr->mask;
if (stackingMask == 0) { continue; }
int stackingChunkIndex = bufferPtr->chunkIndex;
EcsMaskChunck* subptr = ptr;
for (int j = 1; j < input.Length - inputI; j++, subptr++)
EcsMaskChunck* bufferSpanPtr = bufferPtr + 1;
for (int j = 1; j < input.Length - inputI; j++, bufferSpanPtr++)
{
if (subptr->chunkIndex == chunkIndexX)
if (bufferSpanPtr->chunkIndex == stackingChunkIndex)
{
maskX |= subptr->mask;
*subptr = default;
stackingMask |= bufferSpanPtr->mask;
*bufferSpanPtr = default;
}
}
output.ptr[outputI] = new EcsMaskChunck(chunkIndexX, maskX);
output.ptr[outputI] = new EcsMaskChunck(stackingChunkIndex, stackingMask);
outputI++;
}
}

8
src/EcsWorld.cs
View File

@ -365,6 +365,7 @@ namespace DCFApixels.DragonECS
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public int NewEntity(int entityID)
{
_entityDispenser.Upsize(entityID + 1);
#if DEBUG
if (IsUsed(entityID)) { Throw.World_EntityIsAlreadyСontained(entityID); }
#elif DRAGONECS_STABILITY_MODE
@ -1257,9 +1258,12 @@ namespace DCFApixels.DragonECS
{
EntitySlotInfo[] result = new EntitySlotInfo[_world.Count];
int i = 0;
foreach (var e in _world.ToSpan())
using (_world.DisableAutoReleaseDelEntBuffer())
{
result[i++] = _world.GetEntitySlotInfoDebug(e);
foreach (var e in _world.ToSpan())
{
result[i++] = _world.GetEntitySlotInfoDebug(e);
}
}
return result;
}

16
src/Executors/EcsWhereExecutor.cs
View File

@ -91,10 +91,22 @@ namespace DCFApixels.DragonECS.Internal
Execute_Iternal();
#if DEBUG || DRAGONECS_DEEP_DEBUG
var newSpan = new EcsSpan(World.ID, _filteredAllEntities, _filteredAllEntitiesCount);
foreach (var e in newSpan)
using (EcsGroup group = EcsGroup.New(World))
{
if (World.IsMatchesMask(Mask, e) == false)
foreach (var e in World.Entities)
{
if (World.IsMatchesMask(Mask, e))
{
group.Add(e);
}
}
if (group.SetEquals(newSpan) == false)
{
int[] array = new int[_filteredAllEntities.Length];
var count = _iterator.IterateTo(World.Entities, ref array);
EcsDebug.PrintError(newSpan.ToString() + "\r\n" + group.ToSpan().ToString());
Throw.DeepDebugException();
}
}

3
src/Pools/EcsPool.cs
View File

@ -95,11 +95,12 @@ namespace DCFApixels.DragonECS
{
ref int itemIndex = ref _mapping[entityID];
#if DEBUG
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
if (itemIndex > 0) { return ref Get(entityID); }
if (_isLocked) { return ref _items[0]; }
if (_isLocked | _source.IsUsed(entityID) == false) { return ref _items[0]; }
#endif
if (_recycledItemsCount > 0)
{

3
src/Pools/EcsTagPool.cs
View File

@ -104,10 +104,11 @@ namespace DCFApixels.DragonECS
public void Add(int entityID)
{
#if DEBUG
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
if (Has(entityID) || _isLocked) { return; }
if (Has(entityID) | _source.IsUsed(entityID) == false | _isLocked) { return; }
#endif
_count++;
_mapping[entityID] = true;

5
src/Utils/Exceptions.cs
View File

@ -118,6 +118,11 @@ namespace DCFApixels.DragonECS.Internal
throw new InvalidOperationException($"The method {methodName} can only be executed before creating entities in the world.");
}
[MethodImpl(MethodImplOptions.NoInlining)]
internal static void Ent_ThrowIsNotAlive(EcsWorld world, int entityID)
{
Ent_ThrowIsNotAlive((world, entityID));
}
[MethodImpl(MethodImplOptions.NoInlining)]
internal static void Ent_ThrowIsNotAlive(entlong entity)
{