Compare commits

...

2 commits

Author SHA1 Message Date
forgejo-actions
0766a4c5b2 Sync to upstream Jecs 0.6.0-rc.1-nightly.20250509T001119Z 2025-05-10 00:11:13 +00:00
8ff7640686 Sync to released Jecs 0.6.0-rc.1-nightly.20250509T001119Z (#58)
Reviewed-on: #58
2025-05-09 02:11:39 +02:00
8 changed files with 23 additions and 19 deletions

View file

@ -1,16 +1,16 @@
local jecs = require("@jecs") local jecs = require("@jecs")
type Observer<T...> = { type Observer = {
callback: (jecs.Entity) -> (), callback: (jecs.Entity) -> (),
query: jecs.Query<T...>, query: jecs.Query<...jecs.Id>,
} }
export type PatchedWorld = jecs.World & { export type PatchedWorld = jecs.World & {
added: <T>(PatchedWorld, jecs.Id<T>, (e: jecs.Entity, id: jecs.Id, value: T) -> ()) -> () -> (), added: <T>(PatchedWorld, jecs.Id<T>, (jecs.Entity, jecs.Id, T) -> ()) -> () -> (),
removed: <T>(PatchedWorld, jecs.Id<T>, (e: jecs.Entity, id: jecs.Id) -> ()) -> () -> (), removed: <T>(PatchedWorld, jecs.Id<T>, (jecs.Entity, jecs.Id) -> ()) -> () -> (),
changed: <T>(PatchedWorld, jecs.Id<T>, (e: jecs.Entity, id: jecs.Id, value: T) -> ()) -> () -> (), changed: <T>(PatchedWorld, jecs.Id<T>, (jecs.Entity, jecs.Id, T) -> ()) -> () -> (),
observer: (PatchedWorld, Observer<any>) -> (), observer: (PatchedWorld, Observer) -> (),
monitor: (PatchedWorld, Observer<any>) -> (), monitor: (PatchedWorld, Observer) -> (),
} }
local function observers_new(world, description) local function observers_new(world, description)

View file

@ -1,2 +1,2 @@
modified = ["addons/observers.luau", "jecs.luau"] modified = ["addons/observers.luau", "jecs.luau"]
version = "0.6.0-rc.1-nightly.20250508T001059Z" version = "0.6.0-rc.1-nightly.20250509T001119Z"

View file

@ -780,7 +780,11 @@ local function world_entity(world: ecs_world_t, entity: i53?): i53
local any = dense_array[dense] local any = dense_array[dense]
if dense <= alive_count then if dense <= alive_count then
return any if any ~= entity then
error("Entity ID is already in use with a different generation")
else
return entity
end
end end
local e_swap = dense_array[dense] local e_swap = dense_array[dense]
@ -790,9 +794,9 @@ local function world_entity(world: ecs_world_t, entity: i53?): i53
r_swap.dense = dense r_swap.dense = dense
r.dense = alive_count r.dense = alive_count
dense_array[dense] = e_swap dense_array[dense] = e_swap
dense_array[alive_count] = any dense_array[alive_count] = entity
return any return entity
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

View file

@ -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.6.0-rc.1-nightly.20250508T001059Z" version = "0.6.0-rc.1-nightly.20250509T001119Z"
[indices] [indices]
default = "https://github.com/pesde-pkg/index" default = "https://github.com/pesde-pkg/index"

View file

@ -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.6.0-rc.1-nightly.20250508T001059Z" version = "0.6.0-rc.1-nightly.20250509T001119Z"
[indices] [indices]
default = "https://github.com/pesde-pkg/index" default = "https://github.com/pesde-pkg/index"

View file

@ -1,2 +1,2 @@
passed = true passed = true
timestamp = "20250508T001102Z" timestamp = "20250510T001102Z"

View file

@ -1,6 +1,6 @@
7.2 us  3 kB│ delete children of entity 7.1 us  3 kB│ delete children of entity
9.0 us  1 kB│ remove friends of entity 8.8 us  1 kB│ remove friends of entity
393 ns  0  B│ simple deletion of entity 349 ns  10  B│ simple deletion of entity
repro repro
NONE│  NONE│ 
@ -121,5 +121,5 @@
PASS│ #2 PASS│ #2
PASS│ #3 PASS│ #3
74/74 test cases passed in 32.600 ms. 74/74 test cases passed in 30.704 ms.
0 fails 0 fails

View file

@ -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.6.0-rc.1-nightly.20250508T001059Z" version = "0.6.0-rc.1-nightly.20250509T001119Z"