Sync to upstream Jecs 0.5.5-nightly.20250428T001101Z
This commit is contained in:
parent
5acca197e0
commit
209ec0c2bf
7 changed files with 22 additions and 34 deletions
|
@ -1,2 +1,2 @@
|
||||||
modified = ["jecs.luau"]
|
modified = ["jecs.luau"]
|
||||||
version = "0.5.5-nightly.20250427T001102Z"
|
version = "0.5.5-nightly.20250428T001101Z"
|
||||||
|
|
|
@ -772,38 +772,26 @@ 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 not dense or r.dense == 0 then
|
||||||
|
r.dense = index
|
||||||
dense = index
|
dense = index
|
||||||
end
|
end
|
||||||
|
|
||||||
local any = dense_array[dense]
|
local any = dense_array[dense]
|
||||||
if any == entity then
|
|
||||||
if alive_count > dense 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
|
if dense <= alive_count then
|
||||||
alive_count += 1
|
return any
|
||||||
entity_index.alive_count = alive_count
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local e_swap = dense_array[dense]
|
||||||
|
local r_swap = entity_index_try_get_any(entity_index, e_swap) :: ecs_record_t
|
||||||
|
alive_count += 1
|
||||||
|
entity_index.alive_count = 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[dense] = e_swap
|
dense_array[dense] = e_swap
|
||||||
|
dense_array[alive_count] = any
|
||||||
|
|
||||||
return any
|
return any
|
||||||
else
|
else
|
||||||
for i = max_id + 1, index do
|
for i = max_id + 1, index do
|
||||||
|
|
|
@ -3,7 +3,7 @@ includes = ["init.luau", "pesde.toml", "README.md", "CHANGELOG.md", "LICENSE", "
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
name = "marked/jecs_nightly"
|
name = "marked/jecs_nightly"
|
||||||
repository = "https://git.devmarked.win/marked/jecs-nightly"
|
repository = "https://git.devmarked.win/marked/jecs-nightly"
|
||||||
version = "0.5.5-nightly.20250427T001102Z"
|
version = "0.5.5-nightly.20250428T001101Z"
|
||||||
|
|
||||||
[indices]
|
[indices]
|
||||||
default = "https://github.com/pesde-pkg/index"
|
default = "https://github.com/pesde-pkg/index"
|
||||||
|
|
|
@ -3,7 +3,7 @@ includes = ["init.luau", "pesde.toml", "README.md", "CHANGELOG.md", "LICENSE", "
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
name = "marked/jecs_nightly"
|
name = "marked/jecs_nightly"
|
||||||
repository = "https://git.devmarked.win/marked/jecs-nightly"
|
repository = "https://git.devmarked.win/marked/jecs-nightly"
|
||||||
version = "0.5.5-nightly.20250427T001102Z"
|
version = "0.5.5-nightly.20250428T001101Z"
|
||||||
|
|
||||||
[indices]
|
[indices]
|
||||||
default = "https://github.com/pesde-pkg/index"
|
default = "https://github.com/pesde-pkg/index"
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
passed = true
|
passed = true
|
||||||
timestamp = "20250427T001104Z"
|
timestamp = "20250428T001103Z"
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
[38;1m7.2[0m [33;1mus[0m [38;1m 2[0m [33;1mkB[0m[38;1m│[0m [38;1mdelete children of entity[0m
|
[38;1m7.6[0m [33;1mus[0m [38;1m 2[0m [33;1mkB[0m[38;1m│[0m [38;1mdelete children of entity[0m
|
||||||
[38;1m9.2[0m [33;1mus[0m [38;1m 1[0m [33;1mkB[0m[38;1m│[0m [38;1mremove friends of entity[0m
|
[38;1m9.1[0m [33;1mus[0m [38;1m 1[0m [33;1mkB[0m[38;1m│[0m [38;1mremove friends of entity[0m
|
||||||
[38;1m349[0m [32;1mns[0m [38;1m 0[0m [32;1m B[0m[38;1m│[0m [38;1msimple deletion of entity[0m
|
[38;1m346[0m [32;1mns[0m [38;1m 0[0m [32;1m B[0m[38;1m│[0m [38;1msimple deletion of entity[0m
|
||||||
*created [32;1me1000[0m[33;1mv0[0m
|
|
||||||
[37;1mworld:add()[0m
|
[37;1mworld:add()[0m
|
||||||
[32;1mPASS[0m[38;1m│[0m [38;1midempotent[0m
|
[32;1mPASS[0m[38;1m│[0m [38;1midempotent[0m
|
||||||
[32;1mPASS[0m[38;1m│[0m [38;1marchetype move[0m
|
[32;1mPASS[0m[38;1m│[0m [38;1marchetype move[0m
|
||||||
|
@ -39,7 +38,8 @@
|
||||||
[32;1mPASS[0m[38;1m│[0m [38;1m[0m
|
[32;1mPASS[0m[38;1m│[0m [38;1m[0m
|
||||||
|
|
||||||
[37;1mworld:range()[0m
|
[37;1mworld:range()[0m
|
||||||
[32;1mPASS[0m[38;1m│[0m [38;1m[0m
|
[32;1mPASS[0m[38;1m│[0m [38;1munder range start[0m
|
||||||
|
[32;1mPASS[0m[38;1m│[0m [38;1mover range start[0m
|
||||||
|
|
||||||
[37;1mworld:entity()[0m
|
[37;1mworld:entity()[0m
|
||||||
[32;1mPASS[0m[38;1m│[0m [38;1mdesired id[0m
|
[32;1mPASS[0m[38;1m│[0m [38;1mdesired id[0m
|
||||||
|
@ -118,5 +118,5 @@
|
||||||
[32;1mPASS[0m[38;1m│[0m [38;1m#2[0m
|
[32;1mPASS[0m[38;1m│[0m [38;1m#2[0m
|
||||||
[32;1mPASS[0m[38;1m│[0m [38;1m#3[0m
|
[32;1mPASS[0m[38;1m│[0m [38;1m#3[0m
|
||||||
|
|
||||||
[38;1m72/72 test cases passed in 32.525 ms.[0m
|
[38;1m73/73 test cases passed in 33.504 ms.[0m
|
||||||
[32;1m0 fails[0m
|
[32;1m0 fails[0m
|
||||||
|
|
|
@ -5,4 +5,4 @@ license = "MIT"
|
||||||
name = "mark-marks/jecs-nightly"
|
name = "mark-marks/jecs-nightly"
|
||||||
realm = "shared"
|
realm = "shared"
|
||||||
registry = "https://github.com/UpliftGames/wally-index"
|
registry = "https://github.com/UpliftGames/wally-index"
|
||||||
version = "0.5.5-nightly.20250427T001102Z"
|
version = "0.5.5-nightly.20250428T001101Z"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue