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

Short circuit return for non zero generation entities

Browse source
This commit is contained in:
Ukendio 2025-04-27 04:13:49 +02:00
parent d0af80577b
commit 6922019ed9
2 changed files with 45 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
jecs.luau
View file

@ -772,39 +772,27 @@ local function world_entity(world: ecs_world_t, entity: i53?): i53
local r = sparse_array[index] local r = sparse_array[index]
if r then if r then
local dense = r.dense local dense = r.dense
if not dense or dense == 0 then if dense and r.dense ~= 0 then
dense = index
end
local any = dense_array[dense] local any = dense_array[dense]
if any == entity then if any ~= entity then
if alive_count > dense then if dense > alive_count then
r.dense = dense
return entity
end
local e_swap = dense_array[alive_count]
local r_swap = sparse_array[alive_count]
r_swap.dense = dense
r.dense = alive_count
dense_array[alive_count] = entity
dense_array[dense] = e_swap
return entity
end
-- assert(any ~= 0) should never happen
local e_swap = dense_array[alive_count]
local r_swap = sparse_array[alive_count]
if dense <= alive_count then
alive_count += 1 alive_count += 1
entity_index.alive_count = alive_count entity_index.alive_count = alive_count
end local e_swap = dense_array[alive_count]
local r_swap = sparse_array[alive_count]
r_swap.dense = dense r_swap.dense = dense
r.dense = alive_count r.dense = alive_count
dense_array[alive_count] = any dense_array[alive_count] = any
dense_array[dense] = e_swap dense_array[dense] = e_swap
end
return any return any
end
return entity
else
r.dense = index
dense_array[index] = entity
return entity
end
else else
for i = max_id + 1, index do for i = max_id + 1, index do
sparse_array[i] = { dense = i } :: ecs_record_t sparse_array[i] = { dense = i } :: ecs_record_t

41
test/tests.luau
View file

@ -659,6 +659,7 @@ end)
TEST("world:entity()", function() TEST("world:entity()", function()
do CASE "desired id" do CASE "desired id"
local world = jecs.world() local world = jecs.world()
world:range(400, 1000)
local id = world:entity() local id = world:entity()
local e = world:entity(id + 5) local e = world:entity(id + 5)
CHECK(e == id + 5) CHECK(e == id + 5)
@ -667,27 +668,39 @@ TEST("world:entity()", function()
CHECK(world:contains(e2)) CHECK(world:contains(e2))
-- world:print_entity_index() -- world:print_entity_index()
local e3 = world:entity(275) print("-----")
local e3 = world:entity(375)
world:entity(376)
print("-----")
CHECK(e3 == 275) print(e3)
CHECK(e3 == 375)
CHECK(world:contains(e3)) CHECK(world:contains(e3))
CHECK(e3 == world:entity(e3))
world:delete(e3) world:delete(e3)
local e3v1 = world:entity(275) print("-------call 1-------")
CHECK(not world:contains(275)) local e3v1 = world:entity(375)
CHECK(not world:contains(375))
CHECK(jecs.ECS_GENERATION(e3v1) == 1) CHECK(jecs.ECS_GENERATION(e3v1) == 1)
CHECK(jecs.ECS_ID(e3v1) == 275) CHECK(jecs.ECS_ID(e3v1) == 375)
CHECK(world:contains(e3v1)) CHECK(world:contains(e3v1))
-- world:print_entity_index() print("-------call 2-------")
world:entity(e3) world:entity(382)
world:delete(382)
world:entity(e3) world:entity(376)
world:entity(275) world:delete(e3v1)
print("--------------------")
print("-------call 3-------")
local e3v2 = world:entity(375)
CHECK(jecs.ECS_GENERATION(e3v2) == 2)
CHECK(jecs.ECS_ID(e3v2) == 375)
CHECK(not world:contains(e3v1))
CHECK(world:contains(e3v2))
print("----------------------")
print("-----call 4-------")
CHECK(world:entity(375) == e3v2)
print("------call 5")
end end
local N = 2^8 local N = 2^8