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

Removed redundant guard (#157)

Browse source
This commit is contained in:
metrowaii 2024-11-14 21:29:13 -08:00 committed by GitHub
parent a3ff4e3fa0
commit 03389e5189
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/init.luau
View file

@ -173,9 +173,6 @@ end
local function entity_index_try_get_any(entity_index: EntityIndex, entity: number): Record? local function entity_index_try_get_any(entity_index: EntityIndex, entity: number): Record?
local r = entity_index.sparse_array[ECS_ENTITY_T_LO(entity)] local r = entity_index.sparse_array[ECS_ENTITY_T_LO(entity)]
if not r then
return nil
end
if not r or r.dense == 0 then if not r or r.dense == 0 then
return nil return nil

24
test/gen.luau
View file

@ -49,13 +49,12 @@ type EntityIndex = {
sparse_array: Map<i53, Record>, sparse_array: Map<i53, Record>,
sparse_count: number, sparse_count: number,
alive_count: number, alive_count: number,
max_id: number max_id: number,
} }
local ECS_PAIR_FLAG = 0x8
local ECS_PAIR_FLAG = 0x8 local ECS_ID_FLAGS_MASK = 0x10
local ECS_ID_FLAGS_MASK = 0x10 local ECS_ENTITY_MASK = bit32.lshift(1, 24)
local ECS_ENTITY_MASK = bit32.lshift(1, 24)
local ECS_GENERATION_MASK = bit32.lshift(1, 16) local ECS_GENERATION_MASK = bit32.lshift(1, 16)
-- HIGH 24 bits LOW 24 bits -- HIGH 24 bits LOW 24 bits
@ -81,12 +80,8 @@ local function ECS_ENTITY_T_LO(e: i53): i24
return if e > ECS_ENTITY_MASK then (e // ECS_ID_FLAGS_MASK) // ECS_ENTITY_MASK else e return if e > ECS_ENTITY_MASK then (e // ECS_ID_FLAGS_MASK) // ECS_ENTITY_MASK else e
end end
local function entity_index_try_get_any(entity_index: EntityIndex, entity: number): Record? local function entity_index_try_get_any(entity_index: EntityIndex, entity: number): Record?
local r = entity_index.sparse_array[ECS_ENTITY_T_LO(entity)] local r = entity_index.sparse_array[ECS_ENTITY_T_LO(entity)]
if not r then
return nil
end
if not r or r.dense == 0 then if not r or r.dense == 0 then
return nil return nil
@ -109,9 +104,7 @@ local function entity_index_try_get(entity_index: EntityIndex, entity: number):
return r return r
end end
local function entity_index_get_alive(entity_index: EntityIndex, local function entity_index_get_alive(entity_index: EntityIndex, entity: number): number
entity: number): number
local r = entity_index_try_get_any(entity_index, entity) local r = entity_index_try_get_any(entity_index, entity)
if r then if r then
return entity_index.dense_array[r.dense] return entity_index.dense_array[r.dense]
@ -130,8 +123,7 @@ local function entity_index_remove(entity_index: EntityIndex, entity: number)
entity_index.alive_count -= 1 entity_index.alive_count -= 1
local last_alive_entity = dense_array[last_entity_alive_at_index] local last_alive_entity = dense_array[last_entity_alive_at_index]
local r_swap = entity_index_try_get_any( local r_swap = entity_index_try_get_any(entity_index, last_alive_entity) :: Record
entity_index, last_alive_entity) :: Record
r_swap.dense = index_of_deleted_entity r_swap.dense = index_of_deleted_entity
r.archetype = nil :: any r.archetype = nil :: any
r.row = nil :: any r.row = nil :: any
@ -155,7 +147,7 @@ local function entity_index_new_id(entity_index: EntityIndex): i53
dense_array[entity_index.alive_count] = id dense_array[entity_index.alive_count] = id
entity_index.sparse_array[id] = { entity_index.sparse_array[id] = {
dense = entity_index.alive_count dense = entity_index.alive_count,
} :: Record } :: Record
return id return id
@ -170,7 +162,7 @@ local eidx = {
max_id = 0, max_id = 0,
sparse_array = {} :: { Record }, sparse_array = {} :: { Record },
sparse_count = 0, sparse_count = 0,
dense_array = {} :: { i53 } dense_array = {} :: { i53 },
} }
local e1v0 = entity_index_new_id(eidx, "e1v0") local e1v0 = entity_index_new_id(eidx, "e1v0")
local e2v0 = entity_index_new_id(eidx, "e2v0") local e2v0 = entity_index_new_id(eidx, "e2v0")