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 EcsGroup

Browse Source
This commit is contained in:
Mikhail 2023-06-01 20:14:34 +08:00
parent 5c9452e56b
commit 8c612aa949
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/EcsGroup.cs
View File

@ -161,7 +161,7 @@ namespace DCFApixels.DragonECS
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public static EcsGroup New(EcsWorld world) public static EcsGroup New(EcsWorld world)
{ {
return world.GetGroupFromPool(); return world.GetFreeGroup();
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
internal EcsGroup(EcsWorld world, int denseCapacity = 64) internal EcsGroup(EcsWorld world, int denseCapacity = 64)
@ -259,7 +259,7 @@ namespace DCFApixels.DragonECS
} }
public EcsGroup Clone() public EcsGroup Clone()
{ {
EcsGroup result = _source.GetGroupFromPool(); EcsGroup result = _source.GetFreeGroup();
result.CopyFrom(this); result.CopyFrom(this);
return result; return result;
} }
@ -350,6 +350,14 @@ namespace DCFApixels.DragonECS
else else
AddInternal(item); AddInternal(item);
} }
public void Inverse()
{
foreach (var item in _source.Entities)
if (Has(item))
RemoveInternal(item);
else
AddInternal(item);
}
#endregion #endregion
#region Static Set operations #region Static Set operations
@ -360,7 +368,7 @@ namespace DCFApixels.DragonECS
#if (DEBUG && !DISABLE_DEBUG) || !DISABLE_DRAGONECS_ASSERT_CHEKS #if (DEBUG && !DISABLE_DEBUG) || !DISABLE_DRAGONECS_ASSERT_CHEKS
if (a._source != b._source) ThrowArgumentDifferentWorldsException(); if (a._source != b._source) ThrowArgumentDifferentWorldsException();
#endif #endif
EcsGroup result = a._source.GetGroupFromPool(); EcsGroup result = a._source.GetFreeGroup();
foreach (var item in a) foreach (var item in a)
result.AddInternal(item); result.AddInternal(item);
foreach (var item in b) foreach (var item in b)
@ -374,7 +382,7 @@ namespace DCFApixels.DragonECS
#if (DEBUG && !DISABLE_DEBUG) || !DISABLE_DRAGONECS_ASSERT_CHEKS #if (DEBUG && !DISABLE_DEBUG) || !DISABLE_DRAGONECS_ASSERT_CHEKS
if (a._source != b._source) ThrowArgumentDifferentWorldsException(); if (a._source != b._source) ThrowArgumentDifferentWorldsException();
#endif #endif
EcsGroup result = a._source.GetGroupFromPool(); EcsGroup result = a._source.GetFreeGroup();
foreach (var item in a) foreach (var item in a)
if (!b.Has(item)) if (!b.Has(item))
result.AddInternal(item); result.AddInternal(item);
@ -387,7 +395,7 @@ namespace DCFApixels.DragonECS
#if (DEBUG && !DISABLE_DEBUG) || !DISABLE_DRAGONECS_ASSERT_CHEKS #if (DEBUG && !DISABLE_DEBUG) || !DISABLE_DRAGONECS_ASSERT_CHEKS
if (a._source != b._source) ThrowArgumentDifferentWorldsException(); if (a._source != b._source) ThrowArgumentDifferentWorldsException();
#endif #endif
EcsGroup result = a._source.GetGroupFromPool(); EcsGroup result = a._source.GetFreeGroup();
foreach (var item in a) foreach (var item in a)
if (b.Has(item)) if (b.Has(item))
result.AddInternal(item); result.AddInternal(item);
@ -401,7 +409,7 @@ namespace DCFApixels.DragonECS
#if (DEBUG && !DISABLE_DEBUG) || !DISABLE_DRAGONECS_ASSERT_CHEKS #if (DEBUG && !DISABLE_DEBUG) || !DISABLE_DRAGONECS_ASSERT_CHEKS
if (a._source != b._source) ThrowArgumentDifferentWorldsException(); if (a._source != b._source) ThrowArgumentDifferentWorldsException();
#endif #endif
EcsGroup result = a._source.GetGroupFromPool(); EcsGroup result = a._source.GetFreeGroup();
foreach (var item in a) foreach (var item in a)
if (!b.Has(item)) if (!b.Has(item))
result.AddInternal(item); result.AddInternal(item);
@ -410,6 +418,15 @@ namespace DCFApixels.DragonECS
result.AddInternal(item); result.AddInternal(item);
return result; return result;
} }
public static EcsGroup Inverse(EcsGroup a)
{
EcsGroup result = a._source.GetFreeGroup();
foreach (var item in a._source.Entities)
if (!a.Has(item))
result.AddInternal(item);
return result;
}
#endregion #endregion
#region Enumerator #region Enumerator
@ -545,6 +562,7 @@ namespace DCFApixels.DragonECS
public int CapacityDense => _group.CapacityDense; public int CapacityDense => _group.CapacityDense;
public int CapacitySparce => _group.CapacitySparce; public int CapacitySparce => _group.CapacitySparce;
public override string ToString() => _group.ToString();
public DebuggerProxy(EcsGroup group) => _group = group; public DebuggerProxy(EcsGroup group) => _group = group;
} }
#endregion #endregion

4
src/EcsWorld.cs
View File

@ -83,7 +83,7 @@ namespace DCFApixels.DragonECS
_delEntBuffer = new int[_entitesCapacity >> DEL_ENT_BUFFER_SIZE_OFFSET]; _delEntBuffer = new int[_entitesCapacity >> DEL_ENT_BUFFER_SIZE_OFFSET];
_groups = new List<WeakReference<EcsGroup>>(); _groups = new List<WeakReference<EcsGroup>>();
_allEntites = GetGroupFromPool(); _allEntites = GetFreeGroup();
_subjects = new EcsSubject[128]; _subjects = new EcsSubject[128];
_executors = new EcsQueryExecutor[128]; _executors = new EcsQueryExecutor[128];
@ -337,7 +337,7 @@ namespace DCFApixels.DragonECS
{ {
_groups.Add(new WeakReference<EcsGroup>(group)); _groups.Add(new WeakReference<EcsGroup>(group));
} }
internal EcsGroup GetGroupFromPool() internal EcsGroup GetFreeGroup()
{ {
EcsGroup result = _groupsPool.Count <= 0 ? new EcsGroup(this) : _groupsPool.Pop(); EcsGroup result = _groupsPool.Count <= 0 ? new EcsGroup(this) : _groupsPool.Pop();
result._isReleased = false; result._isReleased = false;