Sovereignty/jecs
1
0
Fork 0
mirror of https://github.com/Ukendio/jecs.git synced 2025-04-25 09:30:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup code

Browse source
This commit is contained in:
Ukendio 2024-12-24 22:22:57 +01:00
parent d5d275cc17
commit 7c2cd6061e
1 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
jecs.luau
View file

@ -684,8 +684,8 @@ local function archetype_ensure(world: World, types): Archetype
return archetype_create(world, types, ty) return archetype_create(world, types, ty)
end end
local function find_insert(types: { i53 }, toAdd: i53): number local function find_insert(id_types: { i53 }, toAdd: i53): number
for i, id in types do for i, id in id_types do
if id == toAdd then if id == toAdd then
return -1 return -1
end end
@ -693,17 +693,17 @@ local function find_insert(types: { i53 }, toAdd: i53): number
return i return i
end end
end end
return #types + 1 return #id_types + 1
end end
local function find_archetype_with(world: World, node: Archetype, id: i53): Archetype local function find_archetype_with(world: World, node: Archetype, id: i53): Archetype
local types = node.types local id_types = node.types
-- Component IDs are added incrementally, so inserting and sorting -- Component IDs are added incrementally, so inserting and sorting
-- them each time would be expensive. Instead this insertion sort can find the insertion -- them each time would be expensive. Instead this insertion sort can find the insertion
-- point in the types array. -- point in the types array.
local dst = table.clone(node.types) :: { i53 } local dst = table.clone(node.types) :: { i53 }
local at = find_insert(types, id) local at = find_insert(id_types, id)
if at == -1 then if at == -1 then
-- If it finds a duplicate, it just means it is the same archetype so it can return it -- If it finds a duplicate, it just means it is the same archetype so it can return it
-- directly instead of needing to hash types for a lookup to the archetype. -- directly instead of needing to hash types for a lookup to the archetype.
@ -715,13 +715,13 @@ local function find_archetype_with(world: World, node: Archetype, id: i53): Arch
end end
local function find_archetype_without(world: World, node: Archetype, id: i53): Archetype local function find_archetype_without(world: World, node: Archetype, id: i53): Archetype
local types = node.types local id_types = node.types
local at = table.find(types, id) local at = table.find(id_types, id)
if at == nil then if at == nil then
return node return node
end end
local dst = table.clone(types) local dst = table.clone(id_types)
table.remove(dst, at) table.remove(dst, at)
return archetype_ensure(world, dst) return archetype_ensure(world, dst)
@ -1576,15 +1576,18 @@ end
local function query_cached(query: QueryInner) local function query_cached(query: QueryInner)
local archetypes = query.compatible_archetypes local archetypes = query.compatible_archetypes
local world = query.world :: World local world = query.world :: World
local observer_1 = create_observer_uni(world, query.ids[1], EcsArchetypeCreate) -- Only need one observer for EcsArchetypeCreate and EcsArchetypeDelete respectively
observer_1.query = query -- because the event will be emitted for all components of that Archetype.
observer_1.callback = function(archetype) local first = query.ids[1]
local observer_for_create = create_observer_uni(world, first, EcsArchetypeCreate)
observer_for_create.query = query
observer_for_create.callback = function(archetype)
table.insert(archetypes, archetype) table.insert(archetypes, archetype)
end end
local observer_2 = create_observer_uni(world, query.ids[1], EcsArchetypeDelete) local observer_for_delete = create_observer_uni(world, first, EcsArchetypeDelete)
observer_2.query = query observer_for_delete.query = query
observer_2.callback = function(archetype) observer_for_delete.callback = function(archetype)
local i = table.find(archetypes, archetype) local i = table.find(archetypes, archetype) :: number
local n = #archetypes local n = #archetypes
archetypes[i] = archetypes[n] archetypes[i] = archetypes[n]
archetypes[n] = nil archetypes[n] = nil