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

update

Browse Source
This commit is contained in:
Mikhail 2024-11-03 19:02:07 +08:00
parent c569007e8f
commit 4f5d6e09e4
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/EcsAspect.cs
View File

@ -38,12 +38,13 @@ namespace DCFApixels.DragonECS
}
#endregion
//Инициализация аспектов проходит в синхронизированном состоянии, поэтому использование _staticMaskCache потоко безопасно.
private static Dictionary<Type, EcsStaticMask> _staticMaskCache = new Dictionary<Type, EcsStaticMask>();
internal EcsWorld _source;
internal EcsMask _mask;
private bool _isBuilt = false;
//Инициализация аспектов проходит в синхронизированном состоянии, поэтому использование _staticMaskCache потоко безопасно.
private static Dictionary<Type, EcsStaticMask> _staticMaskCache = new Dictionary<Type, EcsStaticMask>();
private IEcsPool[] _pools;
#region Properties
public EcsMask Mask
@ -58,6 +59,10 @@ namespace DCFApixels.DragonECS
{
get { return _isBuilt; }
}
public ReadOnlySpan<IEcsPool> Pools
{
get { return _pools; }
}
/// <summary>
/// Статическая инициализация означет что каждый новый эекземпляр идентичен другому, инициализация стандартным путем создает идентичные экземпляры, поэтому значение по умолчанию true.
/// </summary>
@ -81,6 +86,9 @@ namespace DCFApixels.DragonECS
private EcsWorld _world;
private EcsStaticMask.Builder _maskBuilder;
private IEcsPool[] _poolsBuffer = new IEcsPool[8];
private int _poolsBufferCount;
#region Properties
public IncludeMarker Inc
{
@ -146,6 +154,8 @@ namespace DCFApixels.DragonECS
}
}
newAspect._mask = staticMask.ToMask(world);
var pools = new IEcsPool[builder._poolsBufferCount];
Array.Copy(builder._poolsBuffer, pools, pools.Length);
newAspect._isBuilt = true;
_constructorBuildersStackIndex--;
@ -156,21 +166,31 @@ namespace DCFApixels.DragonECS
#region Include/Exclude/Optional/Combine/Except
public TPool IncludePool<TPool>() where TPool : IEcsPoolImplementation, new()
{
var pool = _world.GetPoolInstance<TPool>();
var pool = CachePool<TPool>();
IncludeImplicit(pool.ComponentType);
return pool;
}
public TPool ExcludePool<TPool>() where TPool : IEcsPoolImplementation, new()
{
var pool = _world.GetPoolInstance<TPool>();
var pool = CachePool<TPool>();
ExcludeImplicit(pool.ComponentType);
return pool;
}
public TPool OptionalPool<TPool>() where TPool : IEcsPoolImplementation, new()
{
return _world.GetPoolInstance<TPool>();
return CachePool<TPool>();
}
private TPool CachePool<TPool>() where TPool : IEcsPoolImplementation, new()
{
var pool = _world.GetPoolInstance<TPool>();
if(_poolsBufferCount >= _poolsBuffer.Length)
{
Array.Resize(ref _poolsBuffer, _poolsBuffer.Length);
}
_poolsBuffer[_poolsBufferCount++] = pool;
return pool;
}
private void IncludeImplicit(Type type)
{
if (_maskBuilder.IsNull == false)

4
src/EcsPipeline.Builder.cs
View File

@ -558,7 +558,9 @@ namespace DCFApixels.DragonECS
if (AreMatchingOrderIdentical(listA, listB) == false)
{
//Для слияния списков слоев, нужно чтобы названия слоев, присутствующие в обоих списках, появлялись в одном и том же порядке в обоих списках
Throw.Exception("To merge layer lists, the names of the layers present in both lists must appear in the same order in both lists.");
//TODO все еще не работает!!!
//Throw.Exception("To merge layer lists, the names of the layers present in both lists must appear in the same order in both lists.");
}
HashSet<string> seen = new HashSet<string>();