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

Add without

Browse source
This commit is contained in:
Ukendio 2024-04-28 20:59:19 +02:00
parent b75dc91a6a
commit f69e4e3b18
2 changed files with 106 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
benches/query.bench.lua
View file

@ -196,21 +196,21 @@ return {
Functions = { Functions = {
Mater = function() Mater = function()
local matched = 0 local matched = 0
for entityId, firstComponent in newWorld:query(A2, A4, A6, A8) do for entityId, firstComponent in newWorld:query(A1, A4, A6, A8) do
matched += 1 matched += 1
end end
end, end,
ECR = function() ECR = function()
local matched = 0 local matched = 0
for entityId, firstComponent in registry2:view(B2, B4, B6, B8) do for entityId, firstComponent in registry2:view(B1, B4, B6, B8) do
matched += 1 matched += 1
end end
end, end,
Jecs = function() Jecs = function()
local matched = 0 local matched = 0
for entityId, firstComponent in ecs:query(D2, D4, D6, D8) do for entityId, firstComponent in ecs:query(D1, D4, D6, D8) do
matched += 1 matched += 1
end end

33
lib/init.lua
View file

@ -361,8 +361,7 @@ local function getSmallestMap(componentIndex, components)
return s.sparse return s.sparse
end end
function World.query(world: World, ...: i53): (() -> (number, ...any)) | () -> () function World.query(world: World, ...: i53): any
local compatibleArchetypes = {} local compatibleArchetypes = {}
local components = { ... } local components = { ... }
local archetypes = world.archetypes local archetypes = world.archetypes
@ -400,12 +399,35 @@ function World.query(world: World, ...: i53): (() -> (number, ...any)) | () -> (
end end
local lastArchetype, compatibleArchetype = next(compatibleArchetypes) local lastArchetype, compatibleArchetype = next(compatibleArchetypes)
if not compatibleArchetype then if not lastArchetype then
return noop() return noop()
end end
local lastRow local preparedQuery = {}
preparedQuery.__index = preparedQuery
function preparedQuery:without(...)
local components = { ... }
for i, component in components do
components[i] = #component
end
for i = #compatibleArchetypes, 1, - 1 do
local archetype = compatibleArchetypes[i].archetype
local shouldRemove = false
for _, componentId in components do
if archetype.records[componentId] then
shouldRemove = true
break
end
end
if shouldRemove then
table.remove(compatibleArchetypes, i)
end
end
end
local lastRow
function preparedQuery:__iter()
return function() return function()
local archetype = compatibleArchetype.archetype local archetype = compatibleArchetype.archetype
local indices = compatibleArchetype.indices local indices = compatibleArchetype.indices
@ -480,6 +502,9 @@ function World.query(world: World, ...: i53): (() -> (number, ...any)) | () -> (
return entityId, unpack(queryOutput, 1, queryLength) return entityId, unpack(queryOutput, 1, queryLength)
end end
end
return setmetatable({}, preparedQuery)
end end
function World.component(world: World) function World.component(world: World)