zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ecs: fix pointer invalidation in set/removeComponent

Browse source
This commit is contained in:
dweiller 2022-06-07 21:06:49 +10:00 • committed by Stephen Gutekanst
parent 997cf7d446
commit 3234b6c0dd
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ecs/src/entities.zig
View file

@ -371,6 +371,10 @@ pub const Entities = struct {
// new component was added), or the same archetype storage table (if just updating the // new component was added), or the same archetype storage table (if just updating the
// value of a component.) // value of a component.)
var archetype_entry = try entities.archetypes.getOrPut(entities.allocator, new_hash); var archetype_entry = try entities.archetypes.getOrPut(entities.allocator, new_hash);
// WARNING: entities.archetypes.getOrPut() can invalidate archetype, so we refresh it here
archetype = entities.archetypeByID(entity);
if (!archetype_entry.found_existing) { if (!archetype_entry.found_existing) {
archetype_entry.value_ptr.* = ArchetypeStorage{ archetype_entry.value_ptr.* = ArchetypeStorage{
.allocator = entities.allocator, .allocator = entities.allocator,
@ -488,6 +492,10 @@ pub const Entities = struct {
// new component was added), or the same archetype storage table (if just updating the // new component was added), or the same archetype storage table (if just updating the
// value of a component.) // value of a component.)
var archetype_entry = try entities.archetypes.getOrPut(entities.allocator, new_hash); var archetype_entry = try entities.archetypes.getOrPut(entities.allocator, new_hash);
// WARNING: entities.archetypes.getOrPut() can invalidate archetype, so we refresh it here
archetype = entities.archetypeByID(entity);
if (!archetype_entry.found_existing) { if (!archetype_entry.found_existing) {
archetype_entry.value_ptr.* = ArchetypeStorage{ archetype_entry.value_ptr.* = ArchetypeStorage{
.allocator = entities.allocator, .allocator = entities.allocator,