mirror of
https://github.com/Ukendio/jecs.git
synced 2025-04-24 17:10:03 +00:00
Fix type errors
This commit is contained in:
Ukendio
parent
1c8a4967e3
commit
fad88419a3
1 changed files with 91 additions and 100 deletions
147
jecs.luau
147
jecs.luau
|
|
@ -89,8 +89,8 @@ local EcsOnDeleteTarget = HI_COMPONENT_ID + 8
|
|||
local EcsDelete = HI_COMPONENT_ID + 9
|
||||
local EcsRemove = HI_COMPONENT_ID + 10
|
||||
local EcsName = HI_COMPONENT_ID + 11
|
||||
local EcsArchetypeCreate = HI_COMPONENT_ID + 12
|
||||
local EcsArchetypeDelete = HI_COMPONENT_ID + 13
|
||||
local EcsOnArchetypeCreate = HI_COMPONENT_ID + 12
|
||||
local EcsOnArchetypeDelete = HI_COMPONENT_ID + 13
|
||||
local EcsRest = HI_COMPONENT_ID + 14
|
||||
|
||||
local ECS_PAIR_FLAG = 0x8
|
||||
|
|
@ -611,6 +611,7 @@ local function archetype_create(world: World, id_types: { i24 }, ty, prev: i53?)
|
|||
local idr_t = id_record_ensure(world, t)
|
||||
archetype_append_to_records(idr_t, archetype_id, records, t, i)
|
||||
end
|
||||
|
||||
if bit32.band(idr.flags, ECS_ID_IS_TAG) == 0 then
|
||||
columns[i] = {}
|
||||
else
|
||||
|
|
@ -619,7 +620,7 @@ local function archetype_create(world: World, id_types: { i24 }, ty, prev: i53?)
|
|||
end
|
||||
|
||||
for _, id in id_types do
|
||||
local observer_list = find_observers(world, EcsArchetypeCreate, id)
|
||||
local observer_list = find_observers(world, EcsOnArchetypeCreate, id)
|
||||
if not observer_list then
|
||||
continue
|
||||
end
|
||||
|
|
@ -1052,7 +1053,7 @@ local function archetype_destroy(world: World, archetype: Archetype)
|
|||
local records = archetype.records
|
||||
|
||||
for id in records do
|
||||
local observer_list = find_observers(world, EcsArchetypeDelete, id)
|
||||
local observer_list = find_observers(world, EcsOnArchetypeDelete, id)
|
||||
if not observer_list then
|
||||
continue
|
||||
end
|
||||
|
|
@ -1457,7 +1458,6 @@ local function query_iter_init(query: QueryInner): () -> (number, ...any)
|
|||
return entityId, a[row], b[row], c[row], d[row], e[row], f[row], g[row], h[row]
|
||||
end
|
||||
|
||||
local records = archetype.records
|
||||
for j, id in ids do
|
||||
queryOutput[j] = columns[records[id].column][row]
|
||||
end
|
||||
|
|
@ -1553,10 +1553,10 @@ local function query_cached(query: QueryInner)
|
|||
-- because the event will be emitted for all components of that Archetype.
|
||||
local first = query.ids[1]
|
||||
local observerable = world.observerable
|
||||
local on_create_action = observerable[EcsArchetypeCreate]
|
||||
local on_create_action = observerable[EcsOnArchetypeCreate]
|
||||
if not on_create_action then
|
||||
on_create_action = {}
|
||||
observerable[EcsArchetypeCreate] = on_create_action
|
||||
observerable[EcsOnArchetypeCreate] = on_create_action
|
||||
end
|
||||
local query_cache_on_create = on_create_action[first]
|
||||
if not query_cache_on_create then
|
||||
|
|
@ -1564,10 +1564,10 @@ local function query_cached(query: QueryInner)
|
|||
on_create_action[first] = query_cache_on_create
|
||||
end
|
||||
|
||||
local on_delete_action = observerable[EcsArchetypeDelete]
|
||||
local on_delete_action = observerable[EcsOnArchetypeDelete]
|
||||
if not on_delete_action then
|
||||
on_delete_action = {}
|
||||
observerable[EcsArchetypeDelete] = on_delete_action
|
||||
observerable[EcsOnArchetypeDelete] = on_delete_action
|
||||
end
|
||||
local query_cache_on_delete = on_delete_action[first]
|
||||
if not query_cache_on_delete then
|
||||
|
|
@ -1609,11 +1609,70 @@ local function query_cached(query: QueryInner)
|
|||
|
||||
local world_query_iter_next
|
||||
local columns: { Column }
|
||||
local entities: { i53 }
|
||||
local entities: { number }
|
||||
local i: number
|
||||
local archetype: Archetype
|
||||
local records: { ArchetypeRecord }
|
||||
|
||||
local function cached_query_iter()
|
||||
lastArchetype = 1
|
||||
archetype = compatible_archetypes[lastArchetype]
|
||||
if not archetype then
|
||||
return NOOP
|
||||
end
|
||||
entities = archetype.entities
|
||||
i = #entities
|
||||
records = archetype.records
|
||||
columns = archetype.columns
|
||||
if not B then
|
||||
a = columns[records[A].column]
|
||||
elseif not C then
|
||||
a = columns[records[A].column]
|
||||
b = columns[records[B].column]
|
||||
elseif not D then
|
||||
a = columns[records[A].column]
|
||||
b = columns[records[B].column]
|
||||
c = columns[records[C].column]
|
||||
elseif not E then
|
||||
a = columns[records[A].column]
|
||||
b = columns[records[B].column]
|
||||
c = columns[records[C].column]
|
||||
d = columns[records[D].column]
|
||||
elseif not F then
|
||||
a = columns[records[A].column]
|
||||
b = columns[records[B].column]
|
||||
c = columns[records[C].column]
|
||||
d = columns[records[D].column]
|
||||
e = columns[records[E].column]
|
||||
elseif not G then
|
||||
a = columns[records[A].column]
|
||||
b = columns[records[B].column]
|
||||
c = columns[records[C].column]
|
||||
d = columns[records[D].column]
|
||||
e = columns[records[E].column]
|
||||
f = columns[records[F].column]
|
||||
elseif not H then
|
||||
a = columns[records[A].column]
|
||||
b = columns[records[B].column]
|
||||
c = columns[records[C].column]
|
||||
d = columns[records[D].column]
|
||||
e = columns[records[E].column]
|
||||
f = columns[records[F].column]
|
||||
g = columns[records[G].column]
|
||||
elseif not I then
|
||||
a = columns[records[A].column]
|
||||
b = columns[records[B].column]
|
||||
c = columns[records[C].column]
|
||||
d = columns[records[D].column]
|
||||
e = columns[records[E].column]
|
||||
f = columns[records[F].column]
|
||||
g = columns[records[G].column]
|
||||
h = columns[records[H].column]
|
||||
end
|
||||
|
||||
return world_query_iter_next
|
||||
end
|
||||
|
||||
if not B then
|
||||
function world_query_iter_next(): any
|
||||
local entityId = entities[i]
|
||||
|
|
@ -1775,7 +1834,6 @@ local function query_cached(query: QueryInner)
|
|||
return entityId, a[row], b[row], c[row], d[row], e[row], f[row], g[row], h[row]
|
||||
end
|
||||
|
||||
local records = archetype.records
|
||||
for j, id in ids do
|
||||
queryOutput[j] = columns[records[id].column][row]
|
||||
end
|
||||
|
|
@ -1784,65 +1842,6 @@ local function query_cached(query: QueryInner)
|
|||
end
|
||||
end
|
||||
|
||||
local function cached_query_iter()
|
||||
lastArchetype = 1
|
||||
archetype = compatible_archetypes[lastArchetype]
|
||||
if not archetype then
|
||||
return NOOP
|
||||
end
|
||||
entities = archetype.entities
|
||||
i = #entities
|
||||
records = archetype.records
|
||||
columns = archetype.columns
|
||||
if not B then
|
||||
a = columns[records[A].column]
|
||||
elseif not C then
|
||||
a = columns[records[A].column]
|
||||
b = columns[records[B].column]
|
||||
elseif not D then
|
||||
a = columns[records[A].column]
|
||||
b = columns[records[B].column]
|
||||
c = columns[records[C].column]
|
||||
elseif not E then
|
||||
a = columns[records[A].column]
|
||||
b = columns[records[B].column]
|
||||
c = columns[records[C].column]
|
||||
d = columns[records[D].column]
|
||||
elseif not F then
|
||||
a = columns[records[A].column]
|
||||
b = columns[records[B].column]
|
||||
c = columns[records[C].column]
|
||||
d = columns[records[D].column]
|
||||
e = columns[records[E].column]
|
||||
elseif not G then
|
||||
a = columns[records[A].column]
|
||||
b = columns[records[B].column]
|
||||
c = columns[records[C].column]
|
||||
d = columns[records[D].column]
|
||||
e = columns[records[E].column]
|
||||
f = columns[records[F].column]
|
||||
elseif not H then
|
||||
a = columns[records[A].column]
|
||||
b = columns[records[B].column]
|
||||
c = columns[records[C].column]
|
||||
d = columns[records[D].column]
|
||||
e = columns[records[E].column]
|
||||
f = columns[records[F].column]
|
||||
g = columns[records[G].column]
|
||||
elseif not I then
|
||||
a = columns[records[A].column]
|
||||
b = columns[records[B].column]
|
||||
c = columns[records[C].column]
|
||||
d = columns[records[D].column]
|
||||
e = columns[records[E].column]
|
||||
f = columns[records[F].column]
|
||||
g = columns[records[G].column]
|
||||
h = columns[records[H].column]
|
||||
end
|
||||
|
||||
return world_query_iter_next
|
||||
end
|
||||
|
||||
local cached_query = query :: any
|
||||
cached_query.archetypes = query_archetypes
|
||||
cached_query.__iter = cached_query_iter
|
||||
|
|
@ -2198,14 +2197,6 @@ type Observer = {
|
|||
query: QueryInner,
|
||||
}
|
||||
|
||||
type function ecs_partial_t(ty)
|
||||
local output = types.newtable()
|
||||
for k, v in ty:properties() do
|
||||
output:setproperty(k, types.unionof(v.write, types.singleton(nil)))
|
||||
end
|
||||
return output
|
||||
end
|
||||
|
||||
export type World = {
|
||||
archetypeIndex: { [string]: Archetype },
|
||||
archetypes: Archetypes,
|
||||
|
|
|
|||
Loading…
Reference in a new issue