Sovereignty/jecs
1
0
Fork 0
mirror of https://github.com/Ukendio/jecs.git synced 2025-11-03 18:39:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add .column

Browse source
This commit is contained in:
Ukendio 2024-08-01 02:16:09 +02:00
parent 7476952f89
commit 4a8250af4f
1 changed files with 104 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

211
src/init.luau
View file

@ -24,7 +24,7 @@ type Archetype = {
type: string | number, type: string | number,
entities: { number }, entities: { number },
columns: { Column }, columns: { Column },
records: { [number]: number }, records: { ArchetypeRecord },
} }
type Record = { type Record = {
archetype: Archetype, archetype: Archetype,
@ -35,17 +35,12 @@ type Record = {
type EntityIndex = { dense: { [i24]: i53 }, sparse: { [i53]: Record } } type EntityIndex = { dense: { [i24]: i53 }, sparse: { [i53]: Record } }
type ArchetypeRecord = number type ArchetypeRecord = {
--[[
TODO:
{
index: number, index: number,
count: number, count: number,
column: number column: number
} }
]]
type ArchetypeMap = { type ArchetypeMap = {
cache: { ArchetypeRecord }, cache: { ArchetypeRecord },
first: ArchetypeMap, first: ArchetypeMap,
@ -191,17 +186,17 @@ local function archetype_move(entityIndex: EntityIndex, to: Archetype,
local sourceEntities = from.entities local sourceEntities = from.entities
local destinationEntities = to.entities local destinationEntities = to.entities
local destinationColumns = to.columns local destinationColumns = to.columns
local tr = to.records local records = to.records
local types = from.types local types = from.types
for i, column in columns do for i, column in columns do
-- Retrieves the new column index from the source archetype's record from each component -- Retrieves the new column index from the source archetype's record from each component
-- We have to do this because the columns are tightly packed and indexes may not correspond to each other. -- We have to do this because the columns are tightly packed and indexes may not correspond to each other.
local targetColumn = destinationColumns[tr[types[i]]] local tr = records[types[i]]
-- Sometimes target column may not exist, e.g. when you remove a component. -- Sometimes target column may not exist, e.g. when you remove a component.
if targetColumn then if tr then
targetColumn[destinationRow] = column[sourceRow] destinationColumns[tr.column][destinationRow] = column[sourceRow]
end end
-- If the entity is the last row in the archetype then swapping it would be meaningless. -- If the entity is the last row in the archetype then swapping it would be meaningless.
local last = #column local last = #column
@ -293,12 +288,13 @@ local function archetype_create(world: any, types: { i24 }, prev: Archetype?): A
local columns = (table.create(length) :: any) :: { Column } local columns = (table.create(length) :: any) :: { Column }
local componentIndex = world.componentIndex local componentIndex = world.componentIndex
local records = {} local records: { ArchetypeRecord } = {}
for i, componentId in types do for i, componentId in types do
local tr = { column = i, count = 1, index = 1 }
local idr = id_record_ensure(componentIndex, componentId) local idr = id_record_ensure(componentIndex, componentId)
idr.cache[id] = i idr.cache[id] = tr
idr.size += 1 idr.size += 1
records[componentId] = i records[componentId] = tr
if ECS_IS_PAIR(componentId) then if ECS_IS_PAIR(componentId) then
local relation = ecs_pair_relation(world.entityIndex, componentId) local relation = ecs_pair_relation(world.entityIndex, componentId)
local object = ecs_pair_object(world.entityIndex, componentId) local object = ecs_pair_object(world.entityIndex, componentId)
@ -309,11 +305,11 @@ local function archetype_create(world: any, types: { i24 }, prev: Archetype?): A
local o = ECS_PAIR(EcsWildcard, object) local o = ECS_PAIR(EcsWildcard, object)
local idr_o = id_record_ensure(componentIndex, o) local idr_o = id_record_ensure(componentIndex, o)
records[r] = i records[r] = tr
records[o] = i records[o] = tr
idr_r.cache[id] = i idr_r.cache[id] = tr
idr_o.cache[id] = i idr_o.cache[id] = tr
idr_r.size += 1 idr_r.size += 1
idr_o.size += 1 idr_o.size += 1
@ -375,7 +371,7 @@ local function world_target(world: World, entity: i53, relation: i24--[[, nth: n
return nil return nil
end end
return ecs_pair_object(entityIndex, archetype.types[archetypeRecord]) return ecs_pair_object(entityIndex, archetype.types[archetypeRecord.column])
end end
local function world_parent(world: World, entity: i53) local function world_parent(world: World, entity: i53)
@ -478,7 +474,7 @@ local function world_set(world: World, entityId: i53, componentId: i53, data: un
-- If the archetypes are the same it can avoid moving the entity -- If the archetypes are the same it can avoid moving the entity
-- and just set the data directly. -- and just set the data directly.
local archetypeRecord = to.records[componentId] local archetypeRecord = to.records[componentId]
from.columns[archetypeRecord][record.row] = data from.columns[archetypeRecord.column][record.row] = data
-- Should fire an OnSet event here. -- Should fire an OnSet event here.
return return
end end
@ -494,7 +490,7 @@ local function world_set(world: World, entityId: i53, componentId: i53, data: un
end end
local archetypeRecord = to.records[componentId] local archetypeRecord = to.records[componentId]
to.columns[archetypeRecord][record.row] = data to.columns[archetypeRecord.column][record.row] = data
end end
local function world_component(world: World): i53 local function world_component(world: World): i53
@ -630,14 +626,14 @@ end
local world_get: (world: World, entityId: i53, a: i53, b: i53?, c: i53?, d: i53?, e: i53?) -> (...any) local world_get: (world: World, entityId: i53, a: i53, b: i53?, c: i53?, d: i53?, e: i53?) -> (...any)
do do
-- Keeping the function as small as possible to enable inlining -- Keeping the function as small as possible to enable inlining
local function fetch(id: i24, records, columns, row): any local function fetch(id: i24, records: { ArchetypeRecord }, columns, row): any
local tr = records[id] local tr = records[id]
if not tr then if not tr then
return nil return nil
end end
return columns[tr][row] return columns[tr.column][row]
end end
function world_get(world: World, entityId: i53, a: i53, b: i53?, c: i53?, d: i53?, e: i53?): ...any function world_get(world: World, entityId: i53, a: i53, b: i53?, c: i53?, d: i53?, e: i53?): ...any
@ -766,7 +762,6 @@ do
end end
queryOutput = {} queryOutput = {}
queryLength = #ids
entities = archetype.entities entities = archetype.entities
i = #entities i = #entities
@ -774,48 +769,48 @@ do
local records = archetype.records local records = archetype.records
if not B then if not B then
a = columns[records[A]] a = columns[records[A].column]
elseif not C then elseif not C then
a = columns[records[A]] a = columns[records[A].column]
b = columns[records[B]] b = columns[records[B].column]
elseif not D then elseif not D then
a = columns[records[A]] a = columns[records[A].column]
b = columns[records[B]] b = columns[records[B].column]
c = columns[records[C]] c = columns[records[C].column]
elseif not E then elseif not E then
a = columns[records[A]] a = columns[records[A].column]
b = columns[records[B]] b = columns[records[B].column]
c = columns[records[C]] c = columns[records[C].column]
d = columns[records[D]] d = columns[records[D].column]
elseif not F then elseif not F then
a = columns[records[A]] a = columns[records[A].column]
b = columns[records[B]] b = columns[records[B].column]
c = columns[records[C]] c = columns[records[C].column]
d = columns[records[D]] d = columns[records[D].column]
e = columns[records[E]] e = columns[records[E].column]
elseif not G then elseif not G then
a = columns[records[A]] a = columns[records[A].column]
b = columns[records[B]] b = columns[records[B].column]
c = columns[records[C]] c = columns[records[C].column]
d = columns[records[D]] d = columns[records[D].column]
e = columns[records[E]] e = columns[records[E].column]
f = columns[records[F]] f = columns[records[F].column]
elseif not H then elseif not H then
a = columns[records[A]] a = columns[records[A].column]
b = columns[records[B]] b = columns[records[B].column]
c = columns[records[C]] c = columns[records[C].column]
d = columns[records[D]] d = columns[records[D].column]
e = columns[records[E]] e = columns[records[E].column]
f = columns[records[F]] f = columns[records[F].column]
g = columns[records[G]] g = columns[records[G].column]
elseif H then elseif H then
a = columns[records[A]] a = columns[records[A].column]
b = columns[records[B]] b = columns[records[B].column]
c = columns[records[D]] c = columns[records[D].column]
e = columns[records[E]] e = columns[records[E].column]
f = columns[records[F]] f = columns[records[F].column]
g = columns[records[G]] g = columns[records[G].column]
h = columns[records[H]] h = columns[records[H].column]
end end
end end
@ -840,7 +835,7 @@ do
entityId = entities[i] entityId = entities[i]
columns = archetype.columns columns = archetype.columns
local records = archetype.records local records = archetype.records
a = columns[records[A]] a = columns[records[A].column]
end end
local row = i local row = i
@ -866,8 +861,8 @@ do
entityId = entities[i] entityId = entities[i]
columns = archetype.columns columns = archetype.columns
local records = archetype.records local records = archetype.records
a = columns[records[A]] a = columns[records[A].column]
b = columns[records[B]] b = columns[records[B].column]
end end
local row = i local row = i
@ -893,9 +888,9 @@ do
entityId = entities[i] entityId = entities[i]
columns = archetype.columns columns = archetype.columns
local records = archetype.records local records = archetype.records
a = columns[records[A]] a = columns[records[A].column]
b = columns[records[B]] b = columns[records[B].column]
c = columns[records[C]] c = columns[records[C].column]
end end
local row = i local row = i
@ -921,16 +916,15 @@ do
entityId = entities[i] entityId = entities[i]
columns = archetype.columns columns = archetype.columns
local records = archetype.records local records = archetype.records
a = columns[records[A]] a = columns[records[A].column]
b = columns[records[B]] b = columns[records[B].column]
c = columns[records[C]] c = columns[records[C].column]
d = columns[records[D]] d = columns[records[D].column]
end end
local row = i local row = i
i-=1 i-=1
return entityId, a[row], b[row], c[row], d[row] return entityId, a[row], b[row], c[row], d[row]
end end
else else
@ -953,34 +947,35 @@ do
local records = archetype.records local records = archetype.records
if not F then if not F then
a = columns[records[A]] a = columns[records[A].column]
b = columns[records[B]] b = columns[records[B].column]
c = columns[records[C]] c = columns[records[C].column]
d = columns[records[D]] d = columns[records[D].column]
e = columns[records[E]] e = columns[records[E].column]
elseif not G then elseif not G then
a = columns[records[A]] a = columns[records[A].column]
b = columns[records[B]] b = columns[records[B].column]
c = columns[records[C]] c = columns[records[C].column]
d = columns[records[D]] d = columns[records[D].column]
e = columns[records[E]] e = columns[records[E].column]
f = columns[records[F]] f = columns[records[F].column]
elseif not H then elseif not H then
a = columns[records[A]] a = columns[records[A].column]
b = columns[records[B]] b = columns[records[B].column]
c = columns[records[C]] c = columns[records[C].column]
d = columns[records[D]] d = columns[records[D].column]
e = columns[records[E]] e = columns[records[E].column]
f = columns[records[F]] f = columns[records[F].column]
g = columns[records[G]] g = columns[records[G].column]
elseif H then elseif not I then
a = columns[records[A]] a = columns[records[A].column]
b = columns[records[B]] b = columns[records[B].column]
c = columns[records[D]] c = columns[records[C].column]
e = columns[records[E]] d = columns[records[D].column]
f = columns[records[F]] e = columns[records[E].column]
g = columns[records[G]] f = columns[records[F].column]
h = columns[records[H]] g = columns[records[G].column]
h = columns[records[H].column]
end end
end end
@ -999,7 +994,7 @@ do
local field = archetype.records local field = archetype.records
for j, id in ids do for j, id in ids do
queryOutput[j] = columns[field[id]][row] queryOutput[j] = columns[field[id].column][row]
end end
return entityId, unpack(queryOutput) return entityId, unpack(queryOutput)
@ -1047,33 +1042,33 @@ do
local tr = archetype.records local tr = archetype.records
for row in archetype.entities do for row in archetype.entities do
if not B then if not B then
local va = columns[tr[A]] local va = columns[tr[A].column]
local pa = fn(va[row]) local pa = fn(va[row])
va[row] = pa va[row] = pa
elseif not C then elseif not C then
local va = columns[tr[A]] local va = columns[tr[A].column]
local vb = columns[tr[B]] local vb = columns[tr[B].column]
va[row], vb[row] = fn(va[row], vb[row]) va[row], vb[row] = fn(va[row], vb[row])
elseif not D then elseif not D then
local va = columns[tr[A]] local va = columns[tr[A].column]
local vb = columns[tr[B]] local vb = columns[tr[B].column]
local vc = columns[tr[C]] local vc = columns[tr[C].column]
va[row], vb[row], vc[row] = fn(va[row], vb[row], vc[row]) va[row], vb[row], vc[row] = fn(va[row], vb[row], vc[row])
elseif not E then elseif not E then
local va = columns[tr[A]] local va = columns[tr[A].column]
local vb = columns[tr[B]] local vb = columns[tr[B].column]
local vc = columns[tr[C]] local vc = columns[tr[C].column]
local vd = columns[tr[D]] local vd = columns[tr[D].column]
va[row], vb[row], vc[row], vd[row] = fn( va[row], vb[row], vc[row], vd[row] = fn(
va[row], vb[row], vc[row], vd[row]) va[row], vb[row], vc[row], vd[row])
else else
local field = archetype.records local field = archetype.records
for j, id in ids do for j, id in ids do
queryOutput[j] = columns[field[id]][row] queryOutput[j] = columns[field[id].column][row]
end end
world_query_replace_values(row, columns, world_query_replace_values(row, columns,
fn(unpack(queryOutput))) fn(unpack(queryOutput)))