MoonsideGames
/
MoonTools.ECS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

run Filter callbacks before updating component storage

pull/4/head
cosmonaut 2023-05-19 13:24:26 -07:00
parent 4268762a0c
commit c68e16456e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/System.cs
View File

@ -19,8 +19,9 @@ namespace MoonTools.ECS
{ {
if (EntityStorage.RemoveComponent(entity.ID, ComponentTypeIndices.GetIndex<TComponent>())) if (EntityStorage.RemoveComponent(entity.ID, ComponentTypeIndices.GetIndex<TComponent>()))
{ {
ComponentDepot.Remove<TComponent>(entity.ID); // Run filter storage update first so that the entity state is still valid in the remove callback.
FilterStorage.Check<TComponent>(entity.ID); FilterStorage.Check<TComponent>(entity.ID);
ComponentDepot.Remove<TComponent>(entity.ID);
} }
} }

3
src/World.cs
View File

@ -90,8 +90,9 @@ namespace MoonTools.ECS
{ {
foreach (var componentTypeIndex in EntityStorage.ComponentTypeIndices(entity.ID)) foreach (var componentTypeIndex in EntityStorage.ComponentTypeIndices(entity.ID))
{ {
ComponentDepot.Remove(entity.ID, componentTypeIndex); // Run filter storage update first so that the entity state is still valid in the remove callback.
FilterStorage.RemoveEntity(entity.ID, componentTypeIndex); FilterStorage.RemoveEntity(entity.ID, componentTypeIndex);
ComponentDepot.Remove(entity.ID, componentTypeIndex);
} }
foreach (var relationTypeIndex in EntityStorage.RelationTypeIndices(entity.ID)) foreach (var relationTypeIndex in EntityStorage.RelationTypeIndices(entity.ID))