Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed redundant guard #157

Merged
merged 1 commit into from
Nov 15, 2024
Merged

Removed redundant guard #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/init.luau
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,6 @@ end

local function entity_index_try_get_any(entity_index: EntityIndex, entity: number): Record?
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
return nil
Expand Down
24 changes: 8 additions & 16 deletions test/gen.luau
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,12 @@ type EntityIndex = {
sparse_array: Map<i53, Record>,
sparse_count: number,
alive_count: number,
max_id: number
max_id: number,
}


local ECS_PAIR_FLAG = 0x8
local ECS_ID_FLAGS_MASK = 0x10
local ECS_ENTITY_MASK = bit32.lshift(1, 24)
local ECS_PAIR_FLAG = 0x8
local ECS_ID_FLAGS_MASK = 0x10
local ECS_ENTITY_MASK = bit32.lshift(1, 24)
local ECS_GENERATION_MASK = bit32.lshift(1, 16)

-- HIGH 24 bits LOW 24 bits
Expand All @@ -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
end


local function entity_index_try_get_any(entity_index: EntityIndex, entity: number): Record?
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
return nil
Expand All @@ -109,9 +104,7 @@ local function entity_index_try_get(entity_index: EntityIndex, entity: number):
return r
end

local function entity_index_get_alive(entity_index: EntityIndex,
entity: number): number

local function entity_index_get_alive(entity_index: EntityIndex, entity: number): number
local r = entity_index_try_get_any(entity_index, entity)
if r then
return entity_index.dense_array[r.dense]
Expand All @@ -130,8 +123,7 @@ local function entity_index_remove(entity_index: EntityIndex, entity: number)
entity_index.alive_count -= 1

local last_alive_entity = dense_array[last_entity_alive_at_index]
local r_swap = entity_index_try_get_any(
entity_index, last_alive_entity) :: Record
local r_swap = entity_index_try_get_any(entity_index, last_alive_entity) :: Record
r_swap.dense = index_of_deleted_entity
r.archetype = nil :: any
r.row = nil :: any
Expand All @@ -155,7 +147,7 @@ local function entity_index_new_id(entity_index: EntityIndex): i53

dense_array[entity_index.alive_count] = id
entity_index.sparse_array[id] = {
dense = entity_index.alive_count
dense = entity_index.alive_count,
} :: Record

return id
Expand All @@ -170,7 +162,7 @@ local eidx = {
max_id = 0,
sparse_array = {} :: { Record },
sparse_count = 0,
dense_array = {} :: { i53 }
dense_array = {} :: { i53 },
}
local e1v0 = entity_index_new_id(eidx, "e1v0")
local e2v0 = entity_index_new_id(eidx, "e2v0")
Expand Down