mirror of
https://github.com/Ukendio/jecs.git
synced 2026-02-04 15:15:21 +00:00
fix world_delete clearing archetype entities before proper cleanup
This commit is contained in:
parent
74a97bc54e
commit
f2dada49e8
1 changed files with 43 additions and 10 deletions
|
|
@ -3497,10 +3497,14 @@ local function world_new(DEBUG: boolean?)
|
||||||
end
|
end
|
||||||
if idr_t then
|
if idr_t then
|
||||||
local archetype_ids = idr_t.records
|
local archetype_ids = idr_t.records
|
||||||
|
local to_remove = {}
|
||||||
|
|
||||||
for archetype_id in archetype_ids do
|
for archetype_id in archetype_ids do
|
||||||
local idr_t_archetype = archetypes[archetype_id]
|
local idr_t_archetype = archetypes[archetype_id]
|
||||||
local idr_t_types = idr_t_archetype.types
|
local idr_t_types = idr_t_archetype.types
|
||||||
local entities = idr_t_archetype.entities
|
local entities = idr_t_archetype.entities
|
||||||
|
local should_delete = false
|
||||||
|
local remove_count = 0
|
||||||
|
|
||||||
for _, id in idr_t_types do
|
for _, id in idr_t_types do
|
||||||
if not ECS_IS_PAIR(id) then
|
if not ECS_IS_PAIR(id) then
|
||||||
|
|
@ -3515,27 +3519,56 @@ local function world_new(DEBUG: boolean?)
|
||||||
local flags = id_record.flags
|
local flags = id_record.flags
|
||||||
local flags_delete_mask = bit32.btest(flags, ECS_ID_DELETE)
|
local flags_delete_mask = bit32.btest(flags, ECS_ID_DELETE)
|
||||||
if flags_delete_mask then
|
if flags_delete_mask then
|
||||||
for i = #entities, 1, -1 do
|
should_delete = true
|
||||||
local child = entities[i]
|
|
||||||
world_delete(world, child)
|
|
||||||
end
|
|
||||||
break
|
break
|
||||||
else
|
else
|
||||||
local on_remove = id_record.on_remove
|
to_remove[id] = id_record
|
||||||
|
remove_count += 1
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
local to = archetype_traverse_remove(world, id, idr_t_archetype)
|
if should_delete then
|
||||||
for i = #entities, 1, -1 do
|
for i = #entities, 1, -1 do
|
||||||
|
local child = entities[i]
|
||||||
|
world_delete(world, child)
|
||||||
|
end
|
||||||
|
else
|
||||||
|
if remove_count == 1 then
|
||||||
|
local id, id_record = next(to_remove)
|
||||||
|
local to = archetype_traverse_remove(world, id :: i53, idr_t_archetype)
|
||||||
|
local on_remove = (id_record :: componentrecord).on_remove
|
||||||
|
for i = #entities, 1, -1 do
|
||||||
local child = entities[i]
|
local child = entities[i]
|
||||||
if on_remove then
|
if on_remove then
|
||||||
on_remove(child, id)
|
on_remove(child, id :: i53)
|
||||||
end
|
end
|
||||||
|
|
||||||
local r = entity_index_try_get_unsafe(child) :: record
|
local r = entity_index_try_get_unsafe(child) :: record
|
||||||
inner_entity_move(child, r, to)
|
inner_entity_move(child, r, to)
|
||||||
end
|
end
|
||||||
end
|
elseif remove_count > 1 then
|
||||||
end
|
local dst_types = table.clone(idr_t_types)
|
||||||
|
for id, record in to_remove do
|
||||||
|
table.remove(dst_types, table.find(dst_types, id))
|
||||||
|
|
||||||
|
local on_remove = record.on_remove
|
||||||
|
if on_remove then
|
||||||
|
for _, child in entities do
|
||||||
|
on_remove(child, id :: i53)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
local to = archetype_ensure(world, dst_types)
|
||||||
|
for i = #entities, 1, -1 do
|
||||||
|
local child = entities[i]
|
||||||
|
local r = entity_index_try_get_unsafe(child) :: record
|
||||||
|
inner_entity_move(child, r, to)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
table.clear(to_remove)
|
||||||
archetype_destroy(world, idr_t_archetype)
|
archetype_destroy(world, idr_t_archetype)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue