Sync to upstream Jecs 0.6.0-rc.1-nightly.20250509T001119Z
This commit is contained in:
parent
bb51a51eea
commit
238f2eadc5
8 changed files with 23 additions and 19 deletions
|
@ -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)
|
||||||
|
|
|
@ -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"
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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"
|
||||||
|
|
|
@ -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"
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
passed = true
|
passed = true
|
||||||
timestamp = "20250508T001102Z"
|
timestamp = "20250509T001121Z"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[38;1m7.2[0m [33;1mus[0m [38;1m 3[0m [33;1mkB[0m[38;1m│[0m [38;1mdelete children of entity[0m
|
[38;1m7.0[0m [33;1mus[0m [38;1m 3[0m [33;1mkB[0m[38;1m│[0m [38;1mdelete children of entity[0m
|
||||||
[38;1m9.0[0m [33;1mus[0m [38;1m 1[0m [33;1mkB[0m[38;1m│[0m [38;1mremove friends of entity[0m
|
[38;1m8.9[0m [33;1mus[0m [38;1m 1[0m [33;1mkB[0m[38;1m│[0m [38;1mremove friends of entity[0m
|
||||||
[38;1m393[0m [32;1mns[0m [38;1m 0[0m [32;1m B[0m[38;1m│[0m [38;1msimple deletion of entity[0m
|
[38;1m345[0m [32;1mns[0m [38;1m 10[0m [32;1m B[0m[38;1m│[0m [38;1msimple deletion of entity[0m
|
||||||
[37;1mrepro[0m
|
[37;1mrepro[0m
|
||||||
[38;5;208mNONE[0m[38;1m│[0m [38;1m[0m
|
[38;5;208mNONE[0m[38;1m│[0m [38;1m[0m
|
||||||
|
|
||||||
|
@ -121,5 +121,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;1m74/74 test cases passed in 32.600 ms.[0m
|
[38;1m74/74 test cases passed in 30.871 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.6.0-rc.1-nightly.20250508T001059Z"
|
version = "0.6.0-rc.1-nightly.20250509T001119Z"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue