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

Update EcsStaticMask.cs

Browse Source
This commit is contained in:
DCFApixels 2025-05-20 15:30:43 +08:00
parent 0871b3d6af
commit 3329f707d0
1 changed files with 62 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
src/EcsStaticMask.cs
View File

@ -301,14 +301,7 @@ namespace DCFApixels.DragonECS
} }
public static Builder New() public static Builder New()
{ {
lock (_lock) return new Builder(BuilderInstance.TakeFromPool());
{
if (_buildersPool.TryPop(out BuilderInstance builderInstance) == false)
{
builderInstance = new BuilderInstance();
}
return new Builder(builderInstance);
}
} }
#endregion #endregion
@ -357,17 +350,15 @@ namespace DCFApixels.DragonECS
if (_version != _builder._version) { Throw.CantReuseBuilder(); } if (_version != _builder._version) { Throw.CantReuseBuilder(); }
lock (_lock) lock (_lock)
{ {
_buildersPool.Push(_builder); var result = _builder.Build();
return _builder.Build(); BuilderInstance.ReturnToPool(_builder);
return result;
} }
} }
public void Cancel() public void Cancel()
{ {
if (_version != _builder._version) { Throw.CantReuseBuilder(); } if (_version != _builder._version) { Throw.CantReuseBuilder(); }
lock (_lock) BuilderInstance.ReturnToPool(_builder);
{
_buildersPool.Push(_builder);
}
} }
#endregion #endregion
} }
@ -382,8 +373,33 @@ namespace DCFApixels.DragonECS
internal int _version; internal int _version;
#region Constrcutors #region Constrcutors/Take/Return
internal BuilderInstance() { } internal BuilderInstance() { }
internal static BuilderInstance TakeFromPool()
{
lock (_lock)
{
if (_buildersPool.TryPop(out BuilderInstance builderInstance) == false)
{
builderInstance = new BuilderInstance();
}
return builderInstance;
}
}
internal static void ReturnToPool(BuilderInstance instance)
{
lock (_lock)
{
instance.Clear();
_buildersPool.Push(instance);
}
}
private void Clear()
{
_incsSet.Clear();
_excsSet.Clear();
_anysSet.Clear();
}
#endregion #endregion
#region Inc/Exc/Combine/Except #region Inc/Exc/Combine/Except
@ -432,15 +448,20 @@ namespace DCFApixels.DragonECS
#region Build #region Build
public EcsStaticMask Build() public EcsStaticMask Build()
{ {
HashSet<EcsTypeCode> combinedIncs = _incsSet; HashSet<EcsTypeCode> combinedIncs;
HashSet<EcsTypeCode> combinedExcs = _excsSet; HashSet<EcsTypeCode> combinedExcs;
HashSet<EcsTypeCode> combinedAnys = _anysSet; HashSet<EcsTypeCode> combinedAnys;
if (_combineds.Count > 0) if (_combineds.Count > 0)
{ {
combinedIncs = new HashSet<EcsTypeCode>(); var combinerBuilder = TakeFromPool();
combinedExcs = new HashSet<EcsTypeCode>(); combinedIncs = combinerBuilder._incsSet;
//combinedAnys = new HashSet<EcsTypeCode>(); //TODO разработать комбинацию для any combinedExcs = combinerBuilder._excsSet;
combinedAnys = combinerBuilder._anysSet;
combinedIncs.Union(_incsSet);
combinedExcs.Union(_excsSet);
combinedAnys.Union(_anysSet);
if (_sortedCombinedChecker == false) if (_sortedCombinedChecker == false)
{ {
_combineds.Sort((a, b) => a.order - b.order); _combineds.Sort((a, b) => a.order - b.order);
@ -448,27 +469,31 @@ namespace DCFApixels.DragonECS
foreach (var item in _combineds) foreach (var item in _combineds)
{ {
EcsStaticMask submask = item.mask; EcsStaticMask submask = item.mask;
combinedIncs.ExceptWith(submask._excs);//удаляю конфликтующие ограничения _incsSet.ExceptWith(submask._excs);//удаляю конфликтующие ограничения
combinedExcs.ExceptWith(submask._incs);//удаляю конфликтующие ограничения _excsSet.ExceptWith(submask._incs);//удаляю конфликтующие ограничения
combinedIncs.UnionWith(submask._incs); _anysSet.ExceptWith(submask._excs);//удаляю конфликтующие ограничения
combinedExcs.UnionWith(submask._excs); _anysSet.ExceptWith(submask._incs);//удаляю конфликтующие ограничения
_incsSet.UnionWith(submask._incs);
_excsSet.UnionWith(submask._excs);
_anysSet.UnionWith(submask._anys);
} }
combinedIncs.ExceptWith(_excsSet);//удаляю конфликтующие ограничения _incsSet.ExceptWith(combinedExcs);//удаляю конфликтующие ограничения
combinedExcs.ExceptWith(_incsSet);//удаляю конфликтующие ограничения _excsSet.ExceptWith(combinedIncs);//удаляю конфликтующие ограничения
combinedIncs.UnionWith(_incsSet); _anysSet.ExceptWith(combinedExcs);//удаляю конфликтующие ограничения
combinedExcs.UnionWith(_excsSet); _anysSet.ExceptWith(combinedIncs);//удаляю конфликтующие ограничения
_incsSet.UnionWith(combinedIncs);
_excsSet.UnionWith(combinedExcs);
_anysSet.UnionWith(combinedAnys);
_combineds.Clear(); _combineds.Clear();
ReturnToPool(combinerBuilder);
} }
else
{ combinedIncs = _incsSet;
combinedIncs = _incsSet; combinedExcs = _excsSet;
combinedExcs = _excsSet; combinedAnys = _anysSet;
combinedAnys = _anysSet;
}
if (_excepteds.Count > 0) if (_excepteds.Count > 0)
{ {
//TODO разработать вычитание для any
foreach (var item in _excepteds) foreach (var item in _excepteds)
{ {
//if (combinedIncs.Overlaps(item.mask._exc) || combinedExcs.Overlaps(item.mask._inc)) //if (combinedIncs.Overlaps(item.mask._exc) || combinedExcs.Overlaps(item.mask._inc))
@ -477,6 +502,7 @@ namespace DCFApixels.DragonECS
//} //}
combinedIncs.ExceptWith(item.mask._incs); combinedIncs.ExceptWith(item.mask._incs);
combinedExcs.ExceptWith(item.mask._excs); combinedExcs.ExceptWith(item.mask._excs);
combinedAnys.ExceptWith(item.mask._anys);
} }
_excepteds.Clear(); _excepteds.Clear();
} }
@ -492,10 +518,6 @@ namespace DCFApixels.DragonECS
var key = new Key(inc, exc, any); var key = new Key(inc, exc, any);
EcsStaticMask result = CreateMask(key); EcsStaticMask result = CreateMask(key);
_incsSet.Clear();
_excsSet.Clear();
_anysSet.Clear();
_version++; _version++;
return result; return result;
} }