Gottfried/glitchy-engine-beef
1
0
Fork 0
mirror of https://github.com/aharabada/glitchy-engine-beef.git synced 2026-09-05 13:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ECS] Fixed_disposingPools gets trashed when _componentPools reallocates

Browse Source
This commit is contained in:
Simon Lübeß
2021-09-14 23:28:18 +02:00
parent cb2c83678e
commit db05a5a6a9
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GlitchyEngine/src/World/EcsWorld.bf
+8 -8
View File
@@ -21,7 +21,7 @@ namespace GlitchyEngine.World
internal Dictionary<Type, ComponentPoolEntry> _componentPools = new .(); internal Dictionary<Type, ComponentPoolEntry> _componentPools = new .();
/// A list containing all pools whose components need to be disposed before removal. /// A list containing all pools whose components need to be disposed before removal.
List<ComponentPoolEntry*> _disposingPools = new .() ~ delete _; List<Type> _disposingPools = new .() ~ delete _;
public ~this() public ~this()
{ {
@@ -62,10 +62,8 @@ namespace GlitchyEngine.World
_componentPools.Add(typeof(T), (id, componentPool, disposeFunction)); _componentPools.Add(typeof(T), (id, componentPool, disposeFunction));
// We have to get the component from the dictionary so we get the reference
var poolInDictionary = ref _componentPools[typeof(T)];
// Add to list of components that need disposing // Add to list of components that need disposing
_disposingPools.Add(&poolInDictionary); _disposingPools.Add(typeof(T));
} }
/** @brief Returns the component pool for the given component type. /** @brief Returns the component pool for the given component type.
@@ -127,15 +125,17 @@ namespace GlitchyEngine.World
{ {
var componentMask = listEntity.ComponentMask; var componentMask = listEntity.ComponentMask;
for(let poolEntry in _disposingPools) for(let poolType in _disposingPools)
{ {
var pool = _componentPools[poolType];
// Check if the entity has this component type // Check if the entity has this component type
if(componentMask[poolEntry.Id]) if(componentMask[pool.Id])
{ {
// Get pointer to component // Get pointer to component
void* component = poolEntry.Pool.Get(listEntity.ID.Index); void* component = pool.Pool.Get(listEntity.ID.Index);
// Dispose component // Dispose component
poolEntry.DisposeFunction(component); pool.DisposeFunction(component);
} }
} }
} }