From b14776aa3da6258f5e9a6a5607ac166924591c23 Mon Sep 17 00:00:00 2001 From: marked Date: Mon, 28 Apr 2025 02:11:21 +0200 Subject: [PATCH 1/2] Sync to released Jecs 0.5.5-nightly.20250428T001101Z (#47) Reviewed-on: https://git.devmarked.win/marked/jecs-nightly/pulls/47 --- jecs/build.txt | 2 +- jecs/jecs.luau | 34 +++++++++++----------------------- jecs/pesde-rbx.toml | 2 +- jecs/pesde.toml | 2 +- jecs/test.txt | 2 +- jecs/test_fulllog.txt | 12 ++++++------ jecs/wally.toml | 2 +- 7 files changed, 22 insertions(+), 34 deletions(-) diff --git a/jecs/build.txt b/jecs/build.txt index f754d8c..a110fe0 100644 --- a/jecs/build.txt +++ b/jecs/build.txt @@ -1,2 +1,2 @@ modified = ["jecs.luau"] -version = "0.5.5-nightly.20250427T001102Z" +version = "0.5.5-nightly.20250428T001101Z" diff --git a/jecs/jecs.luau b/jecs/jecs.luau index 7bfeb68..3a1352c 100644 --- a/jecs/jecs.luau +++ b/jecs/jecs.luau @@ -772,38 +772,26 @@ local function world_entity(world: ecs_world_t, entity: i53?): i53 local r = sparse_array[index] if r then local dense = r.dense - if not dense or dense == 0 then + + if not dense or r.dense == 0 then + r.dense = index dense = index end + 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 - alive_count += 1 - entity_index.alive_count = alive_count + return any 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.dense = alive_count - dense_array[alive_count] = any dense_array[dense] = e_swap + dense_array[alive_count] = any + return any else for i = max_id + 1, index do diff --git a/jecs/pesde-rbx.toml b/jecs/pesde-rbx.toml index 3b3b005..b59606a 100644 --- a/jecs/pesde-rbx.toml +++ b/jecs/pesde-rbx.toml @@ -3,7 +3,7 @@ includes = ["init.luau", "pesde.toml", "README.md", "CHANGELOG.md", "LICENSE", " license = "MIT" name = "marked/jecs_nightly" repository = "https://git.devmarked.win/marked/jecs-nightly" -version = "0.5.5-nightly.20250427T001102Z" +version = "0.5.5-nightly.20250428T001101Z" [indices] default = "https://github.com/pesde-pkg/index" diff --git a/jecs/pesde.toml b/jecs/pesde.toml index 6c79fa2..c559df4 100644 --- a/jecs/pesde.toml +++ b/jecs/pesde.toml @@ -3,7 +3,7 @@ includes = ["init.luau", "pesde.toml", "README.md", "CHANGELOG.md", "LICENSE", " license = "MIT" name = "marked/jecs_nightly" repository = "https://git.devmarked.win/marked/jecs-nightly" -version = "0.5.5-nightly.20250427T001102Z" +version = "0.5.5-nightly.20250428T001101Z" [indices] default = "https://github.com/pesde-pkg/index" diff --git a/jecs/test.txt b/jecs/test.txt index 05f27df..f69f5fd 100644 --- a/jecs/test.txt +++ b/jecs/test.txt @@ -1,2 +1,2 @@ passed = true -timestamp = "20250427T001104Z" +timestamp = "20250428T001103Z" diff --git a/jecs/test_fulllog.txt b/jecs/test_fulllog.txt index d10e2fa..78a29c1 100644 --- a/jecs/test_fulllog.txt +++ b/jecs/test_fulllog.txt @@ -1,7 +1,6 @@ -7.2 us  2 kB│ delete children of entity -9.2 us  1 kB│ remove friends of entity -349 ns  0  B│ simple deletion of entity -*created e1000v0 +7.6 us  2 kB│ delete children of entity +9.1 us  1 kB│ remove friends of entity +346 ns  0  B│ simple deletion of entity world:add() PASS│ idempotent PASS│ archetype move @@ -39,7 +38,8 @@ PASS│  world:range() -PASS│  +PASS│ under range start +PASS│ over range start world:entity() PASS│ desired id @@ -118,5 +118,5 @@ PASS│ #2 PASS│ #3 -72/72 test cases passed in 32.525 ms. +73/73 test cases passed in 33.504 ms. 0 fails diff --git a/jecs/wally.toml b/jecs/wally.toml index 2ebd701..7b234b2 100644 --- a/jecs/wally.toml +++ b/jecs/wally.toml @@ -5,4 +5,4 @@ license = "MIT" name = "mark-marks/jecs-nightly" realm = "shared" registry = "https://github.com/UpliftGames/wally-index" -version = "0.5.5-nightly.20250427T001102Z" +version = "0.5.5-nightly.20250428T001101Z" From 55c9eb7faf1e7f87fe69014b36f1d8659f089d12 Mon Sep 17 00:00:00 2001 From: forgejo-actions <+forgejo-actions@users.noreply.github.com> Date: Tue, 29 Apr 2025 00:11:18 +0000 Subject: [PATCH 2/2] Sync to upstream Jecs 0.5.5-nightly.20250429T001100Z --- jecs/build.txt | 2 +- jecs/jecs.luau | 4 ++-- jecs/pesde-rbx.toml | 2 +- jecs/pesde.toml | 2 +- jecs/test.txt | 2 +- jecs/test_fulllog.txt | 4 ++-- jecs/wally.toml | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jecs/build.txt b/jecs/build.txt index a110fe0..ff9399c 100644 --- a/jecs/build.txt +++ b/jecs/build.txt @@ -1,2 +1,2 @@ modified = ["jecs.luau"] -version = "0.5.5-nightly.20250428T001101Z" +version = "0.5.5-nightly.20250429T001100Z" diff --git a/jecs/jecs.luau b/jecs/jecs.luau index 3a1352c..3d61e96 100644 --- a/jecs/jecs.luau +++ b/jecs/jecs.luau @@ -2672,8 +2672,8 @@ return { ECS_META_RESET = ECS_META_RESET, IS_PAIR = (ECS_IS_PAIR :: any) :: (pair: Pair) -> boolean, - ECS_PAIR_FIRST = ECS_PAIR_FIRST, - ECS_PAIR_SECOND = ECS_PAIR_SECOND, + ECS_PAIR_FIRST = ECS_PAIR_FIRST :: (pair: Pair) -> Id

, + ECS_PAIR_SECOND = ECS_PAIR_SECOND :: (pair: Pair) -> Id, pair_first = (ecs_pair_first :: any) :: (world: World, pair: Pair) -> Id

, pair_second = (ecs_pair_second :: any) :: (world: World, pair: Pair) -> Id, entity_index_get_alive = entity_index_get_alive, diff --git a/jecs/pesde-rbx.toml b/jecs/pesde-rbx.toml index b59606a..aed318d 100644 --- a/jecs/pesde-rbx.toml +++ b/jecs/pesde-rbx.toml @@ -3,7 +3,7 @@ includes = ["init.luau", "pesde.toml", "README.md", "CHANGELOG.md", "LICENSE", " license = "MIT" name = "marked/jecs_nightly" repository = "https://git.devmarked.win/marked/jecs-nightly" -version = "0.5.5-nightly.20250428T001101Z" +version = "0.5.5-nightly.20250429T001100Z" [indices] default = "https://github.com/pesde-pkg/index" diff --git a/jecs/pesde.toml b/jecs/pesde.toml index c559df4..17546f9 100644 --- a/jecs/pesde.toml +++ b/jecs/pesde.toml @@ -3,7 +3,7 @@ includes = ["init.luau", "pesde.toml", "README.md", "CHANGELOG.md", "LICENSE", " license = "MIT" name = "marked/jecs_nightly" repository = "https://git.devmarked.win/marked/jecs-nightly" -version = "0.5.5-nightly.20250428T001101Z" +version = "0.5.5-nightly.20250429T001100Z" [indices] default = "https://github.com/pesde-pkg/index" diff --git a/jecs/test.txt b/jecs/test.txt index f69f5fd..ac1b296 100644 --- a/jecs/test.txt +++ b/jecs/test.txt @@ -1,2 +1,2 @@ passed = true -timestamp = "20250428T001103Z" +timestamp = "20250429T001102Z" diff --git a/jecs/test_fulllog.txt b/jecs/test_fulllog.txt index 78a29c1..f9eb29a 100644 --- a/jecs/test_fulllog.txt +++ b/jecs/test_fulllog.txt @@ -1,4 +1,4 @@ -7.6 us  2 kB│ delete children of entity +7.5 us  2 kB│ delete children of entity 9.1 us  1 kB│ remove friends of entity 346 ns  0  B│ simple deletion of entity world:add() @@ -118,5 +118,5 @@ PASS│ #2 PASS│ #3 -73/73 test cases passed in 33.504 ms. +73/73 test cases passed in 32.727 ms. 0 fails diff --git a/jecs/wally.toml b/jecs/wally.toml index 7b234b2..8ee99e2 100644 --- a/jecs/wally.toml +++ b/jecs/wally.toml @@ -5,4 +5,4 @@ license = "MIT" name = "mark-marks/jecs-nightly" realm = "shared" registry = "https://github.com/UpliftGames/wally-index" -version = "0.5.5-nightly.20250428T001101Z" +version = "0.5.5-nightly.20250429T001100Z"