From 651955d68296c745f489563e84a481c39415b05e Mon Sep 17 00:00:00 2001 From: Zicklag Date: Mon, 18 Sep 2023 16:24:52 -0500 Subject: [PATCH 01/31] refactor: get map loading with latest bones. --- Cargo.lock | 3298 ++++------------- Cargo.toml | 197 +- Cross.toml | 8 +- assets/default.core.yaml | 77 - assets/default.game.yaml | 286 -- assets/dummy.yaml | 1 + .../decoration/anemones/anemones.element.yaml | 6 +- .../anemones/animated_decoration.yaml | 4 + .../player_spawner.element.yaml | 2 +- .../player_spawner/player_spawner.yaml | 1 + assets/game.yaml | 364 ++ assets/map/levels/level_1.map.yaml | 280 +- assets/pack.yaml | 1 + book/book.toml | 14 +- cliff.toml | 24 +- core/Cargo.toml | 40 - core/README.md | 86 - core/src/lib.rs | 107 - core/src/metadata.rs | 103 - core/src/metadata/common.rs | 57 - core/src/metadata/element.rs | 320 -- core/src/prelude.rs | 17 - core/src/session.rs | 299 -- deny.toml | 44 +- examples/core_usage.rs | 234 -- src/README.md | 109 - src/assets.rs | 55 - src/assets/asset_handle.rs | 131 - src/audio.rs | 195 - src/bevy_states.rs | 49 - src/camera.rs | 37 - src/config.rs | 149 - src/console.rs | 75 - src/core.rs | 52 + {core/src => src/core}/attachment.rs | 23 +- {core/src => src/core}/bullet.rs | 38 +- {core/src => src/core}/camera.rs | 18 +- {core/src => src/core}/damage.rs | 10 +- {core/src => src/core}/debug.rs | 28 +- {core/src => src/core}/editor.rs | 87 +- {core/src => src/core}/elements.rs | 66 +- {core/src => src/core}/elements/crab.rs | 49 +- {core/src => src/core}/elements/crate_item.rs | 76 +- {core/src => src/core}/elements/decoration.rs | 14 +- .../src => src/core}/elements/fish_school.rs | 43 +- {core/src => src/core}/elements/grenade.rs | 69 +- {core/src => src/core}/elements/kick_bomb.rs | 68 +- {core/src => src/core}/elements/mine.rs | 64 +- {core/src => src/core}/elements/musket.rs | 57 +- .../core}/elements/player_spawner.rs | 28 +- {core/src => src/core}/elements/slippery.rs | 17 +- .../core}/elements/slippery_seaweed.rs | 19 +- {core/src => src/core}/elements/snail.rs | 70 +- {core/src => src/core}/elements/spike.rs | 17 +- {core/src => src/core}/elements/sproinger.rs | 33 +- .../src => src/core}/elements/stomp_boots.rs | 48 +- {core/src => src/core}/elements/sword.rs | 54 +- {core/src => src/core}/elements/urchin.rs | 33 +- {core/src => src/core}/globals.rs | 0 {core/src => src/core}/input.rs | 22 +- {core/src => src/core}/item.rs | 79 +- {core/src => src/core}/lifetime.rs | 14 +- {core/src => src/core}/map.rs | 65 +- {core/src => src/core}/map_constructor.rs | 2 +- .../core}/map_constructor/shiftnanigans.rs | 23 +- src/core/metadata.rs | 95 + src/core/metadata/element.rs | 349 ++ {core/src => src/core}/metadata/map.rs | 50 +- {core/src => src/core}/metadata/player.rs | 144 +- {core/src => src/core}/physics.rs | 24 +- {core/src => src/core}/physics/collisions.rs | 47 +- .../core}/physics/collisions/shape.rs | 8 +- {core/src => src/core}/player.rs | 219 +- {core/src => src/core}/player/state.rs | 35 +- {core/src => src/core}/player/state/stage.rs | 32 +- {core/src => src/core}/player/state/states.rs | 0 .../core}/player/state/states/crouch.rs | 42 +- .../core}/player/state/states/dead.rs | 12 +- .../core}/player/state/states/default.rs | 6 +- .../core}/player/state/states/idle.rs | 37 +- .../player/state/states/incapacitated.rs | 22 +- .../core}/player/state/states/midair.rs | 42 +- .../core}/player/state/states/walk.rs | 36 +- {core/src => src/core}/random.rs | 7 +- {core/src => src/core}/utils.rs | 0 {core/src => src/core}/utils/easing.rs | 0 {core/src => src/core}/utils/macros.rs | 4 +- {core/src => src/core}/utils/math.rs | 0 {core/src => src/core}/utils/rect.rs | 2 +- src/debug.rs | 58 - src/input.rs | 32 - src/loading.rs | 460 --- src/localization.rs | 121 - src/logs.rs | 211 -- src/main.rs | 205 +- src/metadata.rs | 77 - src/metadata/localization.rs | 19 - src/metadata/settings.rs | 81 - src/metadata/ui.rs | 262 -- src/networking.md | 74 - src/networking.rs | 390 -- src/networking/certs.rs | 39 - src/networking/debug.rs | 285 -- src/networking/lan.rs | 731 ---- src/networking/online.md | 95 - src/networking/online.rs | 355 -- src/networking/proto.rs | 69 - src/platform.rs | 436 --- src/prelude.rs | 28 - src/profiling.rs | 90 - src/puffin_tracing.rs | 124 - src/session.rs | 385 -- src/ui.rs | 390 -- src/ui/debug_tools.rs | 282 -- src/ui/editor.rs | 1731 --------- src/ui/main_menu.rs | 373 -- src/ui/main_menu/credits.rs | 183 - src/ui/main_menu/map_select.rs | 320 -- src/ui/main_menu/network_game.rs | 579 --- src/ui/main_menu/player_select.rs | 802 ---- src/ui/main_menu/settings.rs | 224 -- src/ui/main_menu/settings/controls.rs | 421 --- src/ui/main_menu/settings/networking.rs | 59 - src/ui/main_menu/settings/sound.rs | 7 - src/ui/pause_menu.rs | 210 -- src/ui/ui_input.rs | 22 - src/ui/widgets.rs | 51 - src/ui/widgets/bordered_button.rs | 215 -- src/ui/widgets/bordered_frame.rs | 274 -- src/utils.rs | 82 - taplo.toml | 3 + 131 files changed, 2955 insertions(+), 17069 deletions(-) delete mode 100644 assets/default.core.yaml delete mode 100644 assets/default.game.yaml create mode 100644 assets/dummy.yaml create mode 100644 assets/elements/decoration/anemones/animated_decoration.yaml create mode 100644 assets/elements/environment/player_spawner/player_spawner.yaml create mode 100644 assets/game.yaml create mode 100644 assets/pack.yaml delete mode 100644 core/Cargo.toml delete mode 100644 core/README.md delete mode 100644 core/src/lib.rs delete mode 100644 core/src/metadata.rs delete mode 100644 core/src/metadata/common.rs delete mode 100644 core/src/metadata/element.rs delete mode 100644 core/src/prelude.rs delete mode 100644 core/src/session.rs delete mode 100644 examples/core_usage.rs delete mode 100644 src/README.md delete mode 100644 src/assets.rs delete mode 100644 src/assets/asset_handle.rs delete mode 100644 src/audio.rs delete mode 100644 src/bevy_states.rs delete mode 100644 src/camera.rs delete mode 100644 src/config.rs delete mode 100644 src/console.rs create mode 100644 src/core.rs rename {core/src => src/core}/attachment.rs (93%) rename {core/src => src/core}/bullet.rs (84%) rename {core/src => src/core}/camera.rs (94%) rename {core/src => src/core}/damage.rs (92%) rename {core/src => src/core}/debug.rs (89%) rename {core/src => src/core}/editor.rs (85%) rename {core/src => src/core}/elements.rs (83%) rename {core/src => src/core}/elements/crab.rs (88%) rename {core/src => src/core}/elements/crate_item.rs (82%) rename {core/src => src/core}/elements/decoration.rs (78%) rename {core/src => src/core}/elements/fish_school.rs (91%) rename {core/src => src/core}/elements/grenade.rs (83%) rename {core/src => src/core}/elements/kick_bomb.rs (84%) rename {core/src => src/core}/elements/mine.rs (83%) rename {core/src => src/core}/elements/musket.rs (83%) rename {core/src => src/core}/elements/player_spawner.rs (80%) rename {core/src => src/core}/elements/slippery.rs (81%) rename {core/src => src/core}/elements/slippery_seaweed.rs (80%) rename {core/src => src/core}/elements/snail.rs (79%) rename {core/src => src/core}/elements/spike.rs (83%) rename {core/src => src/core}/elements/sproinger.rs (80%) rename {core/src => src/core}/elements/stomp_boots.rs (82%) rename {core/src => src/core}/elements/sword.rs (88%) rename {core/src => src/core}/elements/urchin.rs (79%) rename {core/src => src/core}/globals.rs (100%) rename {core/src => src/core}/input.rs (88%) rename {core/src => src/core}/item.rs (82%) rename {core/src => src/core}/lifetime.rs (85%) rename {core/src => src/core}/map.rs (94%) rename {core/src => src/core}/map_constructor.rs (92%) rename {core/src => src/core}/map_constructor/shiftnanigans.rs (96%) create mode 100644 src/core/metadata.rs create mode 100644 src/core/metadata/element.rs rename {core/src => src/core}/metadata/map.rs (52%) rename {core/src => src/core}/metadata/player.rs (52%) rename {core/src => src/core}/physics.rs (95%) rename {core/src => src/core}/physics/collisions.rs (96%) rename {core/src => src/core}/physics/collisions/shape.rs (96%) rename {core/src => src/core}/player.rs (85%) rename {core/src => src/core}/player/state.rs (82%) rename {core/src => src/core}/player/state/stage.rs (81%) rename {core/src => src/core}/player/state/states.rs (100%) rename {core/src => src/core}/player/state/states/crouch.rs (72%) rename {core/src => src/core}/player/state/states/dead.rs (89%) rename {core/src => src/core}/player/state/states/default.rs (74%) rename {core/src => src/core}/player/state/states/idle.rs (71%) rename {core/src => src/core}/player/state/states/incapacitated.rs (72%) rename {core/src => src/core}/player/state/states/midair.rs (71%) rename {core/src => src/core}/player/state/states/walk.rs (72%) rename {core/src => src/core}/random.rs (76%) rename {core/src => src/core}/utils.rs (100%) rename {core/src => src/core}/utils/easing.rs (100%) rename {core/src => src/core}/utils/macros.rs (90%) rename {core/src => src/core}/utils/math.rs (100%) rename {core/src => src/core}/utils/rect.rs (97%) delete mode 100644 src/debug.rs delete mode 100644 src/input.rs delete mode 100644 src/loading.rs delete mode 100644 src/localization.rs delete mode 100644 src/logs.rs delete mode 100644 src/metadata.rs delete mode 100644 src/metadata/localization.rs delete mode 100644 src/metadata/settings.rs delete mode 100644 src/metadata/ui.rs delete mode 100644 src/networking.md delete mode 100644 src/networking.rs delete mode 100644 src/networking/certs.rs delete mode 100644 src/networking/debug.rs delete mode 100644 src/networking/lan.rs delete mode 100644 src/networking/online.md delete mode 100644 src/networking/online.rs delete mode 100644 src/networking/proto.rs delete mode 100644 src/platform.rs delete mode 100644 src/prelude.rs delete mode 100644 src/profiling.rs delete mode 100644 src/puffin_tracing.rs delete mode 100644 src/session.rs delete mode 100644 src/ui.rs delete mode 100644 src/ui/debug_tools.rs delete mode 100644 src/ui/editor.rs delete mode 100644 src/ui/main_menu.rs delete mode 100644 src/ui/main_menu/credits.rs delete mode 100644 src/ui/main_menu/map_select.rs delete mode 100644 src/ui/main_menu/network_game.rs delete mode 100644 src/ui/main_menu/player_select.rs delete mode 100644 src/ui/main_menu/settings.rs delete mode 100644 src/ui/main_menu/settings/controls.rs delete mode 100644 src/ui/main_menu/settings/networking.rs delete mode 100644 src/ui/main_menu/settings/sound.rs delete mode 100644 src/ui/pause_menu.rs delete mode 100644 src/ui/ui_input.rs delete mode 100644 src/ui/widgets.rs delete mode 100644 src/ui/widgets/bordered_button.rs delete mode 100644 src/ui/widgets/bordered_frame.rs delete mode 100644 src/utils.rs create mode 100644 taplo.toml diff --git a/Cargo.lock b/Cargo.lock index ca6fb62eab..80e4b68366 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -20,24 +20,24 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] name = "accesskit" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "704d532b1cd3d912bb37499c55a81ac748cc1afa737eedd100ba441acdd47d38" +checksum = "76eb1adf08c5bcaa8490b9851fd53cca27fa9880076f178ea9d29f05196728a8" [[package]] name = "accesskit_consumer" -version = "0.14.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ba8b23cfca3944012ee2e5c71c02077a400e034c720eed6bd927cb6b4d1fd9" +checksum = "04bb4d9e4772fe0d47df57d0d5dbe5d85dd05e2f37ae1ddb6b105e76be58fb00" dependencies = [ "accesskit", ] [[package]] name = "accesskit_macos" -version = "0.6.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58d062544d6cc36f4213323b7cb3a0d74ddff4b0d2311ab5e7596f4278bb2cc9" +checksum = "134d0acf6acb667c89d3332999b1a5df4edbc8d6113910f392ebb73f2b03bb56" dependencies = [ "accesskit", "accesskit_consumer", @@ -47,23 +47,23 @@ dependencies = [ [[package]] name = "accesskit_windows" -version = "0.13.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf5b3c3828397ee832ba4a72fb1a4ace10f781e31885f774cbd531014059115" +checksum = "9eac0a7f2d7cd7a93b938af401d3d8e8b7094217989a7c25c55a953023436e31" dependencies = [ "accesskit", "accesskit_consumer", "arrayvec", "once_cell", "paste", - "windows 0.44.0", + "windows 0.48.0", ] [[package]] name = "accesskit_winit" -version = "0.12.4" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbcb615217efc79c4bed3094c4ca76c4bc554751d1da16f3ed4ba0459b1e8f31" +checksum = "825d23acee1bd6d25cbaa3ca6ed6e73faf24122a774ec33d52c5c86c6ab423c0" dependencies = [ "accesskit", "accesskit_macos", @@ -73,9 +73,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -104,64 +104,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ "cfg-if", + "getrandom 0.2.10", "once_cell", "version_check", ] [[package]] name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "aho-corasick" -version = "1.0.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] [[package]] -name = "aligned-vec" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" - -[[package]] -name = "alsa" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8512c9117059663fb5606788fbca3619e2a91dac0e3fe516242eab1fa6be5e44" -dependencies = [ - "alsa-sys", - "bitflags", - "libc", - "nix 0.24.3", -] - -[[package]] -name = "alsa-sys" -version = "0.3.1" +name = "allocator-api2" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" -dependencies = [ - "libc", - "pkg-config", -] +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "android-activity" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c77a0045eda8b888c76ea473c2b0515ba6f471d318f8927c5c72240937035a6" +checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0" dependencies = [ "android-properties", - "bitflags", + "bitflags 1.3.2", "cc", "jni-sys", "libc", @@ -169,7 +139,7 @@ dependencies = [ "ndk", "ndk-context", "ndk-sys", - "num_enum", + "num_enum 0.6.1", ] [[package]] @@ -178,17 +148,11 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - [[package]] name = "android_log-sys" -version = "0.2.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e" +checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937" [[package]] name = "android_system_properties" @@ -201,9 +165,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "approx" @@ -216,9 +180,9 @@ dependencies = [ [[package]] name = "arboard" -version = "3.2.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6041616acea41d67c4a984709ddab1587fd0b10efe5cc563fee954d2f011854" +checksum = "ac57f2b058a76363e357c056e4f74f1945bf734d37b8b3ef49066c4787dde0fc" dependencies = [ "clipboard-win", "core-graphics", @@ -227,8 +191,7 @@ dependencies = [ "objc", "objc-foundation", "objc_id", - "once_cell", - "parking_lot 0.12.1", + "parking_lot", "thiserror", "winapi", "x11rb", @@ -236,9 +199,9 @@ dependencies = [ [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "ash" @@ -246,14 +209,14 @@ version = "0.37.3+1.3.251" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" dependencies = [ - "libloading", + "libloading 0.7.4", ] [[package]] name = "async-channel" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", "event-listener", @@ -274,31 +237,11 @@ dependencies = [ "slab", ] -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite", - "log", - "parking", - "polling", - "rustix", - "slab", - "socket2 0.4.9", - "waker-fn", -] - [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ "event-listener", ] @@ -310,36 +253,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] -name = "async-timer" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5fa6ed76cb2aa820707b4eb9ec46f42da9ce70b0eafab5e5e34942b38a44d5" -dependencies = [ - "libc", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "atomic-arena" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5450eca8ce5abcfd5520727e975ebab30ccca96030550406b0ca718b224ead10" - -[[package]] -name = "atomic-polyfill" +name = "atomic_refcell" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" -dependencies = [ - "critical-section", -] +checksum = "112ef6b3f6cb3cb6fc5b6b494ef7a848492cff1ab0ef4de10b0f7d572861c905" [[package]] -name = "atomic_refcell" -version = "0.1.10" +name = "atomicell" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79d6dc922a2792b006573f60b2648076355daeae5ce9cb59507e5908c9625d31" +checksum = "157342dd84c64f16899b4b16c1fb2cce54b887990362aac3c590b3d13810890f" [[package]] name = "autocfg" @@ -349,107 +272,39 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide 0.6.2", + "miniz_oxide", "object", "rustc-demangle", ] [[package]] name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" - -[[package]] -name = "better-bae" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42256f0525b8d9cb8e6573ba850478df93ba34ddd7bf64eeb47ff19a8422bc5" -dependencies = [ - "better-bae-macros", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "better-bae-macros" -version = "0.1.9" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b0f3144c211af9910842422e6835938ff01895bca8c143e28dcebdd23eb2dbc" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] +checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" [[package]] name = "bevy" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93f906133305915d63f04108e6873c1b93a6605fe374b8f3391f6bda093e396" +checksum = "18e71a9143ac21bed247c30129399af8be170309e7ff5983a1bd37e87d3da520" dependencies = [ "bevy_internal", ] -[[package]] -name = "bevy-inspector-egui" -version = "0.18.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bda61dd72f879e8d4b0f57e94b86bd163bf558ac2e7ddea9ea075a47bdcd9af" -dependencies = [ - "bevy-inspector-egui-derive", - "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_core_pipeline", - "bevy_ecs", - "bevy_egui", - "bevy_hierarchy", - "bevy_log", - "bevy_math", - "bevy_reflect", - "bevy_render", - "bevy_utils", - "bevy_window", - "egui", - "image", - "once_cell", - "pretty-type-name", - "smallvec", -] - -[[package]] -name = "bevy-inspector-egui-derive" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7556c913daacbec7aa213eda82517673bf6c6b25e0d827a56efe17421ebaca35" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.18", -] - [[package]] name = "bevy_a11y" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037c4063f7dac1a5d596eb47f40782a04ca5838dc4274dbbadc90eb81efe5169" +checksum = "3d87d5753cefaeb5f5c5d5e937844f5386eabaf9ab95f3013e86d8fb438d424e" dependencies = [ "accesskit", "bevy_app", @@ -459,13 +314,14 @@ dependencies = [ [[package]] name = "bevy_app" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01db46963eb9486f7884121527ec69751d0e448f9e1d5329e80ea3424118a31a" +checksum = "3cb660188d5d4ceaead6d5861ce22ecedc08b68c385cc8edf0a3c0c0285560bf" dependencies = [ "bevy_derive", "bevy_ecs", "bevy_reflect", + "bevy_tasks", "bevy_utils", "downcast-rs", "wasm-bindgen", @@ -474,11 +330,12 @@ dependencies = [ [[package]] name = "bevy_asset" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98609b4b0694a23bde0628aed626644967991f167aad9db2afb68dacb0017540" +checksum = "6733d20a22bb10da928785fdbf6fad6cfb1c7da4a8c170ab3adbba5862c375d5" dependencies = [ "anyhow", + "async-channel", "bevy_app", "bevy_diagnostic", "bevy_ecs", @@ -491,8 +348,7 @@ dependencies = [ "downcast-rs", "fastrand", "js-sys", - "notify", - "parking_lot 0.12.1", + "parking_lot", "serde", "thiserror", "wasm-bindgen", @@ -500,35 +356,11 @@ dependencies = [ "web-sys", ] -[[package]] -name = "bevy_console" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16918632c7af076b9c82617dddc9f63e8647c50a4dc83867bba75eafc29eee87" -dependencies = [ - "bevy", - "bevy_console_derive", - "bevy_egui", - "clap", -] - -[[package]] -name = "bevy_console_derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bfc5e1962775c30fff70367f6aa7526190a4fe8495a6ae4a3d939bd889fee1e" -dependencies = [ - "better-bae", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "bevy_core" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee53d7b4691b57207d72e996992c995a53f3e8d21ca7151ca3956d9ce7d232e" +checksum = "e1d47b435bdebeefedda95de98a419c4d3b4c160ed8ce3470ea358a16aad6038" dependencies = [ "bevy_app", "bevy_ecs", @@ -537,17 +369,17 @@ dependencies = [ "bevy_tasks", "bevy_utils", "bytemuck", - "serde", ] [[package]] name = "bevy_core_pipeline" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "093ae5ced77251602ad6e43521e2acc1a5570bf85b80f232f1a7fdd43b50f8d8" +checksum = "a01c2652f5a6d24e0ab465e6feca8a034dfb33dfefbcdc19e436fec879a362a8" dependencies = [ "bevy_app", "bevy_asset", + "bevy_core", "bevy_derive", "bevy_ecs", "bevy_math", @@ -555,27 +387,27 @@ dependencies = [ "bevy_render", "bevy_transform", "bevy_utils", - "bitflags", + "bitflags 2.4.0", "radsort", "serde", ] [[package]] name = "bevy_derive" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff0add5ab4a6b2b7e86e18f9043bb48b6386faa3b56abaa0ed97a3d669a1992" +checksum = "c5cc78985f4d0ad1fd7b8ead06dcfaa192685775a7b1be158191c788c7d52298" dependencies = [ "bevy_macro_utils", "quote", - "syn 1.0.109", + "syn 2.0.31", ] [[package]] name = "bevy_diagnostic" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c778422643b0adee9e82abbd07e1e906eb9947c274a9b18e0f7fbf137d4c34" +checksum = "ee4e366724d233fdc7e282e1415f4cd570e97fbb8443e5a8ff3f8cc5ae253ffd" dependencies = [ "bevy_app", "bevy_core", @@ -586,20 +418,11 @@ dependencies = [ "sysinfo", ] -[[package]] -name = "bevy_dylib" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5256c735e1e1587f9eab08b9268fcd881fc2e6403d75a89580582ed35cc79193" -dependencies = [ - "bevy_internal", -] - [[package]] name = "bevy_ecs" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bed2f74687ccf13046c0f8e3b00dc61d7e656877b4a1380cf04635bb74d8e586" +checksum = "fb6fd0ec64cd32b8fcf16157173431ba0e675b29c4643a8d6c9a9eeef6f93c32" dependencies = [ "async-channel", "bevy_ecs_macros", @@ -612,26 +435,27 @@ dependencies = [ "fixedbitset", "rustc-hash", "serde", + "thiserror", "thread_local", ] [[package]] name = "bevy_ecs_macros" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97fd126a0db7b30fb1833614b3a657b44ac88485741c33b2780e25de0f96d78" +checksum = "e13b0fd864433db6ff825efd0eb86b2690e208151905b184cc9bfd2c3ac66c3b" dependencies = [ "bevy_macro_utils", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.31", ] [[package]] name = "bevy_egui" -version = "0.20.3" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5e269226c4a8fb659aa3161c19925650ebe2c23021ddf4dd9ed191cf708364f" +checksum = "1a73a93a8cf6b8c744281d1b88f5b0fa278d608e909af9bbf4eb491a7cb1ad2c" dependencies = [ "arboard", "bevy", @@ -642,65 +466,38 @@ dependencies = [ [[package]] name = "bevy_encase_derive" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c086ebdc1f5522787d63772943277cc74a279445fb65db4d58c2c5330654648e" +checksum = "da8ffb3d214ee4d8b7e851bc8409768a0f18c872c3a25065c248611ff832180e" dependencies = [ "bevy_macro_utils", "encase_derive_impl", ] [[package]] -name = "bevy_fluent" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a1eecb75ba4f874fa7fe8d6c659a534d7738bcece6d92c016c21ee0092cc03d" -dependencies = [ - "anyhow", - "bevy", - "fluent", - "fluent-langneg", - "fluent_content", - "globset", - "indexmap", - "intl-memoizer", - "ron", - "serde", - "serde_yaml", - "thiserror", - "tracing", - "unic-langid", - "uuid", -] - -[[package]] -name = "bevy_framepace" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1825c5a485aa2a2ffd91cc1faa1f4d621c804a893ead88cafedbe1ed6c51d34" -dependencies = [ - "bevy", - "spin_sleep", -] - -[[package]] -name = "bevy_gilrs" -version = "0.10.1" +name = "bevy_gizmos" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f32eb07e8c9ea4be7195ccec10d8f9ad70200f3ae2e13adc4b84df9f50bb1c6" +checksum = "64c08196fcb36b7175577443cbe2c1193d596a15eb0fa210bae378e6e1478876" dependencies = [ "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_core_pipeline", "bevy_ecs", - "bevy_input", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_sprite", + "bevy_transform", "bevy_utils", - "gilrs", ] [[package]] name = "bevy_hierarchy" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d04099865a13d1fd8bf3c044a80148cb3d23bfe8c3d5f082dda2ce091d85532" +checksum = "402789ee53acf345243cf2c86a895d6cf8631e533780ed261c6ecf891eb050b8" dependencies = [ "bevy_app", "bevy_core", @@ -713,24 +510,23 @@ dependencies = [ [[package]] name = "bevy_input" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15d40aa636bb656967ac16ca36066ab7a7bb9179e1b0390c5705e54208e8fd7" +checksum = "b9dfd9c768cf153f3fc807661996b2db44b824299860ba198fb3b92dd731bdd8" dependencies = [ "bevy_app", "bevy_ecs", "bevy_math", "bevy_reflect", "bevy_utils", - "serde", "thiserror", ] [[package]] name = "bevy_internal" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862b11931c5874cb00778ffb715fc526ee49e52a493d3bcf50e8010f301858b3" +checksum = "1006f2c501bceb1aef5cc18ed07eb822f295763227b83ba6887e6743698af9f8" dependencies = [ "bevy_a11y", "bevy_app", @@ -740,7 +536,7 @@ dependencies = [ "bevy_derive", "bevy_diagnostic", "bevy_ecs", - "bevy_gilrs", + "bevy_gizmos", "bevy_hierarchy", "bevy_input", "bevy_log", @@ -759,31 +555,17 @@ dependencies = [ "bevy_winit", ] -[[package]] -name = "bevy_kira_audio" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "468257f6c7980d847aba0e9b6c9e4ff4045598510637d6e484b5f290c00a1f92" -dependencies = [ - "anyhow", - "bevy", - "kira", - "parking_lot 0.12.1", - "thiserror", -] - [[package]] name = "bevy_log" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25980c90ceaad34d09a53291e72ca56fcc754a974cd4654fffcf5b68b283b7a7" +checksum = "f0b1e5ca5b217dd384a3bf9186df0d0da757035f9f06d8eec0ebe62cffc05c34" dependencies = [ "android_log-sys", "bevy_app", "bevy_ecs", "bevy_utils", "console_error_panic_hook", - "tracing-error", "tracing-log", "tracing-subscriber", "tracing-wasm", @@ -791,20 +573,21 @@ dependencies = [ [[package]] name = "bevy_macro_utils" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b2fee53b2497cdc3bffff2ddf52afa751242424a5fd0d51d227d4dab081d0d9" +checksum = "d1cd460205fe05634d58b32d9bb752b1b4eaf32b2d29cbd4161ba35eb44a2f8c" dependencies = [ "quote", - "syn 1.0.109", + "rustc-hash", + "syn 2.0.31", "toml_edit", ] [[package]] name = "bevy_math" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da6a1109d06fe947990db032e719e162414cf9bf7a478dcc52742f1c7136c42a" +checksum = "267f2ec44aa948051768b1320c2dbff0871799e0a3b746f5fe5b6ee7258fbaf5" dependencies = [ "glam", "serde", @@ -812,18 +595,18 @@ dependencies = [ [[package]] name = "bevy_mikktspace" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39106bc2ee21fce9496d2e15e0ba7925dff63e3eae10f7c1fc0094b56ad9f2bb" +checksum = "0d98eaa7f40b97bb9b2d681ecf9fd439830a7eb88ad2846680d4f4acd285cf84" dependencies = [ "glam", ] [[package]] name = "bevy_pbr" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f507cef55812aa70c2ec2b30fb996eb285fa7497d974cf03f76ec49c77fbe27" +checksum = "9386944248ac8fcaaabec2302b0e7cd8196ef5d7b7a2e63b10ace3eeb813d3de" dependencies = [ "bevy_app", "bevy_asset", @@ -836,16 +619,17 @@ dependencies = [ "bevy_transform", "bevy_utils", "bevy_window", - "bitflags", + "bitflags 2.4.0", "bytemuck", + "naga_oil", "radsort", ] [[package]] name = "bevy_prototype_lyon" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799f9bc78cdef67d8dbecd06d2147d30732cdc74eb5e15edacf76ff2069b3d9f" +checksum = "9e347c16caede05dc5f774ba388cefeef0ab558a5601fc6b5ffd6606bef77308" dependencies = [ "bevy", "lyon_algorithms", @@ -855,15 +639,15 @@ dependencies = [ [[package]] name = "bevy_ptr" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b88451d4c5a353bff67dbaa937b6886efd26ae114769c17f2b35099c7a4de" +checksum = "15702dff420fac72c2ab92428a8600e079ae89c5845401c4e39b843665a3d2d0" [[package]] name = "bevy_reflect" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc3979471890e336f3ba87961ef3ecd45c331cf2cb2f582c885e541af228b48" +checksum = "3ac66cccbf1457c5cfc004a0e83569bd4ddc5d6310701f4af6aa81001fe2964a" dependencies = [ "bevy_math", "bevy_ptr", @@ -873,31 +657,32 @@ dependencies = [ "erased-serde", "glam", "once_cell", - "parking_lot 0.12.1", + "parking_lot", "serde", "smallvec", + "smol_str", "thiserror", ] [[package]] name = "bevy_reflect_derive" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc7ea7c9bc2c531eb29ba5619976613d6680453ff5dd4a7fcd08848e8bec5ad" +checksum = "e5a2a1fa784e9a22560b9de350246a159cd59239eb61c7b66824031b3b28abb0" dependencies = [ "bevy_macro_utils", "bit-set", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.31", "uuid", ] [[package]] name = "bevy_render" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee1e126226f0a4d439bf82fe07c1104f894a6a365888e3eba7356f9647e77a83" +checksum = "b2e125de06ffaed8100623843b447fb524dc16f2a2120adce81143d7307278be" dependencies = [ "anyhow", "async-channel", @@ -918,43 +703,46 @@ dependencies = [ "bevy_transform", "bevy_utils", "bevy_window", - "bitflags", + "bitflags 2.4.0", + "bytemuck", "codespan-reporting", "downcast-rs", "encase", "futures-lite", "hexasphere", "image", + "js-sys", "naga", - "once_cell", - "parking_lot 0.12.1", - "profiling", + "naga_oil", + "parking_lot", "regex", "serde", "smallvec", "thiserror", "thread_local", + "wasm-bindgen", + "web-sys", "wgpu", "wgpu-hal", ] [[package]] name = "bevy_render_macros" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "652f8c4d9577c6e6a8b3dfd8a4ce331e8b6ecdbb99636a4b2701dec50104d6bc" +checksum = "e283eb4156285d0d4b85ce9b959d080b652165848f0b3f1a8770af6cfad41c34" dependencies = [ "bevy_macro_utils", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.31", ] [[package]] name = "bevy_scene" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1de59637d27726251091120ce6f63917328ffd60aaccbda4d65a615873aff631" +checksum = "a77172c572239e741283e585433e986dd7f1bfdd7f7489ff10933f59e93cbb04" dependencies = [ "anyhow", "bevy_app", @@ -972,23 +760,11 @@ dependencies = [ "uuid", ] -[[package]] -name = "bevy_simple_tilemap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9090ffe7460a6c7e66f2bbe80919d5d03cbdd161c9facb523fbf3b7816258e7" -dependencies = [ - "bevy", - "bitflags", - "bytemuck", - "rayon", -] - [[package]] name = "bevy_sprite" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c110358fe3651a5796fd1c07989635680738f5b5c7e9b8a463dd50d12bb78410" +checksum = "d7811ade4df81ffa6bae0e293c42d784ad88ce84d2b10fa05801e3c368714581" dependencies = [ "bevy_app", "bevy_asset", @@ -1001,7 +777,7 @@ dependencies = [ "bevy_render", "bevy_transform", "bevy_utils", - "bitflags", + "bitflags 2.4.0", "bytemuck", "fixedbitset", "guillotiere", @@ -1011,68 +787,55 @@ dependencies = [ [[package]] name = "bevy_tasks" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3de86364316e151aeb0897eaaa917c3ad5ee5ef1471a939023cf7f2d5ab76955" +checksum = "9200e7b42d49c787d9a08675c425d8bd6393ba3beed2eac64be6027a44a01870" dependencies = [ "async-channel", "async-executor", "async-task", "concurrent-queue", "futures-lite", - "once_cell", "wasm-bindgen-futures", ] [[package]] name = "bevy_time" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3edbd605df1bced312eb9888d6be3d5a5fcac3d4140038bbe3233d218399eef" +checksum = "2ba50bf25c4dc40296b744f77de10d39c8981b710d8dce609da9de5e54ef164b" dependencies = [ "bevy_app", "bevy_ecs", "bevy_reflect", "bevy_utils", "crossbeam-channel", - "serde", "thiserror", ] [[package]] name = "bevy_transform" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24383dfb97d8a14b17721ecfdf58556eff5ea9a4b2a3d91accf2b472783880b0" +checksum = "86043ec5cc3cf406d33c0e4d6920171601e186b1288e9b4f5ae54682a0564032" dependencies = [ "bevy_app", "bevy_ecs", "bevy_hierarchy", "bevy_math", "bevy_reflect", - "serde", -] - -[[package]] -name = "bevy_tweening" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7adaf4294484caea3707d280198ad06dd53b9e9adbb0816618c7edce11c990d6" -dependencies = [ - "bevy", - "interpolation", ] [[package]] name = "bevy_utils" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a88ebbca55d360d72e9fe78df0d22e25cd419933c9559e79dae2757f7c4d066" +checksum = "829eb8d0d06a0baeabc2e8bad74136ed3329b055aa1e11c5d9df09ebb9be3d85" dependencies = [ - "ahash 0.7.6", + "ahash 0.8.3", "bevy_utils_proc_macros", "getrandom 0.2.10", - "hashbrown", + "hashbrown 0.14.0", "instant", "petgraph", "thiserror", @@ -1082,20 +845,20 @@ dependencies = [ [[package]] name = "bevy_utils_proc_macros" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630b92e32fa5cd7917c7d4fdbf63a90af958b01e096239f71bc4f8f3cf40c0d2" +checksum = "0d104f29e231123c703e8b394e2341d2425c33c5a2e9ab8cc8d0a554bdb62a41" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.31", ] [[package]] name = "bevy_window" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad31234754268fbe12050290b0496e2296252a16995a38f94bfb9680a4f09fda" +checksum = "4a66f9963152093220fc5ffd2244cadcc7f79cf2c23dd02076f4d0cbb7f5162f" dependencies = [ "bevy_app", "bevy_ecs", @@ -1104,14 +867,13 @@ dependencies = [ "bevy_reflect", "bevy_utils", "raw-window-handle", - "serde", ] [[package]] name = "bevy_winit" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf17bd6330f7e633b7c56754c776511a8f52cde4bf54c0278f34d7527548f253" +checksum = "003e20cff652a364f1f98b0d5ba24f53140dc77643241afe4a9b848bdde66184" dependencies = [ "accesskit_winit", "approx", @@ -1122,45 +884,16 @@ dependencies = [ "bevy_hierarchy", "bevy_input", "bevy_math", + "bevy_tasks", "bevy_utils", "bevy_window", "crossbeam-channel", - "once_cell", "raw-window-handle", "wasm-bindgen", "web-sys", "winit", ] -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bindgen" -version = "0.64.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 1.0.109", -] - [[package]] name = "bit-set" version = "0.5.3" @@ -1177,27 +910,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] -name = "bitfield" -version = "0.14.0" +name = "bitflags" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "bitfield-rle" -version = "0.2.0" +name = "bitflags" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8acc105b7bd3ed61e4bb7ad3e3b3f2a8da72205b2e0408cf71a499e8f57dd0" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" dependencies = [ - "failure", - "varinteger", + "serde", ] -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - [[package]] name = "bitset-core" version = "0.1.1" @@ -1222,6 +948,15 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + [[package]] name = "block-sys" version = "0.1.0-beta.1" @@ -1243,164 +978,146 @@ dependencies = [ [[package]] name = "bones_asset" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f4623b77d4b881819e64baaf26089013f926a441605ea7659e4b67d35e15d5" +version = "0.3.0" dependencies = [ - "bevy_asset", - "bones_bevy_utils", - "bones_ecs", + "anyhow", + "async-channel", + "bones_schema", + "bones_utils", + "bs58", + "erased-serde", + "notify", + "once_cell", + "paste", + "semver", "serde", - "type_ulid", + "serde_json", + "serde_yaml", + "sha2", "ulid", ] [[package]] -name = "bones_bevy_asset" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9dfcf33aee19b7c61cc5a01293504acc5e683163177255eea51b6aeff88656" +name = "bones_bevy_renderer" +version = "0.3.0" dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_reflect", - "bevy_utils", - "bones_bevy_asset_macros", - "bones_bevy_utils", - "bones_lib", + "bevy", + "bevy_egui", + "bevy_prototype_lyon", + "bones_framework", "glam", - "serde", - "serde_json", - "serde_yaml", - "type_ulid", - "uuid", ] [[package]] -name = "bones_bevy_asset_macros" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09c56106e7019deb3a4d187866752d458203e768bf92c0696fa4b89cba18e9e2" +name = "bones_ecs" +version = "0.3.0" dependencies = [ - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", - "ulid", + "anyhow", + "atomicell", + "bitset-core", + "bones_schema", + "bones_utils", + "glam", + "paste", + "thiserror", ] [[package]] -name = "bones_bevy_renderer" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a2aa16fad0d8ef2ced59837faeef7d30184a21820af5335d9743f9804e263c" +name = "bones_framework" +version = "0.3.0" dependencies = [ - "bevy", - "bevy_prototype_lyon", - "bevy_simple_tilemap", - "bones_bevy_asset", + "bones_asset", "bones_lib", + "bones_schema", + "csscolorparser", + "egui", + "fluent-bundle", + "fluent-langneg", + "gilrs", "glam", + "hex", + "image", + "instant", + "intl-memoizer", + "noise", "serde", - "serde_json", "serde_yaml", - "type_ulid", + "sys-locale", + "thiserror", + "tracing", + "ttf-parser", + "unic-langid", ] [[package]] -name = "bones_bevy_utils" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c224bf3211ef9716225c90ab920a65815cae034e56e8c0369138e441aeabd824" +name = "bones_lib" +version = "0.3.0" dependencies = [ - "bevy_ecs", - "type_ulid", + "bones_ecs", ] [[package]] -name = "bones_ecs" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84fa22a3c0fc8a0d5c6fafa015ca9755afa3f266936b7be7ee2bbd21f88e04a1" +name = "bones_schema" +version = "0.3.0" dependencies = [ - "aligned-vec", - "anyhow", - "atomic_refcell", - "bevy_derive", - "bitset-core", - "bytemuck", - "either", - "fxhash", - "itertools", + "bones_schema_macros", + "bones_utils", + "erased-serde", + "glam", + "humantime", + "paste", "serde", - "thiserror", - "type_ulid", + "sptr", + "ulid", ] [[package]] -name = "bones_input" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34b3a885f63adcce7a2097a035c603775652f10582d6b086db62a94445074412" +name = "bones_schema_macros" +version = "0.3.0" dependencies = [ - "bevy", - "bones_bevy_utils", - "glam", - "instant", - "type_ulid", + "proc-macro2", + "quote", + "venial", ] [[package]] -name = "bones_lib" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd1d4185abb6b6f310ed6511153562e627f616b0ec76aebd97d0c674bf49b9b" +name = "bones_utils" +version = "0.3.0" dependencies = [ - "bones_asset", - "bones_bevy_utils", - "bones_ecs", - "bones_input", - "bones_render", - "noise", + "bevy_ptr", + "bones_utils_macros", + "branches", + "fxhash", + "hashbrown 0.14.0", + "maybe-owned", + "parking_lot", "serde", - "type_ulid", + "smallvec", + "ulid", + "ustr", ] [[package]] -name = "bones_matchmaker_proto" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cb89199db04718aa7165cc62e1602a4427a477e79b8c5813f5a42b261d99ec3" +name = "bones_utils_macros" +version = "0.3.0" dependencies = [ - "serde", + "quote", + "venial", ] [[package]] -name = "bones_render" -version = "0.2.0" +name = "branches" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5110ce96de5d5474f48a1770ea54a60a5fdfc2de94b9ebdf5f2d7263453b8d0e" -dependencies = [ - "bevy_render", - "bevy_transform", - "bones_asset", - "bones_bevy_utils", - "bones_ecs", - "glam", - "hex", - "serde", - "thiserror", - "type_ulid", -] +checksum = "7958fb9748a08a6f46ef773e87c43997a844709bc293b4c3de48135debaf9d2a" [[package]] -name = "bstr" -version = "1.5.0" +name = "bs58" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" +checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" dependencies = [ - "memchr", - "serde", + "tinyvec", ] [[package]] @@ -1409,34 +1126,24 @@ version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" -[[package]] -name = "byte-pool" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f1b21189f50b5625efa6227cf45e9d4cfdc2e73582df2b879e9689e78a7158" -dependencies = [ - "crossbeam-queue", - "stable_deref_trait", -] - [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.31", ] [[package]] @@ -1447,17 +1154,18 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -1466,15 +1174,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - [[package]] name = "cfg-if" version = "1.0.0" @@ -1488,90 +1187,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] -name = "chrono" -version = "0.4.26" +name = "clipboard-win" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" dependencies = [ - "android-tzdata", - "js-sys", - "num-traits", - "wasm-bindgen", + "error-code", + "str-buf", + "winapi", ] [[package]] -name = "clang-sys" -version = "1.6.1" +name = "codespan-reporting" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "clap" -version = "4.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce38afc168d8665cfc75c7b1dd9672e50716a137f433f070991619744a67342a" -dependencies = [ - "bitflags", - "clap_derive", - "clap_lex", - "is-terminal", - "once_cell", - "strsim", - "termcolor", -] - -[[package]] -name = "clap_derive" -version = "4.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fddf67631444a3a3e3e5ac51c36a5e01335302de677bd78759eaa90ab1f46644" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "clap_lex" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "033f6b7a4acb1f358c742aaca805c939ee73b4c6209ae4318ec7aca81c42e646" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "clipboard-win" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" -dependencies = [ - "error-code", - "str-buf", - "winapi", -] - -[[package]] -name = "cobs" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", + "termcolor", + "unicode-width", ] [[package]] @@ -1621,22 +1254,31 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b" +[[package]] +name = "const_soft_float" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ca1caa64ef4ed453e68bb3db612e51cf1b2f5b871337f0fcab1c8f87cc3dff" + +[[package]] +name = "constgebra" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd23e864550e6dafc1e41ac78ce4f1ccddc8672b40c403524a04ff3f0518420" +dependencies = [ + "const_soft_float", +] + [[package]] name = "core-foundation" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ - "core-foundation-sys 0.8.4", + "core-foundation-sys", "libc", ] -[[package]] -name = "core-foundation-sys" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" - [[package]] name = "core-foundation-sys" version = "0.8.4" @@ -1649,7 +1291,7 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-graphics-types", "foreign-types", @@ -1658,59 +1300,22 @@ dependencies = [ [[package]] name = "core-graphics-types" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" +checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", - "foreign-types", "libc", ] [[package]] -name = "coreaudio-rs" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb17e2d1795b1996419648915df94bc7103c28f7b48062d7acf4652fc371b2ff" -dependencies = [ - "bitflags", - "core-foundation-sys 0.6.2", - "coreaudio-sys", -] - -[[package]] -name = "coreaudio-sys" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f034b2258e6c4ade2f73bf87b21047567fb913ee9550837c2316d139b0262b24" -dependencies = [ - "bindgen", -] - -[[package]] -name = "cpal" -version = "0.15.2" +name = "cpufeatures" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ - "alsa", - "core-foundation-sys 0.8.4", - "coreaudio-rs", - "dasp_sample", - "jni 0.19.0", - "js-sys", "libc", - "mach2", - "ndk", - "ndk-context", - "oboe", - "once_cell", - "parking_lot 0.12.1", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "windows 0.46.0", ] [[package]] @@ -1722,12 +1327,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "critical-section" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" - [[package]] name = "crossbeam" version = "0.8.2" @@ -1765,14 +1364,14 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.8.0", + "memoffset 0.9.0", "scopeguard", ] @@ -1788,13 +1387,23 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + [[package]] name = "csscolorparser" version = "0.6.2" @@ -1810,47 +1419,25 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" dependencies = [ - "bitflags", - "libloading", + "bitflags 1.3.2", + "libloading 0.7.4", "winapi", ] [[package]] -name = "dasp_sample" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "directories" -version = "5.0.1" +name = "data-encoding" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" -dependencies = [ - "dirs-sys", -] +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] -name = "dirs-sys" -version = "0.4.1" +name = "digest" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", + "block-buffer", + "crypto-common", ] [[package]] @@ -1867,7 +1454,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.31", ] [[package]] @@ -1878,54 +1465,44 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "ecolor" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f99fe3cac305af9d6d92971af60d0f7ea4d783201ef1673571567b6699964d9" +checksum = "2e479a7fa3f23d4e794f8b2f8b3568dd4e47886ad1b12c9c095e141cb591eb63" dependencies = [ "bytemuck", ] [[package]] name = "egui" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6412a21e0bde7c0918f7fb44bbbb86b5e1f88e63c026a4e747cc7af02f76dfbe" +checksum = "a3aef8ec3ae1b772f340170c65bf27d5b8c28f543a0116c844d2ac08d01123e7" dependencies = [ "ahash 0.8.3", "epaint", "nohash-hasher", ] -[[package]] -name = "egui_extras" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f051342e97dfa2445107cb7d2e720617f5c840199b5cb4fe0ffcf481fcf5cce" -dependencies = [ - "egui", - "serde", -] - [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "emath" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ecd80612937e0267909d5351770fe150004e24dab93954f69ca62eecd3f77e" +checksum = "3857d743a6e0741cdd60b622a74c7a36ea75f5f8f11b793b41d905d2c9721a4b" dependencies = [ "bytemuck", ] [[package]] name = "encase" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6591f13a63571c4821802eb5b10fd1155b1290bce87086440003841c8c3909b" +checksum = "8fce2eeef77fd4a293a54b62aa00ac9daebfbcda4bf8998c5a815635b004aa1c" dependencies = [ "const_panic", "encase_derive", @@ -1935,38 +1512,29 @@ dependencies = [ [[package]] name = "encase_derive" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1da6deed1f8b6f5909616ffa695f63a5de54d6a0f084fa715c70c8ed3abac9" +checksum = "0e520cde08cbf4f7cc097f61573ec06ce467019803de8ae82fb2823fa1554a0e" dependencies = [ "encase_derive_impl", ] [[package]] name = "encase_derive_impl" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae489d58959f3c4cdd1250866a05acfb341469affe4fced71aff3ba228be1693" +checksum = "3fe2568f851fd6144a45fa91cfed8fe5ca8fc0b56ba6797bfc1ed2771b90e37c" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", -] - -[[package]] -name = "encoding_rs" -version = "0.8.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" -dependencies = [ - "cfg-if", + "syn 2.0.31", ] [[package]] name = "epaint" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12e78b5c58a1f7f621f9d546add2adce20636422c9b251e29f749e8a2f713c95" +checksum = "09333964d4d57f40a85338ba3ca5ed4716070ab184dcfed966b35491c5c64f3b" dependencies = [ "ab_glyph", "ahash 0.8.3", @@ -1975,37 +1543,22 @@ dependencies = [ "ecolor", "emath", "nohash-hasher", - "parking_lot 0.12.1", + "parking_lot", ] [[package]] -name = "erased-serde" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2b0c2380453a92ea8b6c8e5f64ecaafccddde8ceab55ff7a8ac1029f894569" -dependencies = [ - "serde", -] - -[[package]] -name = "errno" -version = "0.3.1" +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "erased-serde" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" dependencies = [ - "cc", - "libc", + "serde", ] [[package]] @@ -2033,28 +1586,6 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure", -] - [[package]] name = "fastrand" version = "1.9.0" @@ -2075,13 +1606,13 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall", "windows-sys 0.48.0", ] @@ -2093,12 +1624,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] @@ -2110,16 +1641,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "fluent" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" -dependencies = [ - "fluent-bundle", - "unic-langid", -] - [[package]] name = "fluent-bundle" version = "0.15.2" @@ -2154,29 +1675,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "fluent_content" -version = "0.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38dc4630a89c85160410fd062826b505218a0ca68121f92d9fbd9a0e71c1a148" -dependencies = [ - "fluent", - "fluent-langneg", - "intl-memoizer", - "thiserror", - "tracing", - "unic-langid", -] - -[[package]] -name = "flume" -version = "0.10.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" -dependencies = [ - "spin 0.9.8", -] - [[package]] name = "fnv" version = "1.0.7" @@ -2222,48 +1720,12 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" -[[package]] -name = "futures" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", - "futures-sink", -] - [[package]] name = "futures-core" version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" -[[package]] -name = "futures-executor" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - [[package]] name = "futures-io" version = "0.3.28" @@ -2286,87 +1748,43 @@ dependencies = [ ] [[package]] -name = "futures-macro" -version = "0.3.28" +name = "fxhash" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.18", + "byteorder", ] [[package]] -name = "futures-sink" -version = "0.3.28" +name = "generic-array" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] [[package]] -name = "futures-task" -version = "0.3.28" +name = "gethostname" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +dependencies = [ + "libc", + "winapi", +] [[package]] -name = "futures-util" -version = "0.3.28" +name = "getrandom" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "generator" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "windows 0.48.0", -] - -[[package]] -name = "gethostname" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", ] [[package]] @@ -2382,22 +1800,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "ggrs" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1419c3c38e579884b075b99a8ade2ca507e87a2bde81940c6fe4aea895696831" -dependencies = [ - "bincode", - "bitfield-rle", - "bytemuck", - "instant", - "js-sys", - "parking_lot 0.11.2", - "rand 0.8.5", - "serde", -] - [[package]] name = "gilrs" version = "0.10.2" @@ -2413,9 +1815,9 @@ dependencies = [ [[package]] name = "gilrs-core" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd745b0cb1a207756e8fabacf5623066ad6aa543ea0be4bab34e897e6bbe24f9" +checksum = "5ccc99e9b8d63ffcaa334c4babfa31f46e156618a11f63efb6e8e6bcb37b830d" dependencies = [ "core-foundation", "io-kit-sys", @@ -2423,55 +1825,35 @@ dependencies = [ "libc", "libudev-sys", "log", - "nix 0.26.2", + "nix 0.26.4", "uuid", "vec_map", "wasm-bindgen", "web-sys", - "windows 0.48.0", + "windows 0.51.1", ] [[package]] name = "gimli" -version = "0.27.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "glam" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e4afd9ad95555081e109fe1d21f2a30c691b5f0919c67dfa690a2e1eb6bd51c" +checksum = "42218cb640844e3872cc3c153dc975229e080a6c4733b34709ef445610550226" dependencies = [ "bytemuck", - "num-traits", "serde", ] -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "globset" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" -dependencies = [ - "aho-corasick 0.7.20", - "bstr", - "fnv", - "log", - "regex", -] - [[package]] name = "glow" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "807edf58b70c0b5b2181dd39fe1839dbdb3ba02645630dc5f753e23da307f762" +checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728" dependencies = [ "js-sys", "slotmap", @@ -2485,7 +1867,7 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gpu-alloc-types", ] @@ -2495,7 +1877,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -2517,9 +1899,9 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gpu-descriptor-types", - "hashbrown", + "hashbrown 0.12.3", ] [[package]] @@ -2528,7 +1910,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -2542,65 +1924,40 @@ dependencies = [ ] [[package]] -name = "hash32" -version = "0.2.1" +name = "hashbrown" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "byteorder", + "ahash 0.7.6", ] [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" dependencies = [ - "ahash 0.7.6", + "ahash 0.8.3", + "allocator-api2", "serde", ] [[package]] name = "hassle-rs" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90601c6189668c7345fc53842cb3f3a3d872203d523be1b3cb44a36a3e62fb85" +checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "com-rs", "libc", - "libloading", + "libloading 0.7.4", "thiserror", "widestring", "winapi", ] -[[package]] -name = "heapless" -version = "0.7.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" -dependencies = [ - "atomic-polyfill", - "hash32", - "rustc_version", - "serde", - "spin 0.9.8", - "stable_deref_trait", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - [[package]] name = "hex" version = "0.4.3" @@ -2609,12 +1966,12 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hexasphere" -version = "8.1.0" +version = "9.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd41d443f978bfa380a6dad58b62a08c43bcb960631f13e9d015b911eaf73588" +checksum = "7cb3df16a7bcb1b5bc092abd55e14f77ca70aea14445026e264586fc62889a10" dependencies = [ + "constgebra", "glam", - "once_cell", ] [[package]] @@ -2658,21 +2015,11 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "if-addrs" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc0fa01ffc752e9dbc72818cdb072cd028b86be5e09dd04c5a643704fe101a9" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "image" -version = "0.24.6" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" dependencies = [ "bytemuck", "byteorder", @@ -2690,17 +2037,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", "serde", ] +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + [[package]] name = "inotify" version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" dependencies = [ - "bitflags", + "bitflags 1.3.2", "inotify-sys", "libc", ] @@ -2726,12 +2083,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "interpolation" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b7357d2bbc5ee92f8e899ab645233e43d21407573cceb37fed8bc3dede2c02" - [[package]] name = "intl-memoizer" version = "0.5.1" @@ -2757,33 +2108,10 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b2d4429acc1deff0fbdece0325b4997bdb02b2c245ab7023fd5deca0f6348de" dependencies = [ - "core-foundation-sys 0.8.4", + "core-foundation-sys", "mach2", ] -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "is-terminal" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" -dependencies = [ - "hermit-abi", - "io-lifetimes", - "rustix", - "windows-sys 0.48.0", -] - [[package]] name = "itertools" version = "0.10.5" @@ -2795,37 +2123,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "jni" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - -[[package]] -name = "jni" -version = "0.20.0" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jni" @@ -2866,9 +2166,9 @@ checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -2877,87 +2177,12 @@ dependencies = [ name = "jumpy" version = "0.7.0" dependencies = [ - "anyhow", - "async-channel", - "async-timer", - "bevy", - "bevy-inspector-egui", - "bevy_console", - "bevy_dylib", - "bevy_egui", - "bevy_fluent", - "bevy_framepace", - "bevy_kira_audio", - "bevy_tweening", - "bitfield", - "bones_bevy_asset", "bones_bevy_renderer", - "bones_lib", - "bones_matchmaker_proto", - "byte-pool", - "bytemuck", - "bytes", - "chrono", - "clap", - "console_error_panic_hook", - "directories", - "downcast-rs", - "egui_extras", - "either", - "fluent", - "fluent_content", - "futures-lite", - "getrandom 0.2.10", - "ggrs", - "js-sys", - "jumpy_core", - "leafwing-input-manager", - "log", - "mdns-sd", - "mimalloc", - "normalize-path", - "numquant", - "once_cell", - "peg", - "ping-rs", - "postcard", - "puffin", - "puffin_egui", - "quinn", - "quinn_runtime_bevy", - "rand 0.8.5", - "rcgen", - "rustls", - "serde", - "serde_yaml", - "smallvec", - "thiserror", - "tracing", - "tracing-core", - "tracing-log", - "tracing-subscriber", - "tracing-tracy", - "tracing-wasm", - "turborand", - "type_ulid", - "unic-langid", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "jumpy_core" -version = "0.7.0" -dependencies = [ - "bevy", - "bones_bevy_asset", - "bones_lib", - "bytemuck", - "csscolorparser", - "glam", + "bones_framework", "humantime-serde", - "indexmap", + "indexmap 2.0.0", "nalgebra", + "once_cell", "ordered-float", "petgraph", "puffin", @@ -2966,7 +2191,6 @@ dependencies = [ "shiftnanigans", "tracing", "turborand", - "type_ulid", ] [[package]] @@ -2976,27 +2200,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" dependencies = [ "libc", - "libloading", + "libloading 0.7.4", "pkg-config", ] -[[package]] -name = "kira" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e53aef6f6ec851da68a0ad6d6283bd99ea1a9164f38fd7ac353e28ccd6f5cda" -dependencies = [ - "atomic-arena", - "cpal", - "ringbuf", - "symphonia", -] - [[package]] name = "kqueue" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" dependencies = [ "kqueue-sys", "libc", @@ -3004,11 +2216,11 @@ dependencies = [ [[package]] name = "kqueue-sys" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", ] @@ -3019,53 +2231,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "leafwing-input-manager" -version = "0.9.2" +name = "libc" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca8bb439a17e3a964829170cd0252ad54d25a22cb9eb07ec888a7c923d94e05" -dependencies = [ - "bevy", - "derive_more", - "fixedbitset", - "itertools", - "leafwing_input_manager_macros", - "once_cell", - "petitset", - "serde", -] +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] -name = "leafwing_input_manager_macros" -version = "0.9.0" +name = "libloading" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11aefabfcc9ef0a78bc97eea053d2f1bb050d5278a4134bdc1b769064a90064a" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", + "cfg-if", + "winapi", ] -[[package]] -name = "libc" -version = "0.2.146" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" - [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" dependencies = [ "cfg-if", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -3074,16 +2262,6 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" -[[package]] -name = "libmimalloc-sys" -version = "0.1.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "libudev-sys" version = "0.1.4" @@ -3094,12 +2272,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - [[package]] name = "lock_api" version = "0.4.10" @@ -3112,22 +2284,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.18" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" - -[[package]] -name = "loom" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" -dependencies = [ - "cfg-if", - "generator", - "scoped-tls", - "tracing", - "tracing-subscriber", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lyon_algorithms" @@ -3152,9 +2311,9 @@ dependencies = [ [[package]] name = "lyon_path" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8358c012e5651e4619cfd0b5b75c0f77866181a01b0909aab4bae14adf660" +checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45" dependencies = [ "lyon_geom", "num-traits", @@ -3195,7 +2354,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "regex-automata", + "regex-automata 0.1.10", ] [[package]] @@ -3209,22 +2368,16 @@ dependencies = [ ] [[package]] -name = "mdns-sd" -version = "0.7.3" +name = "maybe-owned" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "411616191b060924bcee8ef7d2f56f186386c8808a9e5db5d9f4ebd25bdeaa97" -dependencies = [ - "flume", - "if-addrs", - "polling", - "socket2 0.4.9", -] +checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "memoffset" @@ -3237,9 +2390,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -3250,7 +2403,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "core-graphics-types", "foreign-types", @@ -3258,30 +2411,6 @@ dependencies = [ "objc", ] -[[package]] -name = "mimalloc" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" -dependencies = [ - "libmimalloc-sys", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.7.1" @@ -3306,18 +2435,17 @@ dependencies = [ [[package]] name = "naga" -version = "0.11.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c3d4269bcb7d50121097702fde1afb75f4ea8083aeb7a55688dcf289a853271" +checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb" dependencies = [ "bit-set", - "bitflags", + "bitflags 1.3.2", "codespan-reporting", "hexf-parse", - "indexmap", + "indexmap 1.9.3", "log", "num-traits", - "petgraph", "pp-rs", "rustc-hash", "spirv", @@ -3326,11 +2454,31 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "naga_oil" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8be942a5c21c58b9b0bf4d9b99db3634ddb7a916f8e1d1d0b71820cc4150e56b" +dependencies = [ + "bit-set", + "codespan-reporting", + "data-encoding", + "indexmap 1.9.3", + "naga", + "once_cell", + "regex", + "regex-syntax 0.6.29", + "rustc-hash", + "thiserror", + "tracing", + "unicode-ident", +] + [[package]] name = "nalgebra" -version = "0.32.2" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d68d47bba83f9e2006d117a9a33af1524e655516b8919caac694427a6fb1e511" +checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa" dependencies = [ "approx", "glam", @@ -3345,31 +2493,25 @@ dependencies = [ [[package]] name = "nalgebra-macros" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766" +checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998" dependencies = [ "proc-macro2", "quote", "syn 1.0.109", ] -[[package]] -name = "natord" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c" - [[package]] name = "ndk" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "jni-sys", "ndk-sys", - "num_enum", + "num_enum 0.5.11", "raw-window-handle", "thiserror", ] @@ -3395,7 +2537,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.6.5", @@ -3403,14 +2545,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", - "static_assertions", ] [[package]] @@ -3430,38 +2571,23 @@ dependencies = [ "rand_xorshift", ] -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "normalize-path" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf22e319b2e3cb517350572e3b70c6822e0a520abfb5c78f690e829a73e8d9f2" - [[package]] name = "notify" -version = "5.2.0" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729f63e1ca555a43fe3efa4f3efdf4801c479da85b432242a7b726f353c88486" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags", + "bitflags 2.4.0", "crossbeam-channel", "filetime", "fsevent-sys", "inotify", "kqueue", "libc", + "log", "mio", "walkdir", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -3485,9 +2611,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ "num-traits", ] @@ -3526,31 +2652,30 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", "libm", ] [[package]] -name = "num_cpus" -version = "1.16.0" +name = "num_enum" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ - "hermit-abi", - "libc", + "num_enum_derive 0.5.11", ] [[package]] name = "num_enum" -version = "0.5.11" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" dependencies = [ - "num_enum_derive", + "num_enum_derive 0.6.1", ] [[package]] @@ -3566,10 +2691,16 @@ dependencies = [ ] [[package]] -name = "numquant" -version = "0.2.0" +name = "num_enum_derive" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54809e43d79aa532432c0d03c6adf62fdd96f2e152b90cef6cd9a316c3da4d99" +checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.31", +] [[package]] name = "objc" @@ -3638,54 +2769,19 @@ dependencies = [ [[package]] name = "object" -version = "0.30.4" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] -[[package]] -name = "oboe" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0" -dependencies = [ - "jni 0.20.0", - "ndk", - "ndk-context", - "num-derive", - "num-traits", - "oboe-sys", -] - -[[package]] -name = "oboe-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2" -dependencies = [ - "cc", -] - [[package]] name = "once_cell" version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - [[package]] name = "optional" version = "0.5.0" @@ -3694,28 +2790,22 @@ checksum = "978aa494585d3ca4ad74929863093e87cac9790d81fe7aba2b3dc2890643a0fc" [[package]] name = "orbclient" -version = "0.3.45" +version = "0.3.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "221d488cd70617f1bd599ed8ceb659df2147d9393717954d82a0f5e8032a6ab1" +checksum = "8378ac0dfbd4e7895f2d2c1f1345cab3836910baf3a300b000d04250f0c8428f" dependencies = [ - "redox_syscall 0.3.5", + "redox_syscall", ] [[package]] name = "ordered-float" -version = "3.7.0" +version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213" +checksum = "2a54938017eacd63036332b4ae5c8a49fc8c0c1d6d629893057e4f13609edd06" dependencies = [ "num-traits", ] -[[package]] -name = "os_str_bytes" -version = "6.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" - [[package]] name = "overload" version = "0.1.1" @@ -3737,17 +2827,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - [[package]] name = "parking_lot" version = "0.12.1" @@ -3755,21 +2834,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.8", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] @@ -3780,23 +2845,23 @@ checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall", "smallvec", - "windows-targets 0.48.0", + "windows-targets 0.48.5", ] [[package]] name = "parry2d" -version = "0.13.4" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62cf99dd4c1e7e6425ecea8a4a0d8682dbf1861332d3e7803d576ed6fc64fa67" +checksum = "104ae65232e20477a98f9f1e75ca9850eae24a2ea846a2b1a0af03ad752136ce" dependencies = [ "approx", "arrayvec", - "bitflags", + "bitflags 1.3.2", "downcast-rs", "either", - "indexmap", + "indexmap 1.9.3", "nalgebra", "num-derive", "num-traits", @@ -3809,51 +2874,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "peg" -version = "0.8.1" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a07f2cafdc3babeebc087e499118343442b742cc7c31b4d054682cc598508554" -dependencies = [ - "peg-macros", - "peg-runtime", -] - -[[package]] -name = "peg-macros" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a90084dc05cf0428428e3d12399f39faad19b0909f64fb9170c9fdd6d9cd49b" -dependencies = [ - "peg-runtime", - "proc-macro2", - "quote", -] - -[[package]] -name = "peg-runtime" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa00462b37ead6d11a82c9d568b26682d78e0477dc02d1966c013af80969739" - -[[package]] -name = "pem" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" -dependencies = [ - "base64 0.13.1", -] +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "percent-encoding" @@ -3863,28 +2886,19 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "petgraph" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap", -] - -[[package]] -name = "petitset" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1a50d821a2526af6d5756c23c68e453532a986e361a3e12c9cc7fe61d862ac" -dependencies = [ - "serde", + "indexmap 2.0.0", ] [[package]] name = "phf" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_macros", "phf_shared", @@ -3892,9 +2906,9 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ "phf_shared", "rand 0.8.5", @@ -3902,70 +2916,31 @@ dependencies = [ [[package]] name = "phf_macros" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ "phf_generator", "phf_shared", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.31", ] [[package]] name = "phf_shared" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ "siphasher", ] -[[package]] -name = "pin-project" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.18", -] - [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "ping-rs" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d873f038f84371f9c7fa13f6afea4d5f1fbcd5070ba8eb7af2a6d41c768eff8b" -dependencies = [ - "futures", - "mio", - "paste", - "socket2 0.4.9", - "windows 0.43.0", -] +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pkg-config" @@ -3975,231 +2950,75 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "png" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" -dependencies = [ - "bitflags", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide 0.7.1", -] - -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "postcard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa512cd0d087cc9f99ad30a1bf64795b67871edbead083ffc3a4dfafa59aa00" -dependencies = [ - "cobs", - "heapless", - "serde", -] - -[[package]] -name = "pp-rs" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb458bb7f6e250e6eb79d5026badc10a3ebb8f9a15d1fff0f13d17c71f4d6dee" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "pretty-type-name" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f73cdaf19b52e6143685c3606206e114a4dfa969d6b14ec3894c88eb38bd4b" - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "profiling" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332cd62e95873ea4f41f3dfd6bbbfc5b52aec892d7e8d534197c4720a0bbbab2" -dependencies = [ - "profiling-procmacros", - "tracing", -] - -[[package]] -name = "profiling-procmacros" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a10adb8d151bb1280afb8bed41ae5db26be1b056964947133c7525b0bf39c0b0" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] -name = "puffin" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f99b70359a44d98fceb167734e8cc19e232fe885a547f1b622e66d8099931b6" -dependencies = [ - "anyhow", - "bincode", - "byteorder", - "instant", - "js-sys", - "once_cell", - "parking_lot 0.12.1", - "ruzstd", - "serde", - "zstd", + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", ] [[package]] -name = "puffin_egui" -version = "0.21.0" +name = "pp-rs" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180408bd5816f172326f52cca2b9cc335ad36db5e40f46210f7d20ed847ce15c" +checksum = "bb458bb7f6e250e6eb79d5026badc10a3ebb8f9a15d1fff0f13d17c71f4d6dee" dependencies = [ - "egui", - "indexmap", - "instant", - "natord", - "once_cell", - "puffin", - "time", - "vec1", + "unicode-xid", ] [[package]] -name = "quinn" -version = "0.10.1" +name = "ppv-lite86" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21252f1c0fc131f1b69182db8f34837e8a69737b8251dff75636a9be0518c324" -dependencies = [ - "bytes", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash", - "rustls", - "thiserror", - "tokio", - "tracing", -] +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] -name = "quinn-proto" -version = "0.10.1" +name = "proc-macro-crate" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85af4ed6ee5a89f26a26086e9089a6643650544c025158449a3626ebf72884b3" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ - "bytes", - "rand 0.8.5", - "ring", - "rustc-hash", - "rustls", - "rustls-native-certs", - "slab", - "thiserror", - "tinyvec", - "tracing", + "once_cell", + "toml_edit", ] [[package]] -name = "quinn-udp" -version = "0.4.0" +name = "proc-macro2" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6df19e284d93757a9fb91d63672f7741b129246a669db09d1c0063071debc0c0" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ - "bytes", - "libc", - "socket2 0.5.3", - "tracing", - "windows-sys 0.48.0", + "unicode-ident", ] [[package]] -name = "quinn_runtime_bevy" -version = "0.2.0" +name = "profiling" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45f10e75d83c7aec79a6aa46f897075890e156b105eebe51cfa0abce51af025f" + +[[package]] +name = "puffin" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07483e0846c9ad53e823f0d5f1638b6853f5bf1df212bbb8ead79ff9785de380" +checksum = "76425abd4e1a0ad4bd6995dd974b52f414fca9974171df8e3708b3e660d05a21" dependencies = [ - "async-executor", - "async-io", - "bevy_tasks", - "futures-lite", - "pin-project", - "quinn", - "quinn-proto", - "quinn-udp", + "anyhow", + "byteorder", + "cfg-if", + "instant", + "once_cell", ] [[package]] name = "quote" -version = "1.0.28" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -4311,10 +3130,10 @@ dependencies = [ "approx", "arrayvec", "bit-vec", - "bitflags", + "bitflags 1.3.2", "crossbeam", "downcast-rs", - "indexmap", + "indexmap 1.9.3", "nalgebra", "num-derive", "num-traits", @@ -4335,84 +3154,31 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" -[[package]] -name = "rayon" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[package]] -name = "rcgen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" -dependencies = [ - "pem", - "ring", - "time", - "yasna", -] - [[package]] name = "rectangle-pack" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0d463f2884048e7153449a55166f91028d5b0ea53c79377099ce4e8cf0cf9bb" -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - [[package]] name = "redox_syscall" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.16", - "thiserror", + "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.8.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ - "aho-corasick 1.0.2", + "aho-corasick", "memchr", - "regex-syntax 0.7.2", + "regex-automata 0.3.8", + "regex-syntax 0.7.5", ] [[package]] @@ -4424,6 +3190,17 @@ dependencies = [ "regex-syntax 0.6.29", ] +[[package]] +name = "regex-automata" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.5", +] + [[package]] name = "regex-syntax" version = "0.6.29" @@ -4432,39 +3209,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "renderdoc-sys" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157" - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted", - "web-sys", - "winapi", -] - -[[package]] -name = "ringbuf" -version = "0.3.3" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79abed428d1fd2a128201cec72c5f6938e2da607c6f3745f769fabea399d950a" -dependencies = [ - "crossbeam-utils", -] +checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" [[package]] name = "robust" @@ -4474,13 +3227,14 @@ checksum = "e5864e7ef1a6b7bcf1d6ca3f655e65e724ed3b52546a0d0a663c991522f552ea" [[package]] name = "ron" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ - "base64 0.13.1", - "bitflags", + "base64", + "bitflags 2.4.0", "serde", + "serde_derive", ] [[package]] @@ -4495,100 +3249,17 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.37.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustls" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e" -dependencies = [ - "log", - "ring", - "rustls-webpki", - "sct", -] - -[[package]] -name = "rustls-native-certs" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" -dependencies = [ - "base64 0.21.2", -] - -[[package]] -name = "rustls-webpki" -version = "0.100.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustversion" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" - -[[package]] -name = "ruzstd" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a15e661f0f9dac21f3494fe5d23a6338c0ac116a2d22c2b63010acd89467ffe" -dependencies = [ - "byteorder", - "thiserror", - "twox-hash", -] - [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "safe_arch" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62a7484307bd40f8f7ccbacccac730108f2cae119a3b11c74485b48aa9ea650f" +checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354" dependencies = [ "bytemuck", ] @@ -4602,59 +3273,11 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "schannel" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" -dependencies = [ - "windows-sys 0.42.0", -] - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - [[package]] name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "security-framework" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys 0.8.4", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" -dependencies = [ - "core-foundation-sys 0.8.4", - "libc", -] +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "self_cell" @@ -4664,35 +3287,38 @@ checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af" [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +dependencies = [ + "serde", +] [[package]] name = "serde" -version = "1.0.163" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.31", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -4701,11 +3327,11 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.21" +version = "0.9.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9d684e3ec7de3bf5466b32bd75303ac16f0736426e5a4e0d6e489559ce1249c" +checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" dependencies = [ - "indexmap", + "indexmap 2.0.0", "itoa", "ryu", "serde", @@ -4713,10 +3339,15 @@ dependencies = [ ] [[package]] -name = "sha1_smol" -version = "1.0.0" +name = "sha2" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] [[package]] name = "sharded-slab" @@ -4740,12 +3371,6 @@ dependencies = [ "nohash-hasher", ] -[[package]] -name = "shlex" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" - [[package]] name = "simba" version = "0.8.1" @@ -4762,21 +3387,21 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -4792,31 +3417,20 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" dependencies = [ "serde", ] [[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.3" +name = "smol_str" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" dependencies = [ - "libc", - "windows-sys 0.48.0", + "serde", ] [[package]] @@ -4831,46 +3445,21 @@ dependencies = [ "smallvec", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spin_sleep" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cafa7900db085f4354dbc7025e25d7a839a14360ea13b5fc4fd717f2d3b23134" -dependencies = [ - "once_cell", - "winapi", -] - [[package]] name = "spirv" version = "0.2.0+1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" dependencies = [ - "bitflags", + "bitflags 1.3.2", "num-traits", ] [[package]] -name = "stable_deref_trait" -version = "1.2.0" +name = "sptr" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" [[package]] name = "static_assertions" @@ -4884,12 +3473,6 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "svg_fmt" version = "0.4.1" @@ -4905,77 +3488,6 @@ dependencies = [ "siphasher", ] -[[package]] -name = "symphonia" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62e48dba70095f265fdb269b99619b95d04c89e619538138383e63310b14d941" -dependencies = [ - "lazy_static", - "symphonia-codec-vorbis", - "symphonia-core", - "symphonia-format-ogg", - "symphonia-metadata", -] - -[[package]] -name = "symphonia-codec-vorbis" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3953397e3506aa01350c4205817e4f95b58d476877a42f0458d07b665749e203" -dependencies = [ - "log", - "symphonia-core", - "symphonia-utils-xiph", -] - -[[package]] -name = "symphonia-core" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c73eb88fee79705268cc7b742c7bc93a7b76e092ab751d0833866970754142" -dependencies = [ - "arrayvec", - "bitflags", - "bytemuck", - "lazy_static", - "log", -] - -[[package]] -name = "symphonia-format-ogg" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bf1a00ccd11452d44048a0368828040f778ae650418dbd9d8765b7ee2574c8d" -dependencies = [ - "log", - "symphonia-core", - "symphonia-metadata", - "symphonia-utils-xiph", -] - -[[package]] -name = "symphonia-metadata" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89c3e1937e31d0e068bbe829f66b2f2bfaa28d056365279e0ef897172c3320c0" -dependencies = [ - "encoding_rs", - "lazy_static", - "log", - "symphonia-core", -] - -[[package]] -name = "symphonia-utils-xiph" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a450ca645b80d69aff8b35576cbfdc7f20940b29998202aab910045714c951f8" -dependencies = [ - "symphonia-core", - "symphonia-metadata", -] - [[package]] name = "syn" version = "1.0.109" @@ -4989,9 +3501,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "2.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" dependencies = [ "proc-macro2", "quote", @@ -4999,25 +3511,22 @@ dependencies = [ ] [[package]] -name = "synstructure" -version = "0.12.6" +name = "sys-locale" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", + "libc", ] [[package]] name = "sysinfo" -version = "0.28.4" +version = "0.29.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c2f3ca6693feb29a89724516f016488e9aafc7f37264f898593ee4b942f31b" +checksum = "0a18d114d420ada3a891e6bc8e96a2023402203296a47cdd65083377dad18ba5" dependencies = [ "cfg-if", - "core-foundation-sys 0.8.4", + "core-foundation-sys", "libc", "ntapi", "once_cell", @@ -5041,22 +3550,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.31", ] [[package]] @@ -5071,42 +3580,15 @@ dependencies = [ [[package]] name = "tiff" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" dependencies = [ "flate2", "jpeg-decoder", "weezl", ] -[[package]] -name = "time" -version = "0.3.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" -dependencies = [ - "itoa", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" - -[[package]] -name = "time-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" -dependencies = [ - "time-core", -] - [[package]] name = "tinystr" version = "0.7.1" @@ -5131,30 +3613,19 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" -[[package]] -name = "tokio" -version = "1.28.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" -dependencies = [ - "autocfg", - "pin-project-lite", - "windows-sys 0.48.0", -] - [[package]] name = "toml_datetime" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" [[package]] name = "toml_edit" -version = "0.19.10" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap", + "indexmap 2.0.0", "toml_datetime", "winnow", ] @@ -5173,13 +3644,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.31", ] [[package]] @@ -5192,16 +3663,6 @@ dependencies = [ "valuable", ] -[[package]] -name = "tracing-error" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" -dependencies = [ - "tracing", - "tracing-subscriber", -] - [[package]] name = "tracing-log" version = "0.1.3" @@ -5231,17 +3692,6 @@ dependencies = [ "tracing-log", ] -[[package]] -name = "tracing-tracy" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55c48ef3e655220d4e43a6be44aa84f078c3004357251cab45f9cc15551a593e" -dependencies = [ - "tracing-core", - "tracing-subscriber", - "tracy-client", -] - [[package]] name = "tracing-wasm" version = "0.2.1" @@ -5253,31 +3703,11 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "tracy-client" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "434ecabbda9f67eeea1eab44d52f4a20538afa3e2c2770f2efc161142b25b608" -dependencies = [ - "loom", - "once_cell", - "tracy-client-sys", -] - -[[package]] -name = "tracy-client-sys" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d99f5fc382239d08b6bf05bb6206a585bfdb988c878f2499081d0f285ef7819" -dependencies = [ - "cc", -] - [[package]] name = "ttf-parser" -version = "0.19.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44dcf002ae3b32cd25400d6df128c5babec3927cd1eb7ce813cfff20eb6c3746" +checksum = "a464a4b34948a5f67fddd2b823c62d9d92e44be75058b99939eae6c5b6960b33" [[package]] name = "turborand" @@ -5289,16 +3719,6 @@ dependencies = [ "instant", ] -[[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if", - "static_assertions", -] - [[package]] name = "type-map" version = "0.4.0" @@ -5308,28 +3728,6 @@ dependencies = [ "rustc-hash", ] -[[package]] -name = "type_ulid" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5a87db4bdcccfb04d822e736ef808a78a7549c1486c105e371cb73b278c24ae" -dependencies = [ - "type_ulid_macros", - "ulid", -] - -[[package]] -name = "type_ulid_macros" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c65b0fa9e298ac8f3d2ae0593c3a2ffb78db8184b5d3c9640dfbd9a0617b6a53" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "ulid", -] - [[package]] name = "typenum" version = "1.16.0" @@ -5338,11 +3736,12 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ulid" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13a3aaa69b04e5b66cc27309710a569ea23593612387d67daaf102e73aa974fd" +checksum = "0f9d3475df4ff8a8f7804c0fc3394b44fdcfc4fb635717bf05fbb7c41c83a376" dependencies = [ "rand 0.8.5", + "serde", ] [[package]] @@ -5372,9 +3771,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -5399,36 +3798,42 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "unsafe-libyaml" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6" - -[[package]] -name = "untrusted" -version = "0.7.1" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", "percent-encoding", ] +[[package]] +name = "ustr" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b050b13c1933490b043b8238a75bc7676cb49292f49768c9350eabb284eaeb87" +dependencies = [ + "ahash 0.8.3", + "byteorder", + "lazy_static", + "parking_lot", + "serde", +] + [[package]] name = "uuid" -version = "1.3.3" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ "getrandom 0.2.10", "serde", - "sha1_smol", ] [[package]] @@ -5437,24 +3842,22 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" -[[package]] -name = "varinteger" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ea29db9f94ff08bb619656b8120878f280526f71dc88b5262c958a510181812" - -[[package]] -name = "vec1" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bda7c41ca331fe9a1c278a9e7ee055f4be7f5eb1c2b72f079b4ff8b5fce9d5c" - [[package]] name = "vec_map" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +[[package]] +name = "venial" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61584a325b16f97b5b25fcc852eb9550843a251057a5e3e5992d2376f3df4bb2" +dependencies = [ + "proc-macro2", + "quote", +] + [[package]] name = "version_check" version = "0.9.4" @@ -5469,9 +3872,9 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -5491,9 +3894,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5501,24 +3904,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.31", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.36" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -5528,9 +3931,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5538,22 +3941,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.31", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wayland-scanner" @@ -5568,9 +3971,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -5578,13 +3981,13 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd222aa310eb7532e3fd427a5d7db7e44bc0b0cf1c1e21139c345325511a85b6" +checksum = "b2c79b77f525a2d670cb40619d7d9c673d09e0666f72c591ebd7861f84a87e57" dependencies = [ "core-foundation", "home", - "jni 0.21.1", + "jni", "log", "ndk-context", "objc", @@ -5601,16 +4004,16 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" [[package]] name = "wgpu" -version = "0.15.1" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d745a1b6d91d85c33defbb29f0eee0450e1d2614d987e14bf6baf26009d132d7" +checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd" dependencies = [ "arrayvec", "cfg-if", "js-sys", "log", "naga", - "parking_lot 0.12.1", + "parking_lot", "profiling", "raw-window-handle", "smallvec", @@ -5625,20 +4028,20 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.15.1" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7131408d940e335792645a98f03639573b0480e9e2e7cddbbab74f7c6d9f3fff" +checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2" dependencies = [ "arrayvec", "bit-vec", - "bitflags", + "bitflags 2.4.0", "codespan-reporting", - "fxhash", "log", "naga", - "parking_lot 0.12.1", + "parking_lot", "profiling", "raw-window-handle", + "rustc-hash", "smallvec", "thiserror", "web-sys", @@ -5648,20 +4051,19 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.15.4" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdcf61a283adc744bb5453dd88ea91f3f86d5ca6b027661c6c73c7734ae0288b" +checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448" dependencies = [ "android_system_properties", "arrayvec", "ash", "bit-set", - "bitflags", + "bitflags 2.4.0", "block", "core-graphics-types", "d3d12", "foreign-types", - "fxhash", "glow", "gpu-alloc", "gpu-allocator", @@ -5670,16 +4072,17 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading", + "libloading 0.8.0", "log", "metal", "naga", "objc", - "parking_lot 0.12.1", + "parking_lot", "profiling", "range-alloc", "raw-window-handle", "renderdoc-sys", + "rustc-hash", "smallvec", "thiserror", "wasm-bindgen", @@ -5690,20 +4093,20 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.15.2" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32444e121b0bd00cb02c0de32fde457a9491bd44e03e7a5db6df9b1da2f6f110" +checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a" dependencies = [ - "bitflags", + "bitflags 2.4.0", "js-sys", "web-sys", ] [[package]] name = "wide" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40018623e2dba2602a9790faba8d33f2ebdebf4b86561b83928db735f8784728" +checksum = "aa469ffa65ef7e0ba0f164183697b89b854253fd31aeb92358b7b6155177d62f" dependencies = [ "bytemuck", "safe_arch", @@ -5711,9 +4114,9 @@ dependencies = [ [[package]] name = "widestring" -version = "0.5.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" [[package]] name = "winapi" @@ -5757,53 +4160,48 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.43.0" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244" +checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.42.2", ] [[package]] name = "windows" -version = "0.44.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ "windows-implement", "windows-interface", - "windows-targets 0.42.2", + "windows-targets 0.48.5", ] [[package]] name = "windows" -version = "0.46.0" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ - "windows-targets 0.42.2", + "windows-core", + "windows-targets 0.48.5", ] [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.5", ] [[package]] name = "windows-implement" -version = "0.44.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce87ca8e3417b02dc2a8a22769306658670ec92d78f1bd420d6310a67c245c6" +checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" dependencies = [ "proc-macro2", "quote", @@ -5812,30 +4210,15 @@ dependencies = [ [[package]] name = "windows-interface" -version = "0.44.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "853f69a591ecd4f810d29f17e902d40e349fb05b0b11fff63b08b826bfe39c7f" +checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" dependencies = [ "proc-macro2", "quote", "syn 1.0.109", ] -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - [[package]] name = "windows-sys" version = "0.45.0" @@ -5851,7 +4234,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.5", ] [[package]] @@ -5871,17 +4254,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -5892,9 +4275,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -5904,9 +4287,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -5916,9 +4299,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -5928,9 +4311,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -5940,9 +4323,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -5952,9 +4335,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -5964,9 +4347,9 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winit" @@ -5975,7 +4358,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "866db3f712fffba75d31bf0cdecf357c8aeafd158c5b7ab51dba2a2b2d47f196" dependencies = [ "android-activity", - "bitflags", + "bitflags 1.3.2", "cfg_aliases", "core-foundation", "core-graphics", @@ -5990,7 +4373,7 @@ dependencies = [ "orbclient", "percent-encoding", "raw-window-handle", - "redox_syscall 0.3.5", + "redox_syscall", "wasm-bindgen", "wayland-scanner", "web-sys", @@ -6000,9 +4383,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.4.6" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] @@ -6051,45 +4434,6 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52839dc911083a8ef63efa4d039d1f58b5e409f923e44c80828f206f66e5541c" - -[[package]] -name = "yasna" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" -dependencies = [ - "time", -] - -[[package]] -name = "zstd" -version = "0.12.3+zstd.1.5.2" +version = "0.8.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "6.0.5+zstd.1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" -dependencies = [ - "cc", - "libc", - "pkg-config", -] +checksum = "1eee6bf5926be7cf998d7381a9a23d833fd493f6a8034658a9505a4dc4b20444" diff --git a/Cargo.toml b/Cargo.toml index a79a52f7cb..08cc5f82d0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,103 +7,102 @@ license = "MIT OR Apache-2.0" name = "jumpy" version = "0.7.0" -[workspace] -members = [".", "core"] - [features] default = [] -# Enable to simulate horrible network latency/slowness -debug-network-slowdown = ["async-timer", "turborand"] -# Enable bevy tracing scopes in profiling and tracy profiler support. -profiling-full= ["bevy/trace", "dep:tracing-tracy"] +# # Enable to simulate horrible network latency/slowness +# debug-network-slowdown = ["async-timer", "turborand"] +# # Enable bevy tracing scopes in profiling and tracy profiler support. +# profiling-full = ["bevy/trace", "dep:tracing-tracy"] [dependencies] -bones_bevy_asset = "0.2" -bones_bevy_renderer = "0.2" -bones_lib = { version = "0.2", features = ["bevy"] } -type_ulid = "0.2" - -anyhow = "1.0" -async-channel = "1.7" -bevy_console = "0.7" -bevy-inspector-egui = { version = "0.18", default-features = false } -bevy_egui = "0.20" -bevy_fluent = "0.6" -bevy_framepace = "0.12" -bevy_kira_audio = { version = "0.15", features = ["ogg"], default-features = false } -bevy_tweening = { version = "0.7", default-features = false } - -async-timer = { version = "0.7", optional = true } -bytemuck = "1.12" -clap = { version = "4.0", features = ["derive", "env"] } -directories = "5.0" -downcast-rs = "1.2" -egui_extras = "0.21" -either = "1.8" -fluent = "0.16" -fluent_content = "0.0" -futures-lite = "1.12" -getrandom = { version = "0.2", features = ["js"] } -jumpy_core = { path = "./core" } -leafwing-input-manager = { version = "0.9", default-features = false } -log = { version = "0.4", features = ["release_max_level_debug"] } -normalize-path = "0.2" -once_cell = "1.17" -peg = "0.8" -puffin = { version = "0.15", features = ["web"] } -puffin_egui = "0.21" -rand = "0.8" -serde = { version = "1.0", features = ["derive"] } -serde_yaml = "0.9" -thiserror = "1.0" -tracing = { version = "0.1", features = ["release_max_level_debug"] } -tracing-core = "0.1" -tracing-log = "0.1" -tracing-subscriber = "0.3" -unic-langid = "0.9" -byte-pool = "0.2.4" - -[dependencies.turborand] -features = ["atomic"] -optional = true -version = "0.10" - -[dependencies.bevy] -default-features = false -features = ["x11", "png", "filesystem_watcher", "bevy_gilrs"] -version = "0.10" - -[dependencies.tracing-tracy] -version = "0.10.0" -default-features = false -features = ["enable", "system-tracing", "context-switch-tracing", "code-transfer"] -optional = true - -[target.'cfg(target_arch = "wasm32")'.dependencies] -wasm-bindgen = "0.2.83" -web-sys = { version = "0.3", features = ["Window", "Location", "Storage"] } -tracing-wasm = "0.2" -console_error_panic_hook = "0.1" -js-sys = "0.3" -chrono = { version = "0.4", default-features = false, features = ["std", "wasmbind"] } - -[target.'cfg(not(target_arch = "wasm32"))'.dependencies] -bevy_dylib = "0.10" -mimalloc = { version = "0.1", default-features = false } -# Networking deps -bitfield = "0.14" -bones_matchmaker_proto = "0.2" -bytes = "1.4" -ggrs = { version = "0.9", features = ["sync-send"] } -mdns-sd = { version = "0.7", default-features = false } -numquant = "0.2" -ping-rs = "0.1" -postcard = { version = "1.0", features = ["alloc"] } -quinn = { version = "0.10", default-features = false, features = ["tls-rustls"] } -rcgen = "0.10" -rustls = { version = "0.21", features = ["dangerous_configuration", "quic"] } -smallvec = "1.10" -quinn_runtime_bevy = "0.2" +bones_framework = { git = "https://github.com/fishfolk/bones" } +bones_bevy_renderer = { git = "https://github.com/fishfolk/bones" } +turborand = { version = "0.10.0", features = ["atomic"] } +tracing = "0.1.37" +puffin = "0.16.0" +petgraph = "0.6.4" +rapier2d = { version = "0.17.2", features = ["debug-render", "enhanced-determinism"] } +indexmap = "2.0.0" +serde = { version = "1.0.188", features = ["derive"] } +shiftnanigans = "0.3.3" +humantime-serde = "1.1.1" +ordered-float = "3.9.1" +nalgebra = { version = "0.32", features = ["glam024"] } +once_cell = "1.18.0" + +# anyhow = "1.0" +# async-channel = "1.7" +# bevy_console = "0.7" +# bevy-inspector-egui = { version = "0.18", default-features = false } +# bevy_egui = "0.21.0" +# bevy_fluent = "0.6" +# bevy_framepace = "0.12" +# bevy_kira_audio = { version = "0.15", features = ["ogg"], default-features = false } +# bevy_tweening = { version = "0.7", default-features = false } + +# async-timer = { version = "0.7", optional = true } +# bytemuck = "1.12" +# clap = { version = "4.0", features = ["derive", "env"] } +# directories = "5.0" +# downcast-rs = "1.2" +# egui_extras = "0.22.0" +# either = "1.8" +# fluent = "0.16" +# fluent_content = "0.0" +# futures-lite = "1.12" +# getrandom = { version = "0.2", features = ["js"] } +# log = { version = "0.4", features = ["release_max_level_debug"] } +# normalize-path = "0.2" +# once_cell = "1.17" +# peg = "0.8" +# puffin = { version = "0.15", features = ["web"] } +# puffin_egui = "0.21" +# rand = "0.8" +# serde = { version = "1.0", features = ["derive"] } +# serde_yaml = "0.9" +# thiserror = "1.0" +# tracing = { version = "0.1", features = ["release_max_level_debug"] } +# tracing-core = "0.1" +# tracing-log = "0.1" +# tracing-subscriber = "0.3" +# unic-langid = "0.9" +# byte-pool = "0.2.4" + +# [dependencies.turborand] +# features = ["atomic"] +# optional = true +# version = "0.10" + +# [dependencies.tracing-tracy] +# version = "0.10.0" +# default-features = false +# features = ["enable", "system-tracing", "context-switch-tracing", "code-transfer"] +# optional = true + +# [target.'cfg(target_arch = "wasm32")'.dependencies] +# wasm-bindgen = "0.2.83" +# web-sys = { version = "0.3", features = ["Window", "Location", "Storage"] } +# tracing-wasm = "0.2" +# console_error_panic_hook = "0.1" +# js-sys = "0.3" +# chrono = { version = "0.4", default-features = false, features = ["std", "wasmbind"] } + +# [target.'cfg(not(target_arch = "wasm32"))'.dependencies] +# mimalloc = { version = "0.1", default-features = false } +# # Networking deps +# bitfield = "0.14" +# bones_matchmaker_proto = "0.2" +# bytes = "1.4" +# ggrs = { version = "0.9", features = ["sync-send"] } +# mdns-sd = { version = "0.7", default-features = false } +# numquant = "0.2" +# ping-rs = "0.1" +# postcard = { version = "1.0", features = ["alloc"] } +# quinn = { version = "0.10", default-features = false, features = ["tls-rustls"] } +# rcgen = "0.11.1" +# rustls = { version = "0.21", features = ["dangerous_configuration", "quic"] } +# smallvec = "1.10" +# quinn_runtime_bevy = "0.2" # Optimize dependencies even in development [profile.dev.package."*"] @@ -112,10 +111,6 @@ debug = 1 # Only keep line numbers opt-level = 3 # Optimize our code a little bit. -[profile.dev.package.jumpy_core] -codegen-units = 512 -opt-level = 1 - [profile.dev] codegen-units = 128 opt-level = 1 @@ -131,6 +126,10 @@ lto = true [package.metadata.cargo-machete] ignored = [ - "tracing", # Needed to add `release_max_level_debug` feature - "getrandom", # Needed to add `js` feature + "tracing", # Needed to add `release_max_level_debug` feature + "getrandom", # Needed to add `js` feature ] + +[patch.'https://github.com/fishfolk/bones'] +bones_framework = { path = "/home/zicklag/git/other/bones/framework_crates/bones_framework" } +bones_bevy_renderer = { path = "/home/zicklag/git/other/bones/framework_crates/bones_bevy_renderer" } diff --git a/Cross.toml b/Cross.toml index 1c380ea814..b2221c03cd 100644 --- a/Cross.toml +++ b/Cross.toml @@ -1,11 +1,11 @@ [target.x86_64-unknown-linux-gnu] pre-build = [ - "dpkg --add-architecture $CROSS_DEB_ARCH", - "apt-get update && apt-get install -y pkg-config libasound2-dev:$CROSS_DEB_ARCH libudev-dev:$CROSS_DEB_ARCH", + "dpkg --add-architecture $CROSS_DEB_ARCH", + "apt-get update && apt-get install -y pkg-config libasound2-dev:$CROSS_DEB_ARCH libudev-dev:$CROSS_DEB_ARCH", ] [target.aarch64-unknown-linux-gnu] pre-build = [ - "dpkg --add-architecture $CROSS_DEB_ARCH", - "apt-get update && apt-get install -y pkg-config libasound2-dev:$CROSS_DEB_ARCH libudev-dev:$CROSS_DEB_ARCH", + "dpkg --add-architecture $CROSS_DEB_ARCH", + "apt-get update && apt-get install -y pkg-config libasound2-dev:$CROSS_DEB_ARCH libudev-dev:$CROSS_DEB_ARCH", ] diff --git a/assets/default.core.yaml b/assets/default.core.yaml deleted file mode 100644 index 73f806fb75..0000000000 --- a/assets/default.core.yaml +++ /dev/null @@ -1,77 +0,0 @@ -config: - respawn_invincibility_time: 2s - -camera: - default_height: 448 - border_right: 300 - border_left: 300 - border_top: 50 - border_bottom: 200 - player_camera_box_size: [100, 250] - min_camera_size: [400, 500] - zoom_in_lerp_factor: 0.05 - zoom_out_lerp_factor: 0.1 - move_lerp_factor: 0.1 - -physics: - terminal_velocity: 30 - friction_lerp: 0.85 - stop_threshold: 1.0 - gravity: 0.6 - -players: - - /player/skins/fishy/fishy.player.yaml - - /player/skins/pescy/pescy.player.yaml - - /player/skins/sharky/sharky.player.yaml - - /player/skins/orcy/orcy.player.yaml - -player_hats: - - /player/hats/pirate.hat.yaml - - /player/hats/straw.hat.yaml - -stable_maps: - - /map/levels/level_1.map.yaml - - /map/levels/level_2.map.yaml - - /map/levels/level_3.map.yaml - - /map/levels/level_4.map.yaml - - /map/levels/level_5.map.yaml - - /map/levels/level_6.map.yaml - - /map/levels/level_7.map.yaml - - /map/levels/level_8.map.yaml - - /map/levels/level_9.map.yaml - - /map/levels/level_10.map.yaml - - /map/levels/level_11.map.yaml - - /map/levels/level_12.map.yaml - - /map/levels/level_13.map.yaml - - /map/levels/level_14.map.yaml - -map_tilesets: - - /map/resources/default_tileset.atlas.yaml - - /map/resources/ground_rock.atlas.yaml - - /map/resources/ground_wood.atlas.yaml - - /map/resources/ground_metal.atlas.yaml - - /map/resources/ship_decorations.atlas.yaml - - /map/resources/coral.atlas.yaml - -map_elements: - - /elements/decoration/anemones/anemones.element.yaml - - /elements/decoration/seaweed/seaweed.element.yaml - - /elements/environment/urchin/urchin.element.yaml - - /elements/environment/fish_school/fish_school.element.yaml - - /elements/environment/crab/crab.element.yaml - - /elements/environment/snail/snail.element.yaml - - /elements/environment/player_spawner/player_spawner.element.yaml - - /elements/environment/sproinger/sproinger.element.yaml - - /elements/environment/slippery/slippery.element.yaml - - /elements/environment/slippery_seaweed/slippery_seaweed.element.yaml - - /elements/item/crate/crate.element.yaml - - /elements/item/grenade/grenade.element.yaml - - /elements/item/kick_bomb/kick_bomb.element.yaml - - /elements/item/mine/mine.element.yaml - - /elements/item/musket/musket.element.yaml - - /elements/item/stomp_boots/stomp_boots.element.yaml - - /elements/item/sword/sword.element.yaml - - /elements/item/sniper_rifle/sniper_rifle.element.yaml - - /elements/environment/coral_spikes/coral_spikes.element.yaml - -experimental_maps: [] diff --git a/assets/default.game.yaml b/assets/default.game.yaml deleted file mode 100644 index 634d3664ce..0000000000 --- a/assets/default.game.yaml +++ /dev/null @@ -1,286 +0,0 @@ -core: default.core.yaml - -music: - title_screen: music/01 fishycuffs.ogg - fight: - - music/02 whalecome.ogg - - music/03 ahoy!.ogg - - music/04 bait the hook.ogg - - music/05 fire in the hole.ogg - - music/06 fishsticks.ogg - - music/07 jolly roger.ogg - - music/08 krill or be krilled.ogg - - music/09 landlubber.ogg - character_screen: music/10 fish bucket.ogg - results_screen: music/11 thar she blows!.ogg - credits: music/12 all hands hoay!.ogg - - -main_menu: - title_font: - family: fairfax - color: FFFFFF - size: 85 - subtitle_font: - family: fairfax - color: FFFFFF - size: 60 - - background_image: - image: ui/menu-background.png - image_size: [896, 480] - - menu_width: 350 - -default_settings: - matchmaking_server: matchmaker.bones.fishfolk.org:65534 - player_controls: - # Gamepad controls - gamepad: - movement: - up: !SingleAxis - axis_type: !Gamepad LeftStickY - positive_low: 0.1 - negative_low: -1.0 - - left: !SingleAxis - axis_type: !Gamepad LeftStickX - positive_low: 1.0 - negative_low: -0.1 - - down: !SingleAxis - axis_type: !Gamepad LeftStickY - positive_low: 1.0 - negative_low: -0.1 - - right: !SingleAxis - axis_type: !Gamepad LeftStickX - positive_low: 0.1 - negative_low: -1.0 - jump: !GamepadButton South - grab: !GamepadButton East - shoot: !GamepadButton West - slide: !GamepadButton North - - # Controls for the first keyboard player ( left side ) - keyboard1: - movement: - up: !Keyboard W - down: !Keyboard S - left: !Keyboard A - right: !Keyboard D - jump: !Keyboard Space - grab: !Keyboard V - shoot: !Keyboard C - slide: !Keyboard B - - # Controls for the second keyboard player ( right side ) - keyboard2: - movement: - up: !Keyboard Up - down: !Keyboard Down - left: !Keyboard Left - right: !Keyboard Right - jump: !Keyboard Comma - grab: !Keyboard RShift - shoot: !Keyboard Period - slide: !Keyboard Slash - -ui_theme: - scale: 0.60 - colors: - positive: 3EC761 - - widgets: - border_radius: 1.5 - default: &default - bg_fill: 3A4444 - bg_stroke: &default-stroke 181425 - text: FFFFFF - hovered: - bg_fill: 566363 - bg_stroke: *default-stroke - text: FFFFFF - active: - bg_fill: 566363 - bg_stroke: 86809B - text: FFFFFF - noninteractive: - bg_fill: 262B44 - bg_stroke: 181425 - text: FFFFFF - menu: *default - debug_window_fill: 262B44 - - font_families: - fairfax: ui/FairfaxSM.ttf - ark: ui/ark-pixel-16px-latin.ttf - - font_styles: - heading: - family: ark - size: 40 - color: FFFFFF - bigger: - family: ark - size: 25 - color: FFFFFF - normal: - family: ark - size: 20 - color: FFFFFF - smaller: - family: ark - size: 15 - color: FFFFFF - - editor: - icons: - elements: - image: ui/editor/Object.png - image_size: [64, 64] - tiles: - image: ui/editor/Tile.png - image_size: [64, 64] - collisions: - image: ui/editor/PointerAndMap.png - image_size: [64, 64] - select: - image: ui/editor/Cursor.png - image_size: [64, 64] - - hud: - font: - family: ark - size: 15 - color: FFFFFF - - player_hud_width: 165 - - portrait_frame: - image: ui/panel.png - image_size: [32, 32] - border_size: - top: 8 - left: 8 - right: 8 - bottom: 8 - - lifebar: - height: 16 - background_image: - image: ui/lifebar.png - image_size: [19, 7] - border_size: - left: 3 - right: 3 - top: 3 - bottom: 3 - scale: 2 - progress_image: - image: ui/lifebar-progress.png - image_size: [1, 1] - - panel: - font_color: FFFFFF - padding: - top: 25 - bottom: 25 - left: 25 - right: 25 - border: - image: ui/panel.png - image_size: [38, 34] - border_size: - top: 11 - bottom: 11 - left: 12 - right: 21 - scale: 4 - - button_styles: - normal: - font: - family: ark - color: FFFFFF - size: 20 - padding: - top: 6 - left: 6 - right: 6 - bottom: 9 - borders: - default: - image: ui/button.png - image_size: [14, 14] - border_size: - top: 5 - bottom: 5 - right: 5 - left: 5 - scale: 2 - focused: - image: ui/button-focused.png - image_size: [14, 14] - border_size: - top: 5 - bottom: 5 - right: 5 - left: 5 - scale: 2 - clicked: - image: ui/button-down.png - image_size: [14, 14] - border_size: - top: 5 - bottom: 5 - right: 5 - left: 5 - scale: 2 - - small: - font: - family: ark - color: FFFFFF - size: 17 - padding: - top: 4 - left: 4 - right: 4 - bottom: 6 - borders: - default: - image: ui/button.png - image_size: [14, 14] - border_size: - top: 5 - bottom: 5 - right: 5 - left: 5 - scale: 2 - focused: - image: ui/button-focused.png - image_size: [14, 14] - border_size: - top: 5 - bottom: 5 - right: 5 - left: 5 - scale: 2 - clicked: - image: ui/button-down.png - image_size: [14, 14] - border_size: - top: 5 - bottom: 5 - right: 5 - left: 5 - scale: 2 - -translations: - # This is the locale that we will fallback to if the selected locale doesn't have - # translation for a certain message. - default_locale: en-US - locales: - - locales/en-US/en-US.ftl.yml - - locales/fr-FR/fr-FR.ftl.yml diff --git a/assets/dummy.yaml b/assets/dummy.yaml new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/assets/dummy.yaml @@ -0,0 +1 @@ +{} diff --git a/assets/elements/decoration/anemones/anemones.element.yaml b/assets/elements/decoration/anemones/anemones.element.yaml index fab998cb0f..fa4f875350 100644 --- a/assets/elements/decoration/anemones/anemones.element.yaml +++ b/assets/elements/decoration/anemones/anemones.element.yaml @@ -4,8 +4,4 @@ editor: grab_size: [48, 27] grab_offset: [0, -12] show_name: false -builtin: !AnimatedDecoration - start_frame: 0 - end_frame: 4 - fps: 6 - atlas: ./anemones.atlas.yaml \ No newline at end of file +data: animated_decoration.yaml diff --git a/assets/elements/decoration/anemones/animated_decoration.yaml b/assets/elements/decoration/anemones/animated_decoration.yaml new file mode 100644 index 0000000000..32afae1a5a --- /dev/null +++ b/assets/elements/decoration/anemones/animated_decoration.yaml @@ -0,0 +1,4 @@ +start_frame: 0 +end_frame: 4 +fps: 6 +atlas: ./anemones.atlas.yaml diff --git a/assets/elements/environment/player_spawner/player_spawner.element.yaml b/assets/elements/environment/player_spawner/player_spawner.element.yaml index e4a7bcfebd..16297821d7 100644 --- a/assets/elements/environment/player_spawner/player_spawner.element.yaml +++ b/assets/elements/environment/player_spawner/player_spawner.element.yaml @@ -2,4 +2,4 @@ name: Player Spawner category: Map editor: grab_size: [32, 48] -builtin: !PlayerSpawner +data: player_spawner.yaml diff --git a/assets/elements/environment/player_spawner/player_spawner.yaml b/assets/elements/environment/player_spawner/player_spawner.yaml new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/assets/elements/environment/player_spawner/player_spawner.yaml @@ -0,0 +1 @@ +{} diff --git a/assets/game.yaml b/assets/game.yaml new file mode 100644 index 0000000000..9ce201ba2e --- /dev/null +++ b/assets/game.yaml @@ -0,0 +1,364 @@ +# music: +# title_screen: music/01 fishycuffs.ogg +# fight: +# - music/02 whalecome.ogg +# - music/03 ahoy!.ogg +# - music/04 bait the hook.ogg +# - music/05 fire in the hole.ogg +# - music/06 fishsticks.ogg +# - music/07 jolly roger.ogg +# - music/08 krill or be krilled.ogg +# - music/09 landlubber.ogg +# character_screen: music/10 fish bucket.ogg +# results_screen: music/11 thar she blows!.ogg +# credits: music/12 all hands hoay!.ogg + + +# main_menu: +# title_font: +# family: fairfax +# color: FFFFFF +# size: 85 +# subtitle_font: +# family: fairfax +# color: FFFFFF +# size: 60 + +# background_image: +# image: ui/menu-background.png +# image_size: [896, 480] + +# menu_width: 350 + +# default_settings: +# matchmaking_server: matchmaker.bones.fishfolk.org:65534 +# player_controls: +# # Gamepad controls +# gamepad: +# movement: +# up: !SingleAxis +# axis_type: !Gamepad LeftStickY +# positive_low: 0.1 +# negative_low: -1.0 + +# left: !SingleAxis +# axis_type: !Gamepad LeftStickX +# positive_low: 1.0 +# negative_low: -0.1 + +# down: !SingleAxis +# axis_type: !Gamepad LeftStickY +# positive_low: 1.0 +# negative_low: -0.1 + +# right: !SingleAxis +# axis_type: !Gamepad LeftStickX +# positive_low: 0.1 +# negative_low: -1.0 +# jump: !GamepadButton South +# grab: !GamepadButton East +# shoot: !GamepadButton West +# slide: !GamepadButton North + +# # Controls for the first keyboard player ( left side ) +# keyboard1: +# movement: +# up: !Keyboard W +# down: !Keyboard S +# left: !Keyboard A +# right: !Keyboard D +# jump: !Keyboard Space +# grab: !Keyboard V +# shoot: !Keyboard C +# slide: !Keyboard B + +# # Controls for the second keyboard player ( right side ) +# keyboard2: +# movement: +# up: !Keyboard Up +# down: !Keyboard Down +# left: !Keyboard Left +# right: !Keyboard Right +# jump: !Keyboard Comma +# grab: !Keyboard RShift +# shoot: !Keyboard Period +# slide: !Keyboard Slash + +# ui_theme: +# scale: 0.60 +# colors: +# positive: 3EC761 + +# widgets: +# border_radius: 1.5 +# default: &default +# bg_fill: 3A4444 +# bg_stroke: &default-stroke 181425 +# text: FFFFFF +# hovered: +# bg_fill: 566363 +# bg_stroke: *default-stroke +# text: FFFFFF +# active: +# bg_fill: 566363 +# bg_stroke: 86809B +# text: FFFFFF +# noninteractive: +# bg_fill: 262B44 +# bg_stroke: 181425 +# text: FFFFFF +# menu: *default +# debug_window_fill: 262B44 + +# font_families: +# fairfax: ui/FairfaxSM.ttf +# ark: ui/ark-pixel-16px-latin.ttf + +# font_styles: +# heading: +# family: ark +# size: 40 +# color: FFFFFF +# bigger: +# family: ark +# size: 25 +# color: FFFFFF +# normal: +# family: ark +# size: 20 +# color: FFFFFF +# smaller: +# family: ark +# size: 15 +# color: FFFFFF + +# editor: +# icons: +# elements: +# image: ui/editor/Object.png +# image_size: [64, 64] +# tiles: +# image: ui/editor/Tile.png +# image_size: [64, 64] +# collisions: +# image: ui/editor/PointerAndMap.png +# image_size: [64, 64] +# select: +# image: ui/editor/Cursor.png +# image_size: [64, 64] + +# hud: +# font: +# family: ark +# size: 15 +# color: FFFFFF + +# player_hud_width: 165 + +# portrait_frame: +# image: ui/panel.png +# image_size: [32, 32] +# border_size: +# top: 8 +# left: 8 +# right: 8 +# bottom: 8 + +# lifebar: +# height: 16 +# background_image: +# image: ui/lifebar.png +# image_size: [19, 7] +# border_size: +# left: 3 +# right: 3 +# top: 3 +# bottom: 3 +# scale: 2 +# progress_image: +# image: ui/lifebar-progress.png +# image_size: [1, 1] + +# panel: +# font_color: FFFFFF +# padding: +# top: 25 +# bottom: 25 +# left: 25 +# right: 25 +# border: +# image: ui/panel.png +# image_size: [38, 34] +# border_size: +# top: 11 +# bottom: 11 +# left: 12 +# right: 21 +# scale: 4 + +# button_styles: +# normal: +# font: +# family: ark +# color: FFFFFF +# size: 20 +# padding: +# top: 6 +# left: 6 +# right: 6 +# bottom: 9 +# borders: +# default: +# image: ui/button.png +# image_size: [14, 14] +# border_size: +# top: 5 +# bottom: 5 +# right: 5 +# left: 5 +# scale: 2 +# focused: +# image: ui/button-focused.png +# image_size: [14, 14] +# border_size: +# top: 5 +# bottom: 5 +# right: 5 +# left: 5 +# scale: 2 +# clicked: +# image: ui/button-down.png +# image_size: [14, 14] +# border_size: +# top: 5 +# bottom: 5 +# right: 5 +# left: 5 +# scale: 2 + +# small: +# font: +# family: ark +# color: FFFFFF +# size: 17 +# padding: +# top: 4 +# left: 4 +# right: 4 +# bottom: 6 +# borders: +# default: +# image: ui/button.png +# image_size: [14, 14] +# border_size: +# top: 5 +# bottom: 5 +# right: 5 +# left: 5 +# scale: 2 +# focused: +# image: ui/button-focused.png +# image_size: [14, 14] +# border_size: +# top: 5 +# bottom: 5 +# right: 5 +# left: 5 +# scale: 2 +# clicked: +# image: ui/button-down.png +# image_size: [14, 14] +# border_size: +# top: 5 +# bottom: 5 +# right: 5 +# left: 5 +# scale: 2 + +# translations: +# # This is the locale that we will fallback to if the selected locale doesn't have +# # translation for a certain message. +# default_locale: en-US +# locales: +# - locales/en-US/en-US.ftl.yml +# - locales/fr-FR/fr-FR.ftl.yml + +core: + config: + respawn_invincibility_time: 2s + + camera: + default_height: 448 + border_right: 300 + border_left: 300 + border_top: 50 + border_bottom: 200 + player_camera_box_size: [100, 250] + min_camera_size: [400, 500] + zoom_in_lerp_factor: 0.05 + zoom_out_lerp_factor: 0.1 + move_lerp_factor: 0.1 + + physics: + terminal_velocity: 30 + friction_lerp: 0.85 + stop_threshold: 1.0 + gravity: 0.6 + + players: + - ./player/skins/fishy/fishy.player.yaml + - ./player/skins/pescy/pescy.player.yaml + - ./player/skins/sharky/sharky.player.yaml + - ./player/skins/orcy/orcy.player.yaml + + player_hats: + - /player/hats/pirate.hat.yaml + - /player/hats/straw.hat.yaml + + stable_maps: + - /map/levels/level_1.map.yaml + # - /map/levels/level_2.map.yaml + # - /map/levels/level_3.map.yaml + # - /map/levels/level_4.map.yaml + # - /map/levels/level_5.map.yaml + # - /map/levels/level_6.map.yaml + # - /map/levels/level_7.map.yaml + # - /map/levels/level_8.map.yaml + # - /map/levels/level_9.map.yaml + # - /map/levels/level_10.map.yaml + # - /map/levels/level_11.map.yaml + # - /map/levels/level_12.map.yaml + # - /map/levels/level_13.map.yaml + # - /map/levels/level_14.map.yaml + + map_tilesets: + - /map/resources/default_tileset.atlas.yaml + - /map/resources/ground_rock.atlas.yaml + - /map/resources/ground_wood.atlas.yaml + - /map/resources/ground_metal.atlas.yaml + - /map/resources/ship_decorations.atlas.yaml + - /map/resources/coral.atlas.yaml + + map_elements: + - /elements/decoration/anemones/anemones.element.yaml + # - /elements/decoration/seaweed/seaweed.element.yaml + # - /elements/environment/urchin/urchin.element.yaml + # - /elements/environment/fish_school/fish_school.element.yaml + # - /elements/environment/crab/crab.element.yaml + # - /elements/environment/snail/snail.element.yaml + # - /elements/environment/player_spawner/player_spawner.element.yaml + # - /elements/environment/sproinger/sproinger.element.yaml + # - /elements/environment/slippery/slippery.element.yaml + # - /elements/environment/slippery_seaweed/slippery_seaweed.element.yaml + # - /elements/item/crate/crate.element.yaml + # - /elements/item/grenade/grenade.element.yaml + # - /elements/item/kick_bomb/kick_bomb.element.yaml + # - /elements/item/mine/mine.element.yaml + # - /elements/item/musket/musket.element.yaml + # - /elements/item/stomp_boots/stomp_boots.element.yaml + # - /elements/item/sword/sword.element.yaml + # - /elements/item/sniper_rifle/sniper_rifle.element.yaml + # - /elements/environment/coral_spikes/coral_spikes.element.yaml + + experimental_maps: [] + diff --git a/assets/map/levels/level_1.map.yaml b/assets/map/levels/level_1.map.yaml index 82730da0f2..75705fb9e0 100644 --- a/assets/map/levels/level_1.map.yaml +++ b/assets/map/levels/level_1.map.yaml @@ -1040,26 +1040,26 @@ layers: idx: 25 collision: Empty elements: - - pos: - - 432.0 - - 362.0 - element: /elements/environment/sproinger/sproinger.element.yaml - - pos: - - 88.0 - - 202.0 - element: /elements/environment/sproinger/sproinger.element.yaml - - pos: - - 776.0 - - 202.0 - element: /elements/environment/sproinger/sproinger.element.yaml - - pos: - - 208.0 - - 106.0 - element: /elements/environment/sproinger/sproinger.element.yaml - - pos: - - 656.0 - - 106.0 - element: /elements/environment/sproinger/sproinger.element.yaml + # - pos: + # - 432.0 + # - 362.0 + # element: /elements/environment/sproinger/sproinger.element.yaml + # - pos: + # - 88.0 + # - 202.0 + # element: /elements/environment/sproinger/sproinger.element.yaml + # - pos: + # - 776.0 + # - 202.0 + # element: /elements/environment/sproinger/sproinger.element.yaml + # - pos: + # - 208.0 + # - 106.0 + # element: /elements/environment/sproinger/sproinger.element.yaml + # - pos: + # - 656.0 + # - 106.0 + # element: /elements/environment/sproinger/sproinger.element.yaml - pos: - 96.0 - 121.5 @@ -1068,42 +1068,42 @@ layers: - 768.0 - 121.5 element: /elements/decoration/anemones/anemones.element.yaml - - pos: - - 632.0 - - 121.5 - element: /elements/decoration/seaweed/seaweed.element.yaml - - pos: - - 184.0 - - 121.5 - element: /elements/decoration/seaweed/seaweed.element.yaml - - pos: - - 512.0 - - 121.5 - element: /elements/decoration/anemones/anemones.element.yaml - - pos: - - 736.0 - - 217.5 - element: /elements/decoration/seaweed/seaweed.element.yaml - - pos: - - 376.0 - - 121.5 - element: /elements/decoration/anemones/anemones.element.yaml - - pos: - - 392.0 - - 185.5 - element: /elements/decoration/anemones/anemones.element.yaml - - pos: - - 296.0 - - 121.5 - element: /elements/decoration/anemones/anemones.element.yaml - - pos: - - 160.0 - - 409.5 - element: /elements/decoration/seaweed/seaweed.element.yaml - - pos: - - 584.0 - - 601.5 - element: /elements/decoration/seaweed/seaweed.element.yaml + # - pos: + # - 632.0 + # - 121.5 + # element: /elements/decoration/seaweed/seaweed.element.yaml + # - pos: + # - 184.0 + # - 121.5 + # element: /elements/decoration/seaweed/seaweed.element.yaml + # - pos: + # - 512.0 + # - 121.5 + # element: /elements/decoration/anemones/anemones.element.yaml + # - pos: + # - 736.0 + # - 217.5 + # element: /elements/decoration/seaweed/seaweed.element.yaml + # - pos: + # - 376.0 + # - 121.5 + # element: /elements/decoration/anemones/anemones.element.yaml + # - pos: + # - 392.0 + # - 185.5 + # element: /elements/decoration/anemones/anemones.element.yaml + # - pos: + # - 296.0 + # - 121.5 + # element: /elements/decoration/anemones/anemones.element.yaml + # - pos: + # - 160.0 + # - 409.5 + # element: /elements/decoration/seaweed/seaweed.element.yaml + # - pos: + # - 584.0 + # - 601.5 + # element: /elements/decoration/seaweed/seaweed.element.yaml - id: decorations 2 tilemap: /map/resources/ship_decorations.atlas.yaml tiles: @@ -1201,94 +1201,94 @@ layers: tilemap: null tiles: [] elements: - - pos: - - 384.0 - - 118.5 - element: /elements/item/kick_bomb/kick_bomb.element.yaml - - pos: - - 432.0 - - 182.5 - element: /elements/item/musket/musket.element.yaml - - pos: - - 728.0 - - 214.5 - element: /elements/item/crate/crate.element.yaml - - pos: - - 136.0 - - 214.5 - element: /elements/item/crate/crate.element.yaml - - pos: - - 536.0 - - 303.0 - element: /elements/item/grenade/grenade.element.yaml - - pos: - - 784.0 - - 495.0 - element: /elements/item/grenade/grenade.element.yaml - - pos: - - 80.0 - - 495.0 - element: /elements/item/grenade/grenade.element.yaml - - pos: - - 328.0 - - 303.0 - element: /elements/item/grenade/grenade.element.yaml - - pos: - - 432.0 - - 555.0 - element: /elements/item/sword/sword.element.yaml - - pos: - - 480.0 - - 118.5 - element: /elements/item/kick_bomb/kick_bomb.element.yaml + # - pos: + # - 384.0 + # - 118.5 + # element: /elements/item/kick_bomb/kick_bomb.element.yaml + # - pos: + # - 432.0 + # - 182.5 + # element: /elements/item/musket/musket.element.yaml + # - pos: + # - 728.0 + # - 214.5 + # element: /elements/item/crate/crate.element.yaml + # - pos: + # - 136.0 + # - 214.5 + # element: /elements/item/crate/crate.element.yaml + # - pos: + # - 536.0 + # - 303.0 + # element: /elements/item/grenade/grenade.element.yaml + # - pos: + # - 784.0 + # - 495.0 + # element: /elements/item/grenade/grenade.element.yaml + # - pos: + # - 80.0 + # - 495.0 + # element: /elements/item/grenade/grenade.element.yaml + # - pos: + # - 328.0 + # - 303.0 + # element: /elements/item/grenade/grenade.element.yaml + # - pos: + # - 432.0 + # - 555.0 + # element: /elements/item/sword/sword.element.yaml + # - pos: + # - 480.0 + # - 118.5 + # element: /elements/item/kick_bomb/kick_bomb.element.yaml - id: critters tilemap: null tiles: [] elements: - - pos: - - 790.0 - - 120.0 - element: /elements/environment/snail/snail.element.yaml - - pos: - - 245.0 - - 198.0 - element: /elements/environment/fish_school/fish_school.element.yaml - - pos: - - 670.0 - - 250.0 - element: /elements/environment/fish_school/fish_school.element.yaml - - pos: - - 351.0 - - 604.0 - element: /elements/environment/fish_school/fish_school.element.yaml - - pos: - - 338.0 - - 295.5 - element: /elements/environment/crab/crab.element.yaml - - pos: - - 530.0 - - 105.5 - element: /elements/environment/crab/crab.element.yaml - - pos: - - 75.0 - - 104.0 - element: /elements/environment/snail/snail.element.yaml - - pos: - - 520.0 - - 549.0 - element: /elements/environment/snail/snail.element.yaml - - pos: - - 578.0 - - 584.5 - element: /elements/environment/urchin/urchin.element.yaml - - pos: - - 174.0 - - 393.5 - element: /elements/environment/urchin/urchin.element.yaml - - pos: - - 301.0 - - 172.0 - element: /elements/environment/fish_school/fish_school.element.yaml + # - pos: + # - 790.0 + # - 120.0 + # element: /elements/environment/snail/snail.element.yaml + # - pos: + # - 245.0 + # - 198.0 + # element: /elements/environment/fish_school/fish_school.element.yaml + # - pos: + # - 670.0 + # - 250.0 + # element: /elements/environment/fish_school/fish_school.element.yaml + # - pos: + # - 351.0 + # - 604.0 + # element: /elements/environment/fish_school/fish_school.element.yaml + # - pos: + # - 338.0 + # - 295.5 + # element: /elements/environment/crab/crab.element.yaml + # - pos: + # - 530.0 + # - 105.5 + # element: /elements/environment/crab/crab.element.yaml + # - pos: + # - 75.0 + # - 104.0 + # element: /elements/environment/snail/snail.element.yaml + # - pos: + # - 520.0 + # - 549.0 + # element: /elements/environment/snail/snail.element.yaml + # - pos: + # - 578.0 + # - 584.5 + # element: /elements/environment/urchin/urchin.element.yaml + # - pos: + # - 174.0 + # - 393.5 + # element: /elements/environment/urchin/urchin.element.yaml + # - pos: + # - 301.0 + # - 172.0 + # element: /elements/environment/fish_school/fish_school.element.yaml - id: spawners tilemap: null tiles: [] diff --git a/assets/pack.yaml b/assets/pack.yaml new file mode 100644 index 0000000000..2fd5e136ad --- /dev/null +++ b/assets/pack.yaml @@ -0,0 +1 @@ +root: game.yaml diff --git a/book/book.toml b/book/book.toml index 788b898cfd..65ec66ecc7 100644 --- a/book/book.toml +++ b/book/book.toml @@ -1,15 +1,15 @@ [book] -authors = ["Carlo Supina", "Srayan Jana", "grufkork", "Micah Tigley"] -language = "en" +authors = ["Carlo Supina", "Srayan Jana", "grufkork", "Micah Tigley"] +language = "en" multilingual = false -src = "src" -title = "Jumpy Documentation" +src = "src" +title = "Jumpy Documentation" [build] -build-dir = "dist" +build-dir = "dist" create-missing = false [output.html] -default-theme = "navy" -git-repository-url = "https://github.com/fishfolk/jumpy" +default-theme = "navy" +git-repository-url = "https://github.com/fishfolk/jumpy" git-repository-icon = "fa-github" diff --git a/cliff.toml b/cliff.toml index b67557d064..bb80d4b4f7 100644 --- a/cliff.toml +++ b/cliff.toml @@ -38,21 +38,21 @@ filter_unconventional = false split_commits = false # regex for preprocessing the commit messages commit_preprocessors = [ - { pattern = '\n.*', replace = ""}, # Discard all but the first line + { pattern = '\n.*', replace = "" }, # Discard all but the first line ] # regex for parsing and grouping commits commit_parsers = [ - { message = "^feat", group = "Features"}, - { message = "^fix", group = "Bug Fixes"}, - { message = "^doc", group = "Documentation"}, - { message = "^perf", group = "Performance"}, - { message = "^refactor", group = "Refactor"}, - { message = "^style", group = "Styling"}, - { message = "^test", group = "Testing"}, - { message = "^chore\\(release\\): prepare for", skip = true}, - { message = "^chore", group = "Miscellaneous Tasks"}, - { body = ".*security", group = "Security"}, - { message = ".*", group = "Other", default_scope = "other"}, + { message = "^feat", group = "Features" }, + { message = "^fix", group = "Bug Fixes" }, + { message = "^doc", group = "Documentation" }, + { message = "^perf", group = "Performance" }, + { message = "^refactor", group = "Refactor" }, + { message = "^style", group = "Styling" }, + { message = "^test", group = "Testing" }, + { message = "^chore\\(release\\): prepare for", skip = true }, + { message = "^chore", group = "Miscellaneous Tasks" }, + { body = ".*security", group = "Security" }, + { message = ".*", group = "Other", default_scope = "other" }, ] # protect breaking changes from being skipped due to matching a skipping commit_parser diff --git a/core/Cargo.toml b/core/Cargo.toml deleted file mode 100644 index 0dfe1543bd..0000000000 --- a/core/Cargo.toml +++ /dev/null @@ -1,40 +0,0 @@ -[package] -edition = "2021" -license = "MIT OR Apache-2.0" -name = "jumpy_core" -version = "0.7.0" - -[dependencies] -bones_bevy_asset = "0.2" -bones_lib = { version = "0.2", features = ["serde"] } -type_ulid = "0.2" - -bytemuck = { version = "1.12", features = ["derive"] } -csscolorparser = "0.6" -glam = { version = "0.23", features = ["bytemuck", "libm"] } -humantime-serde = "1.0" -indexmap = "1.9" -nalgebra = { version = "0.32", features = ["convert-glam023"] } -ordered-float = "3.4" -petgraph = { version = "0.6", features = ["graphmap"], default-features = false } -puffin = { version = "0.15", features = ["web"] } -rapier2d = { version = "0.17", features = ["enhanced-determinism", "debug-render"] } -serde = { version = "1.0", features = ["derive"] } -tracing = "0.1" -shiftnanigans = { version = "0.3" } - -[dependencies.bevy] -default-features = false -features = ["bevy_asset"] -version = "0.10" - -[dependencies.turborand] -features = ["atomic"] -version = "0.10" - -[package.metadata.cargo-machete] -ignored = [ - "nalgebra", # Needed to add the `convert-glam023` feature - "humantime_serde", # false positive - "type_ulid", # false positive -] diff --git a/core/README.md b/core/README.md deleted file mode 100644 index 8de424730b..0000000000 --- a/core/README.md +++ /dev/null @@ -1,86 +0,0 @@ -# Jumpy Core - -[`jumpy_core`][crate] contains the core Jumpy game loop. This includes things like physics, the -player controller, the items, and pretty much everything else that happens during the play of a -match in the game. - -**If you want to contribute to Jumpy's match gameplay, this is likely where you want to be.** - -## Overview - -The Jumpy core logic is fully implemented on top of [`bones_lib`][crate::external::bones_lib] -and the Bones ECS ( [`bones_lib::ecs`][crate::external::bones_lib::ecs] ). - -By only interacting with `bones_lib`, we isolate the core game from the specifics of rendering and -user input, which is handled by the `jumpy` crate. - -Jumpy core is primarily interacted with through the [`CoreSession`][crate::session::CoreSession] -struct, which allows you to: - -- Provide user input to the game -- Run a game frame by executing the core systems to update the state of the contained - [`bones_lib::ecs::World`] -- Snapshot and restore the state of the game - -This means that Jumpy core has no interaction with rendering or how to collect the user input, -keeping it focused just on the core game mechanics. - -Jumpy core is also designed to be deterministic, lending it well to rollback networking, as implemented in the `jumpy` crate. - -### Important Concepts - -#### Gameplay Modules - -The gameplay is split into different Rust modules for different aspects of the game. For instance, -we have the [`damage`] that handles damage regions and the [`camera`] module with the camera -controller. - -The modules that contain gameplay systems all have an `install()` function that adds it's systems to -the [`CoreSession`][crate::session::CoreSession]. - -See [`install_modules()`] for more details on how to add new systems and modules. - -#### Game Metadata - -Metadata in Jumpy core is any data that is loaded as an asset at runtime. Examples of assets -include: - -- Sprites -- Maps -- Player animations -- Item data - -Most of our metadata is loaded from YAML files, with the format being defined by Rust structs that -derive `Serialize` and `Deserialize`. - -See the [`metadata`] module for more details. - -#### Entity Hydration - -Throughout [`jumpy_core`][crate] you'll see `hydrate` functions. The goal of these functions is to -take "stub entities" that have only some of the components that they need, and then "hydrate" them -by adding all of the remaining components that they need to work properly. - -For example, the [`player_spawner`][crate::elements::player_spawner] spawns players by creating an -entity with only a [`PlayerIdx`][crate::player::PlayerIdx] and -[`Transform`][crate::prelude::Transform] component. This creates a "player stub" that is missing all -kinds of important components such as the sprite, collisions, etc. - -Later the [`hydrate_players()`][crate::player] system will run, find all of the player stubs, and -lookup from the [`PlayerIdx`][crate::player::PlayerIdx] what sprites need to be added, etc. before -adding all the required components to the entity. - -This practice of hydrating entity stubs makes it much simpler to spawn different kinds of entities -throughout the codebase, without needing to duplicate the much more complicated logic of adding all -of that entities required components. - -## 🚧 Work-in-Progress Bones Asset Handling Abstraction - -`bones_lib` is designed to be independent of Bevy, such that you could possibly make a renderer for -any `bones_lib` core in any game engine you wanted, not just Bevy. This means that, ideally, -`jumpy_core` would have no dependency on `bevy`, but right now that is not completely true. - -`bones_lib` is still working out how to implement it's own asset abstraction, and until it gets -fully figured out, we do have a dependency on Bevy through the -[`BonesBevyAsset`][crate::external::bones_bevy_asset::BonesBevyAsset] derive macro and some -interactions necessary to access Bevy assets in the [`CoreSession`][crate::session::CoreSession]. diff --git a/core/src/lib.rs b/core/src/lib.rs deleted file mode 100644 index fc96a98747..0000000000 --- a/core/src/lib.rs +++ /dev/null @@ -1,107 +0,0 @@ -#![doc = include_str!("../README.md")] -#![doc(html_logo_url = "https://avatars.githubusercontent.com/u/87333478?s=200&v=4")] -// This cfg_attr is needed because `rustdoc::all` includes lints not supported on stable -#![cfg_attr(doc, allow(unknown_lints))] -#![deny(rustdoc::all)] -#![allow(clippy::too_many_arguments)] - -/// Prelude for inside the crate -mod prelude; - -/// Prelude for use outside the crate -#[doc(hidden)] -pub mod bevy_prelude { - pub use { - crate::{ - input::EditorInput, - metadata::*, - session::{CoreSession, CoreSessionInfo, GameSessionPlayerInfo}, - MAX_PLAYERS, - }, - bones_lib::prelude as bones, - }; -} - -/// External crate documentation. -/// -/// This module only exists during docs builds and serves to make it eaiser to link to relevant -/// documentation in external crates. -#[cfg(doc)] -pub mod external { - #[doc(inline)] - pub use bones_bevy_asset; - #[doc(inline)] - pub use bones_lib; -} - -pub mod attachment; -pub mod bullet; -pub mod camera; -pub mod damage; -pub mod debug; -pub mod editor; -pub mod elements; -pub mod globals; -pub mod input; -pub mod item; -pub mod lifetime; -pub mod map; -pub mod map_constructor; -pub mod metadata; -pub mod physics; -pub mod player; -pub mod random; -pub mod session; -pub mod utils; - -/// The target fixed frames-per-second that the game sumulation runs at. -pub const FPS: f32 = 60.0; -/// The maximum number of players per match. -pub const MAX_PLAYERS: usize = 4; - -/// Install game modules into the given [`CoreSession`][session::CoreSession]. -/// -/// Each game module should have a public install function that adds the systems needed by that -/// module: -/// -/// ```ignore -/// pub fn install(session: &mut crate::session::CoreSession) { -/// session -/// .stages -/// .add_system_to_stage(CoreStage::Last, camera_controller); -/// } -/// ``` -/// -/// The module will usually contain the Rust structs for any components related to the module as -/// well. -/// -/// To include the module in the game, add add a line to the body of this [`install_modules()`] -/// function that calls your module's `install()` function: -/// -/// ```ignore -/// pub fn install_modules(session: &mut session::CoreSession) { -/// // other modules... -/// camera::install(session); -/// } -/// ``` -/// -/// Note that in some edge cases the order that the modules are installed can make a difference -/// because it will change the order that the module systems are run, if two modules add systems to -/// the same system stage. -pub fn install_modules(session: &mut session::CoreSession) { - bones_lib::install(&mut session.stages); - physics::install(session); - input::install(session); - map::install(session); - player::install(session); - elements::install(session); - damage::install(session); - camera::install(session); - lifetime::install(session); - random::install(session); - debug::install(session); - item::install(session); - attachment::install(session); - bullet::install(session); - editor::install(session); -} diff --git a/core/src/metadata.rs b/core/src/metadata.rs deleted file mode 100644 index fe33712a3f..0000000000 --- a/core/src/metadata.rs +++ /dev/null @@ -1,103 +0,0 @@ -//! Core game metadata - -use serde::Deserializer; -use std::time::Duration; - -use crate::prelude::*; - -mod common; -mod element; -mod map; -mod player; - -pub use common::*; -pub use element::*; -pub use map::*; -pub use player::*; - -/// Resource containing the session's [`CoreMeta`]. -/// -/// This is wrapped in an [`Arc`] because it doesn't change over the course of a game, and because -/// it makes it very cheap to clone during game snapshots. -#[derive(::bevy::prelude::Resource, Deref, DerefMut, TypeUlid, Clone, Default, Debug)] -#[ulid = "01GNFXQXM8FCTD1JPDTJ796A25"] -pub struct CoreMetaArc(pub Arc); - -pub struct JumpyCoreAssetsPlugin; -impl ::bevy::prelude::Plugin for JumpyCoreAssetsPlugin { - fn build(&self, app: &mut ::bevy::prelude::App) { - use bones_bevy_asset::BonesBevyAssetAppExt; - app.add_bones_asset::() - .add_bones_asset::() - .add_bones_asset::() - .add_bones_asset::() - .add_bones_asset::() - .add_bones_asset::(); - } -} - -#[derive(BonesBevyAsset, Clone, Debug, Deserialize, TypeUlid, Default)] -#[asset_id = "core"] -#[ulid = "01GNWT2Q8EZ5CEV3MHWNMGEEA6"] -#[serde(deny_unknown_fields)] -pub struct CoreMeta { - pub camera: CameraMeta, - pub physics: PhysicsMeta, - pub config: CoreConfigMeta, - pub map_tilesets: Vec>, - pub players: Vec>, - pub player_hats: Vec>, - pub stable_maps: Vec>, - pub map_elements: Vec>, - pub experimental_maps: Vec>, -} - -#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug)] -#[serde(deny_unknown_fields)] -#[serde(default)] -pub struct CameraMeta { - pub default_height: f32, - pub border_top: f32, - pub border_bottom: f32, - pub border_left: f32, - pub border_right: f32, - pub move_lerp_factor: f32, - pub zoom_in_lerp_factor: f32, - pub zoom_out_lerp_factor: f32, - pub min_camera_size: Vec2, - pub player_camera_box_size: Vec2, -} - -impl Default for CameraMeta { - fn default() -> Self { - Self { - default_height: 400.0, - border_top: 0.0, - border_bottom: 0.0, - border_left: 0.0, - border_right: 0.0, - move_lerp_factor: 1.0, - zoom_in_lerp_factor: 1.0, - zoom_out_lerp_factor: 1.0, - min_camera_size: Vec2::ZERO, - player_camera_box_size: Vec2::ZERO, - } - } -} - -#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug, Default)] -#[serde(deny_unknown_fields)] -pub struct PhysicsMeta { - pub gravity: f32, - pub terminal_velocity: f32, - pub friction_lerp: f32, - pub stop_threshold: f32, -} - -#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug, Default)] -#[serde(deny_unknown_fields)] -pub struct CoreConfigMeta { - #[serde(default)] - #[serde(with = "humantime_serde")] - pub respawn_invincibility_time: Duration, -} diff --git a/core/src/metadata/common.rs b/core/src/metadata/common.rs deleted file mode 100644 index 1a678c6105..0000000000 --- a/core/src/metadata/common.rs +++ /dev/null @@ -1,57 +0,0 @@ -use super::*; -use serde::{Deserialize, Deserializer}; - -#[derive(Clone, Copy, Debug, Default)] -pub struct ColorMeta(pub Color); - -impl bones_bevy_asset::BonesBevyAssetLoad for ColorMeta {} - -impl<'de> Deserialize<'de> for ColorMeta { - fn deserialize(deserializer: D) -> Result - where - D: Deserializer<'de>, - { - deserializer.deserialize_str(ColorVisitor) - } -} - -impl Serialize for ColorMeta { - fn serialize(&self, serializer: S) -> Result - where - S: serde::Serializer, - { - let [r, g, b, a] = self.0.as_rgba_f32(); - let [r, g, b, a] = [ - (r * 255.0) as u8, - (g * 255.0) as u8, - (b * 255.0) as u8, - (a * 255.0) as u8, - ]; - let hex = format!("#{r:X}{g:X}{b:X}{a:X}"); - - serializer.serialize_str(&hex) - } -} - -struct ColorVisitor; -impl<'de> serde::de::Visitor<'de> for ColorVisitor { - type Value = ColorMeta; - - fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { - formatter.write_str("A hex-encoded RGB or RGBA color") - } - - fn visit_str(self, v: &str) -> Result - where - E: serde::de::Error, - { - Ok(ColorMeta( - csscolorparser::parse(v) - .map(|x| { - let [r, g, b, a] = x.to_array(); - [r as f32, g as f32, b as f32, a as f32].into() - }) - .map_err(|e| E::custom(e))?, - )) - } -} diff --git a/core/src/metadata/element.rs b/core/src/metadata/element.rs deleted file mode 100644 index 36b058f8e4..0000000000 --- a/core/src/metadata/element.rs +++ /dev/null @@ -1,320 +0,0 @@ -use std::time::Duration; - -use super::*; - -#[derive(BonesBevyAsset, TypeUlid, Deserialize, Clone, Debug, Default)] -#[asset_id = "element"] -#[ulid = "01GP28EQQVVQHDA0C9C4168C7W"] -#[serde(deny_unknown_fields)] -pub struct ElementMeta { - pub name: String, - pub category: String, - #[serde(default)] - pub builtin: BuiltinElementKind, - - #[serde(default)] - pub editor: ElementEditorMeta, -} - -#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug)] -#[serde(deny_unknown_fields)] -#[serde(default)] -pub struct ElementEditorMeta { - /// The size of the bounding rect for the element in the editor - pub grab_size: Vec2, - /// The offset of the bounding rect for the element in the editor. - pub grab_offset: Vec2, - /// Show the element name above the bounding rect in the editor. - pub show_name: bool, -} - -impl Default for ElementEditorMeta { - fn default() -> Self { - Self { - grab_size: Vec2::splat(45.0), - grab_offset: Vec2::ZERO, - show_name: true, - } - } -} - -#[derive(BonesBevyAsset, Deserialize, Clone, Debug, Default, TypeUlid)] -#[ulid = "01GR1W2B3S7DM5QEY07RSJH2G0"] -#[asset_id = "bullet"] -#[serde(deny_unknown_fields)] -pub struct BulletMeta { - pub velocity: Vec2, - pub body_diameter: f32, - pub atlas: Handle, - - pub lifetime: f32, - pub explosion_fps: f32, - pub explosion_volume: f64, - pub explosion_lifetime: f32, - pub explosion_frames: usize, - pub explosion_atlas: Handle, - pub explosion_sound: Handle, -} - -/// The kind of built-in -#[derive(BonesBevyAssetLoad, Deserialize, Clone, Debug, Default)] -#[serde(deny_unknown_fields)] -pub enum BuiltinElementKind { - /// This is not a built-in item - #[default] - None, - /// Player spawner - PlayerSpawner, - /// Grenades item - Grenade { - body_diameter: f32, - fin_anim: Key, - grab_offset: Vec2, - damage_region_size: Vec2, - damage_region_lifetime: f32, - throw_velocity: f32, - explosion_lifetime: f32, - explosion_frames: usize, - explosion_fps: f32, - explosion_sound: Handle, - explosion_volume: f64, - fuse_sound: Handle, - fuse_sound_volume: f64, - /// The time in seconds before a grenade explodes - fuse_time: f32, - #[serde(default)] - can_rotate: bool, - /// The grenade atlas - atlas: Handle, - explosion_atlas: Handle, - #[serde(default)] - bounciness: f32, - #[serde(default)] - angular_velocity: f32, - }, - /// An animated decoration such as seaweed or anemones - AnimatedDecoration { - start_frame: usize, - end_frame: usize, - fps: f32, - atlas: Handle, - }, - FishSchool { - kinds: Vec>, - /// The default and most-likely to ocurr number of fish in a school - base_count: u32, - /// The ammount greater or less than the base number of fish that may spawn - count_variation: u32, - /// The distance from the spawn point on each axis that the individual fish in the school will be - /// initially spawned within - spawn_range: f32, - /// The distance that the fish wish to stay within the center of their school - school_size: f32, - // The distance a collider must be for the fish to run away - flee_range: f32, - }, - /// A crab roaming on the ocean floor - Crab { - body_size: Vec2, - walk_frames: Vec, - spawn_frames: Vec, - fps: f32, - comfortable_spawn_distance: f32, - comfortable_scared_distance: f32, - /// How long a crab has to be away from it's spawn point before it digs into the ground and - /// digs back out in his spawn point. - #[serde(with = "humantime_serde")] - uncomfortable_respawn_time: Duration, - same_level_threshold: f32, - walk_speed: f32, - run_speed: f32, - // TODO: migrate this to a duration like `uncomfortable_respawn_time`. - timer_delay_max: u8, - atlas: Handle, - }, - Snail { - atlas: Handle, - fps: f32, - body_diameter: f32, - bounciness: f32, - gravity: f32, - hit_speed: f32, - /// The animation frames for when the snail is crawling - crawl_frames: Vec, - /// The `crawl_frames` indexes in which to move the snail - move_frame_indexes: Vec, - /// The animation frames for when the snail is fleeing into its shell. - /// - /// **Note:** This is reversed for the snail coming out of its shell. - hide_frames: Vec, - hide_time: f32, - }, - Urchin { - image: Handle, - body_diameter: f32, - hit_speed: f32, - gravity: f32, - bounciness: f32, - spin: f32, - }, - /// This is a sproinger - Sproinger { - atlas: Handle, - sound: Handle, - sound_volume: f64, - body_size: Vec2, - spring_velocity: f32, - }, - /// This is a sword - Sword { - atlas: Handle, - sound: Handle, - sound_volume: f64, - body_size: Vec2, - fin_anim: Key, - #[serde(default)] - grab_offset: Vec2, - killing_speed: f32, - angular_velocity: f32, - can_rotate: bool, - bounciness: f32, - throw_velocity: f32, - cooldown_frames: usize, - }, - /// The throwable crate item - Crate { - atlas: Handle, - - breaking_atlas: Handle, - breaking_anim_frames: usize, - breaking_anim_fps: f32, - - break_sound: Handle, - break_sound_volume: f64, - bounce_sound: Handle, - bounce_sound_volume: f64, - - throw_velocity: f32, - - body_size: Vec2, - grab_offset: Vec2, - // How long to wait before despawning a thrown crate, if it hans't it anything yet. - #[serde(with = "humantime_serde")] - break_timeout: Duration, - bounciness: f32, - fin_anim: Key, - crate_break_state_1: usize, - crate_break_state_2: usize, - }, - /// The mine item - Mine { - atlas: Handle, - - damage_region_size: Vec2, - damage_region_lifetime: f32, - explosion_atlas: Handle, - explosion_lifetime: f32, - explosion_frames: usize, - explosion_fps: f32, - explosion_volume: f64, - explosion_sound: Handle, - - /// The delay after throwing the mine, before it becomes armed and will blow up on contact. - arm_delay: f32, - armed_frames: usize, - armed_fps: f32, - arm_sound_volume: f64, - arm_sound: Handle, - - throw_velocity: f32, - body_size: Vec2, - grab_offset: Vec2, - fin_anim: Key, - bounciness: f32, - }, - - StompBoots { - map_icon: Handle, - player_decoration: Handle, - - body_size: Vec2, - grab_offset: Vec2, - }, - KickBomb { - body_diameter: f32, - fin_anim: Key, - grab_offset: Vec2, - damage_region_size: Vec2, - damage_region_lifetime: f32, - kick_velocity: Vec2, - throw_velocity: f32, - explosion_lifetime: f32, - explosion_frames: usize, - explosion_fps: f32, - explosion_sound: Handle, - explosion_volume: f64, - fuse_sound: Handle, - fuse_sound_volume: f64, - /// The time in seconds before a grenade explodes - #[serde(with = "humantime_serde")] - fuse_time: Duration, - #[serde(default)] - can_rotate: bool, - /// The grenade atlas - atlas: Handle, - explosion_atlas: Handle, - #[serde(default)] - bounciness: f32, - #[serde(default)] - angular_velocity: f32, - #[serde(with = "humantime_serde")] - arm_delay: Duration, - }, - Musket { - #[serde(default)] - grab_offset: Vec2, - fin_anim: Key, - - body_size: Vec2, - bounciness: f32, - can_rotate: bool, - throw_velocity: f32, - angular_velocity: f32, - atlas: Handle, - - max_ammo: usize, - #[serde(with = "humantime_serde")] - cooldown: Duration, - bullet_meta: Handle, - kickback: f32, - - shoot_fps: f32, - shoot_lifetime: f32, - shoot_frames: usize, - shoot_sound_volume: f64, - empty_shoot_sound_volume: f64, - shoot_atlas: Handle, - shoot_sound: Handle, - empty_shoot_sound: Handle, - }, - SlipperySeaweed { - atlas: Handle, - start_frame: usize, - end_frame: usize, - fps: f32, - body_size: Vec2, - }, - Slippery { - atlas: Handle, - body_size: Vec2, - player_slide: f32, - body_friction: f32, - }, - Spike { - atlas: Handle, - body_size: Vec2, - start_frame: usize, - end_frame: usize, - fps: f32, - }, -} diff --git a/core/src/prelude.rs b/core/src/prelude.rs deleted file mode 100644 index b75aa5a517..0000000000 --- a/core/src/prelude.rs +++ /dev/null @@ -1,17 +0,0 @@ -//! Common imports used throughout the crate. - -pub use { - crate::{ - attachment::*, bullet::*, camera::*, damage::*, debug::*, debug::*, elements::*, - globals::*, input::*, item::*, item::*, lifetime::*, map::*, metadata::*, physics::*, - player::*, session::*, utils::*, MAX_PLAYERS, - }, - bones_bevy_asset::{BevyAssets, BonesBevyAsset, BonesBevyAssetLoad}, - bones_lib::prelude::*, - bytemuck::{Pod, Zeroable}, - // glam::*, - serde::{Deserialize, Serialize}, - std::sync::Arc, - tracing::{debug, error, info, trace, warn}, - turborand::TurboRand, -}; diff --git a/core/src/session.rs b/core/src/session.rs deleted file mode 100644 index fbd1d1e85d..0000000000 --- a/core/src/session.rs +++ /dev/null @@ -1,299 +0,0 @@ -//! [`CoreSession`] implementation: the entrypoint for using `jumpy_core`. - -use crate::prelude::*; - -/// Implementation of the Jumpy match session. -/// -/// This encapsulates all of the game match logic, and is used to: -/// -/// - Provide input to the game. -/// - Snapshot/Restore the game state. -/// - Access the session's ECS [`World`] ( for instance, to render the game ). -/// -/// All of this is done **without** rendering anything. The game systems logic will create -/// [`Sprite`] entities, etc. that may be read directly out of the [`world`][Self::world] field in -/// in order to render the game. -/// -/// The `bones_bevy_renderer` crate can be used to render the contained [`World`] in Bevy, as it is -/// used in the `jumpy` crate and in the [`core_usage` -/// example](https://github.com/fishfolk/jumpy/blob/main/examples/core_usage.rs). -/// -/// ## Game Systems -/// -/// When instantiated with [`CoreSession::new()`], the session will have all of the core game -/// systems installed into it's [`stages`][Self::stages]. This is done by calling -/// [`install_modules()`][crate::install_modules]. -/// -/// If you are contributing and want to add more systems to the game, you can do so by adding your -/// module to the [`install_modules()`][crate::install_modules] function body, following the pattern -/// of the existing modules already there. -/// -/// ## `CoreMeta` -/// -/// An important struct required to create a new session is the [`CoreMeta`] struct in -/// [`CoreSessionInfo`]. -/// -/// [`CoreMeta`] contains the session's entire metadata tree, including items, maps, and player -/// skins. -/// -/// In `jumpy` this is loaded as a Bevy asset from YAMl files. -/// -/// See the [`metadata`][crate::metadata] module for more details. -pub struct CoreSession { - /// The ECS world for the session. Contains the whole gameplay state. - pub world: World, - /// Contains the game systems that modify the ECS `world` every frame. - pub stages: SystemStages, - /// The information necessary to initialize the session. - pub info: CoreSessionInfo, - /// The number of seconds in simulation time between frames. - /// - /// **Important Note:** This sets how much time advances in the game world whenever you call - /// [`advance()`][Self::advance], irrespective of how much real-life time actually elapsed - /// between your calls to `advance()`. - /// - /// This means that you must manually provide some sort of fixed-update logic in order to make - /// sure that `advance()` is called as many times per second as you desire. - pub time_step: f32, - /// Implementation detail. - /// - /// Used during [`advance()`][Self::advance] to borrow the bevy world. - pub scratch_world: Option<::bevy::ecs::world::World>, -} - -/// Information needed to start a game session. -#[derive(Debug, Clone)] -pub struct CoreSessionInfo { - /// The core metadata. - pub meta: Arc, - /// Metadata for the selected map. - pub map_meta: MapMeta, - /// The player selections. - pub player_info: [Option; MAX_PLAYERS], -} - -/// Info for a player in the [`CoreSessionInfo`] struct. -#[derive(Debug, Clone)] -pub struct GameSessionPlayerInfo { - /// The asset handle for the player skin. - pub player: Handle, - /// The hat the player selected, if any. - pub hat: Option>, - /// Whether or not the player is an AI player. - pub is_ai: bool, -} - -impl CoreSession { - /// Create a new [`CoreSession`]. - pub fn new(mut info: CoreSessionInfo) -> Self { - // Create session - let mut session = Self { - world: default(), - stages: SystemStages::with_core_stages(), - scratch_world: Some(::bevy::ecs::world::World::new()), - info: info.clone(), - time_step: 1.0 / crate::FPS, - }; - - // Install modules - crate::install_modules(&mut session); - - // Initialize systems - for stage in &mut session.stages.stages { - stage.initialize(&mut session.world); - } - - // Initialize time resource - session.world.init_resource::