From 9dfa4714a6bed110cd8778562bdcb15056be6975 Mon Sep 17 00:00:00 2001 From: Ida Iyes Date: Wed, 10 Jan 2024 23:41:37 +0200 Subject: [PATCH] UPDATE deps, bevy 0.12, ldtk 1.4.1. locale assets aren't handled via bevy_asset_loader anymore, bevy_fluent handles them by itself --- Cargo.lock | 1128 +++++++++++++++++++------------- Cargo.toml | 83 +-- assets/levels/level.01.ldtk | 4 +- assets/locale.assets.ron | 9 - engine/src/assets.rs | 4 +- engine/src/assets/animation.rs | 2 +- engine/src/assets/script.rs | 2 +- game/src/assets.rs | 11 - game/src/game/wall.rs | 206 +++--- game/src/locale.rs | 68 +- game/src/main.rs | 8 +- game/src/ui/console.rs | 2 +- 12 files changed, 871 insertions(+), 656 deletions(-) delete mode 100644 assets/locale.assets.ron diff --git a/Cargo.lock b/Cargo.lock index e23fe0eb..853fc97f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -20,24 +20,24 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] name = "accesskit" -version = "0.11.2" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eb1adf08c5bcaa8490b9851fd53cca27fa9880076f178ea9d29f05196728a8" +checksum = "6cb10ed32c63247e4e39a8f42e8e30fb9442fbf7878c8e4a9849e7e381619bea" [[package]] name = "accesskit_consumer" -version = "0.15.2" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04bb4d9e4772fe0d47df57d0d5dbe5d85dd05e2f37ae1ddb6b105e76be58fb00" +checksum = "8c17cca53c09fbd7288667b22a201274b9becaa27f0b91bf52a526db95de45e6" dependencies = [ "accesskit", ] [[package]] name = "accesskit_macos" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134d0acf6acb667c89d3332999b1a5df4edbc8d6113910f392ebb73f2b03bb56" +checksum = "cd3b6ae1eabbfbced10e840fd3fce8a93ae84f174b3e4ba892ab7bcb42e477a7" dependencies = [ "accesskit", "accesskit_consumer", @@ -47,23 +47,23 @@ dependencies = [ [[package]] name = "accesskit_windows" -version = "0.14.3" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eac0a7f2d7cd7a93b938af401d3d8e8b7094217989a7c25c55a953023436e31" +checksum = "afcae27ec0974fc7c3b0b318783be89fd1b2e66dd702179fe600166a38ff4a0b" dependencies = [ "accesskit", "accesskit_consumer", - "arrayvec", "once_cell", "paste", + "static_assertions", "windows 0.48.0", ] [[package]] name = "accesskit_winit" -version = "0.14.4" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "825d23acee1bd6d25cbaa3ca6ed6e73faf24122a774ec33d52c5c86c6ab423c0" +checksum = "88e39fcec2e10971e188730b7a76bab60647dacc973d4591855ebebcadfaa738" dependencies = [ "accesskit", "accesskit_macos", @@ -88,9 +88,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", "getrandom", @@ -183,9 +183,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "approx" @@ -217,6 +217,16 @@ dependencies = [ "libloading 0.7.4", ] +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + [[package]] name = "async-channel" version = "1.9.0" @@ -228,36 +238,76 @@ dependencies = [ "futures-core", ] +[[package]] +name = "async-channel" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +dependencies = [ + "concurrent-queue", + "event-listener 4.0.3", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + [[package]] name = "async-executor" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" dependencies = [ - "async-lock", + "async-lock 3.3.0", "async-task", "concurrent-queue", "fastrand 2.0.1", - "futures-lite 2.0.1", + "futures-lite 2.2.0", "slab", ] +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "blocking", + "futures-lite 1.13.0", +] + [[package]] name = "async-lock" -version = "3.1.2" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dea8b3453dd7cc96711834b75400d671b73e3656975fa68d9f277163b7f7e316" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener 4.0.0", + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +dependencies = [ + "event-listener 4.0.3", "event-listener-strategy", "pin-project-lite", ] [[package]] name = "async-task" -version = "4.5.0" +version = "4.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" @@ -288,24 +338,22 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "c79fed4cdb43e993fcdadc7e58a09fd0e3e649c4436fa11da71c9f1f3ee7feb9" [[package]] name = "bevy" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91c6d3ec4f89e85294dc97334c5b271ddc301fdf67ac9bb994fe44d9273e6ed7" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "bevy_internal", ] [[package]] name = "bevy_a11y" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "132c9e35a77c5395951f6d25fa2c52ee92296353426df4f961e60f3ff47e2e42" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "accesskit", "bevy_app", @@ -315,9 +363,8 @@ dependencies = [ [[package]] name = "bevy_animation" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f44eae3f1c35a87e38ad146f72317f19ce7616dad8bbdfb88ee752c1282d28c5" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "bevy_app", "bevy_asset", @@ -334,9 +381,8 @@ dependencies = [ [[package]] name = "bevy_app" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f557a7d59e1e16892d7544fc37316506ee598cb5310ef0365125a30783c11531" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "bevy_derive", "bevy_ecs", @@ -350,26 +396,29 @@ dependencies = [ [[package]] name = "bevy_asset" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9714af523da4cdf58c42a317e5ed40349708ad954a18533991fd64c8ae0a6f68" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ - "anyhow", - "async-channel", + "async-broadcast", + "async-fs", + "async-lock 2.8.0", "bevy_app", - "bevy_diagnostic", + "bevy_asset_macros", "bevy_ecs", "bevy_log", "bevy_reflect", "bevy_tasks", "bevy_utils", "bevy_winit", + "blake3", "crossbeam-channel", "downcast-rs", - "fastrand 1.9.0", + "futures-io", + "futures-lite 1.13.0", "js-sys", - "notify", + "notify-debouncer-full", "parking_lot", + "ron", "serde", "thiserror", "wasm-bindgen", @@ -379,8 +428,9 @@ dependencies = [ [[package]] name = "bevy_asset_loader" -version = "0.17.0" -source = "git+https://github.com/NiklasEi/bevy_asset_loader?rev=d048c88348a393b28c51dcc650917ff772741a4a#d048c88348a393b28c51dcc650917ff772741a4a" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16930d3c6b4eee079843ce2bc6c5d845f0258c731417c46b86137b0532b7a297" dependencies = [ "anyhow", "bevy", @@ -393,21 +443,31 @@ dependencies = [ [[package]] name = "bevy_asset_loader_derive" -version = "0.17.0" -source = "git+https://github.com/NiklasEi/bevy_asset_loader?rev=d048c88348a393b28c51dcc650917ff772741a4a#d048c88348a393b28c51dcc650917ff772741a4a" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a84e9bd698da11c39d933c61e5fcc098afb64508e07e77635be3a05de623b1d" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.48", +] + +[[package]] +name = "bevy_asset_macros" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" +dependencies = [ + "bevy_macro_utils", + "proc-macro2", + "quote", + "syn 2.0.48", ] [[package]] name = "bevy_audio" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4de308bd63a2f7a0b77ffeb7cf00cc185ec01393c5db2091fe03964f97152749" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ - "anyhow", "bevy_app", "bevy_asset", "bevy_derive", @@ -417,28 +477,27 @@ dependencies = [ "bevy_transform", "bevy_utils", "oboe", - "parking_lot", "rodio", ] [[package]] name = "bevy_common_assets" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0e5659f20aeaa1703e76d87c62d66f92aaa56e431fbed71bb38345b576aa6f0" +checksum = "9397adf1558aa3f08e20aa567538a7238b451362fc8c6b678d409c040c221799" dependencies = [ "anyhow", "bevy", "ron", "serde", + "thiserror", "toml", ] [[package]] name = "bevy_core" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d5272321be5fcf5ce2fb16023bc825bb10dfcb71611117296537181ce950f48" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "bevy_app", "bevy_ecs", @@ -452,15 +511,15 @@ dependencies = [ [[package]] name = "bevy_core_pipeline" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67382fa9c96ce4f4e5833ed7cedd9886844a8f3284b4a717bd4ac738dcdea0c3" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "bevy_app", "bevy_asset", "bevy_core", "bevy_derive", "bevy_ecs", + "bevy_log", "bevy_math", "bevy_reflect", "bevy_render", @@ -473,20 +532,18 @@ dependencies = [ [[package]] name = "bevy_derive" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44e4e2784a81430199e4157e02903a987a32127c773985506f020e7d501b62e" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "bevy_macro_utils", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "bevy_diagnostic" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6babb230dc383c98fdfc9603e3a7a2a49e1e2879dbe8291059ef37dca897932e" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "bevy_app", "bevy_core", @@ -499,11 +556,10 @@ dependencies = [ [[package]] name = "bevy_ecs" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266144b36df7e834d5198049e037ecdf2a2310a76ce39ed937d1b0a6a2c4e8c6" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ - "async-channel", + "async-channel 1.9.0", "bevy_ecs_macros", "bevy_ptr", "bevy_reflect", @@ -521,15 +577,16 @@ dependencies = [ [[package]] name = "bevy_ecs_ldtk" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037f862d30f5b74e3b5136acf435c8210b8e8f00c354d7b40234464f04f59fd7" +source = "git+https://github.com/TheSeekerGame/bevy_ecs_ldtk?rev=68af1c11cb95b1ed85f9f5008e7308f41e8015f1#68af1c11cb95b1ed85f9f5008e7308f41e8015f1" dependencies = [ - "anyhow", "bevy", "bevy_ecs_ldtk_macros", "bevy_ecs_tilemap", + "derive-getters", + "derive_more", "hex", "paste", + "path-clean", "regex", "serde", "serde_json", @@ -539,8 +596,7 @@ dependencies = [ [[package]] name = "bevy_ecs_ldtk_macros" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84deb3aba5b9586df80f4f2a72510d586a12f936df71cebbe97b430a479379f" +source = "git+https://github.com/TheSeekerGame/bevy_ecs_ldtk?rev=68af1c11cb95b1ed85f9f5008e7308f41e8015f1#68af1c11cb95b1ed85f9f5008e7308f41e8015f1" dependencies = [ "proc-macro2", "quote", @@ -549,21 +605,19 @@ dependencies = [ [[package]] name = "bevy_ecs_macros" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7157a9c3be038d5008ee3f114feb6cf6b39c1d3d32ee21a7cacb8f81fccdfa80" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "bevy_macro_utils", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "bevy_ecs_tilemap" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b64cb7171c43b30e9fa75cd8748911e06139ff45a04fa4be881201079fee295" +version = "0.12.0" +source = "git+https://github.com/StarArawn/bevy_ecs_tilemap?rev=b08a5d997867d5e5a760e296dc38e435c6b268cc#b08a5d997867d5e5a760e296dc38e435c6b268cc" dependencies = [ "bevy", "log", @@ -572,9 +626,8 @@ dependencies = [ [[package]] name = "bevy_encase_derive" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ac0f55ad6bca1be7b0f35bbd5fc95ed3d31e4e9db158fee8e5327f59006001" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "bevy_macro_utils", "encase_derive_impl", @@ -582,16 +635,15 @@ dependencies = [ [[package]] name = "bevy_fluent" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34e59cfd5ebf486092bbe21501df2f60d67f8126740d90c30015a3c17a825512" +checksum = "df3948a1cfff4c63a1fb40978b9673e6866821d731d07094240ce0971fd0006d" dependencies = [ - "anyhow", "bevy", "fluent", "fluent-langneg", "fluent_content", - "globset", + "futures-lite 2.2.0", "indexmap 2.1.0", "intl-memoizer", "ron", @@ -605,9 +657,8 @@ dependencies = [ [[package]] name = "bevy_gilrs" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65f4d79c55829f8016014593a42453f61a564ffb06ef79460d25696ccdfac67b" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "bevy_app", "bevy_ecs", @@ -621,9 +672,8 @@ dependencies = [ [[package]] name = "bevy_gizmos" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e286a3e7276431963f4aa29165ea5429fa7dbbc6d5c5ba0c531e7dd44ecc88a2" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "bevy_app", "bevy_asset", @@ -640,11 +690,9 @@ dependencies = [ [[package]] name = "bevy_gltf" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f07494a733dca032e71a20f4b1f423de765da49cbff34406ae6cd813f9b50c41" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ - "anyhow", "base64 0.13.1", "bevy_animation", "bevy_app", @@ -671,9 +719,8 @@ dependencies = [ [[package]] name = "bevy_hierarchy" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "103f8f58416ac6799b8c7f0b418f1fac9eba44fa924df3b0e16b09256b897e3d" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "bevy_app", "bevy_core", @@ -686,9 +733,8 @@ dependencies = [ [[package]] name = "bevy_input" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbd935401101ac8003f3c3aea70788c65ad03f7a32716a10608bedda7a648bc" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "bevy_app", "bevy_ecs", @@ -701,9 +747,8 @@ dependencies = [ [[package]] name = "bevy_internal" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0e35a9b2bd29aa784b3cc416bcbf2a298f69f00ca51fd042ea39d9af7fad37e" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "bevy_a11y", "bevy_animation", @@ -739,9 +784,8 @@ dependencies = [ [[package]] name = "bevy_log" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07dcc615ff4f617b06c3f9522fca3c55d56f9644db293318f8ab68fcdea5d4fe" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "android_log-sys", "bevy_app", @@ -755,21 +799,20 @@ dependencies = [ [[package]] name = "bevy_macro_utils" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ddc18d489b4e57832d4958cde7cd2f349f0ad91e5892ac9e2f2ee16546b981" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ + "proc-macro2", "quote", "rustc-hash", - "syn 2.0.39", - "toml_edit", + "syn 2.0.48", + "toml_edit 0.20.7", ] [[package]] name = "bevy_math" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78286a81fead796dc4b45ab14f4f02fe29a94423d3587bcfef872b2a8e0a474b" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "glam 0.24.2", "serde", @@ -777,18 +820,16 @@ dependencies = [ [[package]] name = "bevy_mikktspace" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cfc2a21ea47970a9b1f0f4735af3256a8f204815bd756110051d10f9d909497" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "glam 0.24.2", ] [[package]] name = "bevy_pbr" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63ca796a619e61cd43a0a3b11fde54644f7f0732a1fba1eef5d406248c6eba85" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "bevy_app", "bevy_asset", @@ -803,21 +844,22 @@ dependencies = [ "bevy_window", "bitflags 2.4.1", "bytemuck", + "fixedbitset", "naga_oil", "radsort", + "smallvec", + "thread_local", ] [[package]] name = "bevy_ptr" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c7586401a46f7d8e436028225c1df5288f2e0082d066b247a82466fea155c6" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" [[package]] name = "bevy_reflect" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0778197a1eb3e095a71417c74b7152ede02975cdc95b5ea4ddc5251ed00a2eb5" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "bevy_math", "bevy_ptr", @@ -826,8 +868,6 @@ dependencies = [ "downcast-rs", "erased-serde", "glam 0.24.2", - "once_cell", - "parking_lot", "serde", "smallvec", "smol_str", @@ -836,26 +876,22 @@ dependencies = [ [[package]] name = "bevy_reflect_derive" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342a4b2d09db22c48607d23ad59a056aff1ee004549050a51d490d375ba29528" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "bevy_macro_utils", - "bit-set", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", "uuid", ] [[package]] name = "bevy_render" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39df4824b760928c27afc7b00fb649c7a63c9d76661ab014ff5c86537ee906cb" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ - "anyhow", - "async-channel", + "async-channel 1.9.0", "bevy_app", "bevy_asset", "bevy_core", @@ -885,8 +921,6 @@ dependencies = [ "ktx2", "naga", "naga_oil", - "parking_lot", - "regex", "ruzstd", "serde", "smallvec", @@ -895,28 +929,24 @@ dependencies = [ "wasm-bindgen", "web-sys", "wgpu", - "wgpu-hal", ] [[package]] name = "bevy_render_macros" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd08c740aac73363e32fb45af869b10cec65bcb76fe3e6cd0f8f7eebf4c36c9" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "bevy_macro_utils", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "bevy_scene" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd47e1263506153bef3a8be97fe2d856f206d315668c4f97510ca6cc181d9681" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ - "anyhow", "bevy_app", "bevy_asset", "bevy_derive", @@ -934,9 +964,8 @@ dependencies = [ [[package]] name = "bevy_sprite" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a8ca824fad75c6ef74cfbbba0a4ce3ccc435fa23d6bf3f003f260548813397" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "bevy_app", "bevy_asset", @@ -953,17 +982,17 @@ dependencies = [ "bytemuck", "fixedbitset", "guillotiere", + "radsort", "rectangle-pack", "thiserror", ] [[package]] name = "bevy_tasks" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c73bbb847c83990d3927005090df52f8ac49332e1643d2ad9aac3cd2974e66bf" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ - "async-channel", + "async-channel 1.9.0", "async-executor", "async-task", "concurrent-queue", @@ -973,12 +1002,10 @@ dependencies = [ [[package]] name = "bevy_text" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692288ab7b0a9f8b38058964c52789fc6bcb63703b23de51cce90ec41bfca355" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "ab_glyph", - "anyhow", "bevy_app", "bevy_asset", "bevy_ecs", @@ -996,9 +1023,8 @@ dependencies = [ [[package]] name = "bevy_time" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d58d6dbae9c8225d8c0e0f04d2c5dbb71d22adc01ecd5ab3cebc364139e4a6d" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "bevy_app", "bevy_ecs", @@ -1011,9 +1037,8 @@ dependencies = [ [[package]] name = "bevy_transform" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9b0ac0149a57cd846cb357a35fc99286f9848e53d4481954608ac9552ed2d4" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "bevy_app", "bevy_ecs", @@ -1021,13 +1046,14 @@ dependencies = [ "bevy_math", "bevy_reflect", "serde", + "thiserror", ] [[package]] name = "bevy_tweening" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b182c9cf812b0052a5a96f59b1be16400fa0717b26da2497e13d81947299c7fc" +checksum = "216b3cb82fd0d149c5a9abfb5e382d8a671ff469f8759116e091c710bfa37139" dependencies = [ "bevy", "interpolation", @@ -1035,9 +1061,8 @@ dependencies = [ [[package]] name = "bevy_ui" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b6d295a755e5b79e869a09e087029d72974562a521ec7ccfba7141fa948a32" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "bevy_a11y", "bevy_app", @@ -1065,15 +1090,15 @@ dependencies = [ [[package]] name = "bevy_utils" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d9484e32434ea84dc548cff246ce0c6f756c1336f5ea03f24ac120a48595c7" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "ahash", "bevy_utils_proc_macros", "getrandom", "hashbrown 0.14.3", "instant", + "nonmax", "petgraph", "thiserror", "tracing", @@ -1082,21 +1107,20 @@ dependencies = [ [[package]] name = "bevy_utils_proc_macros" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5391b242c36f556db01d5891444730c83aa9dd648b6a8fd2b755d22cb3bddb57" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "bevy_window" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd584c0da7c4ada6557b09f57f30fb7cff21ccedc641473fc391574b4c9b7944" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ + "bevy_a11y", "bevy_app", "bevy_ecs", "bevy_input", @@ -1109,9 +1133,8 @@ dependencies = [ [[package]] name = "bevy_winit" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdc044abdb95790c20053e6326760f0a2985f0dcd78613d397bf35f16039d53" +version = "0.12.1" +source = "git+https://github.com/TheSeekerGame/bevy?branch=TheSeeker#b5b6ea3889a23e03131816e3cda62d163925a72e" dependencies = [ "accesskit_winit", "approx", @@ -1134,15 +1157,18 @@ dependencies = [ [[package]] name = "bevy_xpbd_2d" -version = "0.2.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "111aaf452e60d484487536a44d254f30a1261efa7f3a0dd6f1bc1fb473c05edd" +checksum = "68c97f486ccbe480db72550ec5547cedbd7a2a09fe028b9f567b175100f7b9a2" dependencies = [ "bevy", "bevy_xpbd_derive", "derive_more", + "fxhash", + "glam 0.24.2", + "indexmap 2.1.0", + "itertools 0.11.0", "nalgebra", - "parry2d", "parry2d-f64", ] @@ -1153,7 +1179,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e1ef1d5e328abe1b76df974245f78e17fd17867583883d5e77444c6a8223a64" dependencies = [ "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1173,7 +1199,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1206,6 +1232,19 @@ dependencies = [ "serde", ] +[[package]] +name = "blake3" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", +] + [[package]] name = "block" version = "0.1.6" @@ -1232,13 +1271,19 @@ dependencies = [ ] [[package]] -name = "bstr" -version = "1.8.0" +name = "blocking" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ - "memchr", - "serde", + "async-channel 2.1.1", + "async-lock 3.3.0", + "async-task", + "fastrand 2.0.1", + "futures-io", + "futures-lite 2.2.0", + "piper", + "tracing", ] [[package]] @@ -1264,7 +1309,7 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1345,13 +1390,13 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" dependencies = [ "glob", "libc", - "libloading 0.7.4", + "libloading 0.8.1", ] [[package]] @@ -1394,9 +1439,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ "crossbeam-utils", ] @@ -1423,6 +1468,12 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87ca1caa64ef4ed453e68bb3db612e51cf1b2f5b871337f0fcab1c8f87cc3dff" +[[package]] +name = "constant_time_eq" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" + [[package]] name = "constgebra" version = "0.1.3" @@ -1440,9 +1491,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -1450,9 +1501,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" @@ -1463,15 +1514,15 @@ dependencies = [ "bitflags 1.3.2", "core-foundation", "core-graphics-types", - "foreign-types", + "foreign-types 0.3.2", "libc", ] [[package]] name = "core-graphics-types" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -1491,9 +1542,9 @@ dependencies = [ [[package]] name = "coreaudio-sys" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3120ebb80a9de008e638ad833d4127d50ea3d3a960ea23ea69bc66d9358a028" +checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9" dependencies = [ "bindgen", ] @@ -1534,31 +1585,27 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "d3d12" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" +checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20" dependencies = [ - "bitflags 1.3.2", - "libloading 0.7.4", + "bitflags 2.4.1", + "libloading 0.8.1", "winapi", ] @@ -1583,7 +1630,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1594,7 +1641,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1611,14 +1658,25 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", "serde", ] +[[package]] +name = "derive-getters" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2c35ab6e03642397cdda1dd58abbc05d418aef8e36297f336d5aba060fe8df" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "derive_more" version = "0.99.17" @@ -1667,7 +1725,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1720,7 +1778,7 @@ checksum = "3fe2568f851fd6144a45fa91cfed8fe5ca8fc0b56ba6797bfc1ed2771b90e37c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1740,7 +1798,7 @@ checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1760,7 +1818,7 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1795,9 +1853,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "4.0.0" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" dependencies = [ "concurrent-queue", "parking", @@ -1810,7 +1868,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 4.0.0", + "event-listener 4.0.3", "pin-project-lite", ] @@ -1831,23 +1889,32 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" -version = "0.3.1" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "209098dd6dfc4445aa6111f0e98653ac323eaa4dfd212c9ca3931bf9955c31bd" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "file-id" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" +checksum = "6584280525fb2059cba3db2c04abf947a1a29a45ddae89f3870f8281704fafc9" dependencies = [ - "simd-adler32", + "windows-sys 0.48.0", ] [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", ] [[package]] @@ -1936,7 +2003,28 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared", + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", ] [[package]] @@ -1945,6 +2033,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + [[package]] name = "fsevent-sys" version = "4.1.0" @@ -1956,15 +2050,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -1983,23 +2077,31 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.0.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" +checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" dependencies = [ "fastrand 2.0.1", "futures-core", "futures-io", - "memchr", "parking", "pin-project-lite", ] +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "js-sys", @@ -2010,9 +2112,9 @@ dependencies = [ [[package]] name = "gilrs" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e9eec02069fcbd7abe00a28adf216547774889129a777cb5e53fdfb75d59f09" +checksum = "d8b2e57a9cb946b5d04ae8638c5f554abb5a9f82c4c950fd5b1fee6d119592fb" dependencies = [ "fnv", "gilrs-core", @@ -2023,9 +2125,9 @@ dependencies = [ [[package]] name = "gilrs-core" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "178769da179a47b187837d1ab2b5b9b684a21180166a77a4ca37e7e58ee3833d" +checksum = "0af1827b7dd2f36d740ae804c1b3ea0d64c12533fb61ff91883005143a0e8c5a" dependencies = [ "core-foundation", "inotify 0.10.2", @@ -2039,7 +2141,7 @@ dependencies = [ "vec_map", "wasm-bindgen", "web-sys", - "windows 0.51.1", + "windows 0.52.0", ] [[package]] @@ -2048,40 +2150,28 @@ version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" -[[package]] -name = "glam" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e4afd9ad95555081e109fe1d21f2a30c691b5f0919c67dfa690a2e1eb6bd51c" - [[package]] name = "glam" version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" dependencies = [ + "approx", "bytemuck", "serde", ] [[package]] -name = "glob" -version = "0.3.1" +name = "glam" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3" [[package]] -name = "globset" -version = "0.4.14" +name = "glob" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" -dependencies = [ - "aho-corasick", - "bstr", - "log", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", -] +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "glow" @@ -2097,32 +2187,33 @@ dependencies = [ [[package]] name = "gltf" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad2dcfb6dd7a66f9eb3d181a29dcfb22d146b0bcdc2e1ed1713cbf03939a88ea" +checksum = "3b78f069cf941075835822953c345b9e1edd67ae347b81ace3aea9de38c2ef33" dependencies = [ "byteorder", "gltf-json", "lazy_static", + "serde_json", ] [[package]] name = "gltf-derive" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cbcea5dd47e7ad4e9ee6f040384fcd7204bbf671aa4f9e7ca7dfc9bfa1de20" +checksum = "438ffe1a5540d75403feaf23636b164e816e93f6f03131674722b3886ce32a57" dependencies = [ "inflections", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "gltf-json" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5b810806b78dde4b71a95cc0e6fdcab34c4c617da3574df166f9987be97d03" +checksum = "655951ba557f2bc69ea4b0799446bae281fa78efae6319968bdd2c3e9a06d8e1" dependencies = [ "gltf-derive", "serde", @@ -2143,21 +2234,21 @@ dependencies = [ [[package]] name = "gpu-alloc" -version = "0.5.4" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "gpu-alloc-types", ] [[package]] name = "gpu-alloc-types" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", ] [[package]] @@ -2265,9 +2356,9 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2422,16 +2513,25 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +dependencies = [ + "either", +] + [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "iyes_bevy_extras" version = "0.1.0" -source = "git+https://github.com/IyesGames/iyes_bevy_extras#e03037c28703476bdab40265e5267a711f49b8f1" +source = "git+https://github.com/IyesGames/iyes_bevy_extras#052d331a46b73ff48326c1417699c3c91cb214c2" dependencies = [ "bevy", ] @@ -2439,16 +2539,16 @@ dependencies = [ [[package]] name = "iyes_cli" version = "0.1.0" -source = "git+https://github.com/IyesGames/iyes_cli#9488293520836bc2673bb97f30bb39a506af690e" +source = "git+https://github.com/IyesGames/iyes_cli#c84eab19f4f5877636469fcacb7f969f47389b07" dependencies = [ "bevy", ] [[package]] name = "iyes_progress" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3f093e3b8f18730767ecf5b60c455b4f6b806d3c79ae2a31ca89d285718d635" +checksum = "1ed260fda0df8ed859329f221a5eb24175d38fd7d10f586cf6468574e6385b79" dependencies = [ "bevy_app", "bevy_asset", @@ -2459,7 +2559,7 @@ dependencies = [ [[package]] name = "iyes_ui" version = "0.1.0" -source = "git+https://github.com/IyesGames/iyes_ui#aa1783bef555bcec21a58803a776ff588cf05d67" +source = "git+https://github.com/IyesGames/iyes_ui#8742299c73509bbfcba5d51a20e8496df4a9ec88" dependencies = [ "bevy", "iyes_cli", @@ -2577,37 +2677,37 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "leafwing-input-manager" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b56a6f71e8f5beefc8d3841ffa6ea9bbb1123956fa7c75fd673e69b65a8ca62f" +checksum = "61e0ad1622a1664b055990aac9efd90a9012b82737847e6a85d36ce38d2bf7c4" dependencies = [ "bevy", "derive_more", "fixedbitset", - "itertools", + "itertools 0.12.0", "leafwing_input_manager_macros", + "multimap", "once_cell", - "petitset", "serde", ] [[package]] name = "leafwing_input_manager_macros" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11aefabfcc9ef0a78bc97eea053d2f1bb050d5278a4134bdc1b769064a90064a" +checksum = "cde8ae98d45607e4015d0b772d4a234788ebd7a41f09879f408c7f772b81e5bf" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] name = "libc" -version = "0.2.150" +version = "0.2.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" [[package]] name = "libloading" @@ -2685,9 +2785,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "mach2" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" dependencies = [ "libc", ] @@ -2722,9 +2822,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memmap2" @@ -2746,16 +2846,17 @@ dependencies = [ [[package]] name = "metal" -version = "0.24.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" +checksum = "623b5e6cefd76e58f774bd3cc0c6f5c7615c58c03a97815245a25c3c9bdee318" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "block", "core-graphics-types", - "foreign-types", + "foreign-types 0.5.0", "log", "objc", + "paste", ] [[package]] @@ -2776,9 +2877,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "log", @@ -2786,14 +2887,23 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "multimap" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1a5d38b9b352dbd913288736af36af41c48d61b1a8cd34bcecd727561b7d511" +dependencies = [ + "serde", +] + [[package]] name = "naga" -version = "0.12.3" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb" +checksum = "c1ceaaa4eedaece7e4ec08c55c640ba03dbb73fb812a6570a59bcf1930d0f70e" dependencies = [ "bit-set", - "bitflags 1.3.2", + "bitflags 2.4.1", "codespan-reporting", "hexf-parse", "indexmap 1.9.3", @@ -2809,9 +2919,9 @@ dependencies = [ [[package]] name = "naga_oil" -version = "0.8.2" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8be942a5c21c58b9b0bf4d9b99db3634ddb7a916f8e1d1d0b71820cc4150e56b" +checksum = "4ac54c77b3529887f9668d3dd81e955e58f252b31a333f836e3548c06460b958" dependencies = [ "bit-set", "codespan-reporting", @@ -2820,7 +2930,7 @@ dependencies = [ "naga", "once_cell", "regex", - "regex-syntax 0.6.29", + "regex-syntax 0.7.5", "rustc-hash", "thiserror", "tracing", @@ -2930,6 +3040,12 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "nonmax" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "610a5acd306ec67f907abe5567859a3c693fb9886eb1f012ab8f2a47bef3db51" + [[package]] name = "notify" version = "6.1.1" @@ -2949,6 +3065,20 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "notify-debouncer-full" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f5dab59c348b9b50cf7f261960a20e389feb2713636399cd9082cd4b536154" +dependencies = [ + "crossbeam-channel", + "file-id", + "log", + "notify", + "parking_lot", + "walkdir", +] + [[package]] name = "ntapi" version = "0.4.1" @@ -3043,7 +3173,7 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", @@ -3055,10 +3185,10 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -3108,9 +3238,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -3140,9 +3270,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "option-ext" @@ -3203,27 +3333,6 @@ dependencies = [ "windows-targets 0.48.5", ] -[[package]] -name = "parry2d" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "104ae65232e20477a98f9f1e75ca9850eae24a2ea846a2b1a0af03ad752136ce" -dependencies = [ - "approx", - "arrayvec", - "bitflags 1.3.2", - "downcast-rs", - "either", - "nalgebra", - "num-derive", - "num-traits", - "rustc-hash", - "simba", - "slab", - "smallvec", - "spade", -] - [[package]] name = "parry2d-f64" version = "0.13.5" @@ -3251,6 +3360,12 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +[[package]] +name = "path-clean" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef" + [[package]] name = "path-slash" version = "0.2.1" @@ -3279,26 +3394,28 @@ dependencies = [ "indexmap 2.1.0", ] -[[package]] -name = "petitset" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1a50d821a2526af6d5756c23c68e453532a986e361a3e12c9cc7fe61d862ac" -dependencies = [ - "serde", -] - [[package]] name = "pin-project-lite" version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" [[package]] name = "png" @@ -3341,29 +3458,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +dependencies = [ + "toml_edit 0.20.7", ] [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" dependencies = [ "unicode-ident", ] [[package]] name = "profiling" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b" +checksum = "d135ede8821cf6376eb7a64148901e1690b788c11ae94dc297ae917dbc91dc0e" [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -3495,6 +3621,12 @@ version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +[[package]] +name = "regex-syntax" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" + [[package]] name = "regex-syntax" version = "0.8.2" @@ -3529,7 +3661,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ - "base64 0.21.5", + "base64 0.21.6", "bitflags 2.4.1", "serde", "serde_derive", @@ -3569,9 +3701,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "safe_arch" @@ -3622,46 +3754,46 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" dependencies = [ - "self_cell 1.0.2", + "self_cell 1.0.3", ] [[package]] name = "self_cell" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e388332cd64eb80cd595a00941baf513caffae8dce9cfd0467fc9c66397dade6" +checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" [[package]] name = "semver" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" dependencies = [ "itoa", "ryu", @@ -3670,9 +3802,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -3683,7 +3815,7 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" dependencies = [ - "base64 0.21.5", + "base64 0.21.6", "chrono", "hex", "indexmap 1.9.3", @@ -3703,14 +3835,14 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "serde_yaml" -version = "0.9.27" +version = "0.9.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" +checksum = "b1bf28c79a99f70ee1f1d83d10c875d2e70618417fda01ad1785e027579d9d38" dependencies = [ "indexmap 2.1.0", "itoa", @@ -3770,9 +3902,9 @@ dependencies = [ [[package]] name = "slotmap" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" dependencies = [ "version_check", ] @@ -3816,9 +3948,9 @@ dependencies = [ [[package]] name = "spade" -version = "2.4.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d3bf265ec2d5dd1ddf87863252123447c550491adba2c70c574173a95cd8ba" +checksum = "bd774eb23cff002036706e6ea83c3f4ab4c80dad89da76fe16d49f77ab71682f" dependencies = [ "hashbrown 0.14.3", "num-traits", @@ -3873,9 +4005,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -3910,9 +4042,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -3935,7 +4067,7 @@ dependencies = [ "enum-iterator", "enum-map", "fluent_content", - "glam 0.23.0", + "glam 0.25.0", "iyes_bevy_extras", "iyes_cli", "iyes_progress", @@ -3951,9 +4083,9 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] @@ -3975,18 +4107,18 @@ checksum = "e4c60d69f36615a077cc7663b9cb8e42275722d23e58a7fa3d2c7f2915d09d04" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -4001,9 +4133,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" dependencies = [ "deranged", "itoa", @@ -4021,9 +4153,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" dependencies = [ "time-core", ] @@ -4064,14 +4196,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.8" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.21.0", ] [[package]] @@ -4088,6 +4220,28 @@ name = "toml_edit" version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.1.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.1.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ "indexmap 2.1.0", "serde", @@ -4115,7 +4269,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -4212,18 +4366,18 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unic-langid" -version = "0.9.1" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f" +checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516" dependencies = [ "unic-langid-impl", ] [[package]] name = "unic-langid-impl" -version = "0.9.1" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff" +checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6" dependencies = [ "serde", "tinystr", @@ -4249,9 +4403,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "unsafe-libyaml" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" +checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" [[package]] name = "uuid" @@ -4325,7 +4479,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", "wasm-bindgen-shared", ] @@ -4359,7 +4513,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4445,9 +4599,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.65" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" dependencies = [ "js-sys", "wasm-bindgen", @@ -4455,9 +4609,9 @@ dependencies = [ [[package]] name = "wgpu" -version = "0.16.3" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd" +checksum = "752e44d3998ef35f71830dd1ad3da513e628e2e4d4aedb0ab580f850827a0b41" dependencies = [ "arrayvec", "cfg-if", @@ -4479,9 +4633,9 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.16.1" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2" +checksum = "0f8a44dd301a30ceeed3c27d8c0090433d3da04d7b2a4042738095a424d12ae7" dependencies = [ "arrayvec", "bit-vec", @@ -4502,9 +4656,9 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.16.2" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448" +checksum = "9a80bf0e3c77399bb52850cb0830af9bad073d5cfcb9dd8253bef8125c42db17" dependencies = [ "android_system_properties", "arrayvec", @@ -4514,7 +4668,6 @@ dependencies = [ "block", "core-graphics-types", "d3d12", - "foreign-types", "glow", "gpu-alloc", "gpu-allocator", @@ -4544,9 +4697,9 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.16.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a" +checksum = "ee64d7398d0c2f9ca48922c902ef69c42d000c759f3db41e355f4a570b052b67" dependencies = [ "bitflags 2.4.1", "js-sys", @@ -4631,21 +4784,21 @@ dependencies = [ [[package]] name = "windows" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core", - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] @@ -4688,6 +4841,15 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + [[package]] name = "windows-targets" version = "0.42.2" @@ -4718,6 +4880,21 @@ dependencies = [ "windows_x86_64_msvc 0.48.5", ] +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -4730,6 +4907,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -4742,6 +4925,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -4754,6 +4943,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -4766,6 +4961,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -4778,6 +4979,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" @@ -4790,6 +4997,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -4802,6 +5015,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + [[package]] name = "winit" version = "0.28.7" @@ -4839,9 +5058,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.5.19" +version = "0.5.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" dependencies = [ "memchr", ] @@ -4859,12 +5078,9 @@ dependencies = [ [[package]] name = "xcursor" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" -dependencies = [ - "nom", -] +checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" [[package]] name = "xi-unicode" @@ -4880,20 +5096,20 @@ checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" [[package]] name = "zerocopy" -version = "0.7.26" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.26" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] diff --git a/Cargo.toml b/Cargo.toml index 569968f5..64806ca9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,6 +5,28 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[patch.crates-io] +bevy = { git = "https://github.com/TheSeekerGame/bevy", branch = "TheSeeker" } +bevy_ecs = { git = "https://github.com/TheSeekerGame/bevy", branch = "TheSeeker" } +bevy_app = { git = "https://github.com/TheSeekerGame/bevy", branch = "TheSeeker" } +bevy_asset = { git = "https://github.com/TheSeekerGame/bevy", branch = "TheSeeker" } +bevy_log = { git = "https://github.com/TheSeekerGame/bevy", branch = "TheSeeker" } +bevy_utils = { git = "https://github.com/TheSeekerGame/bevy", branch = "TheSeeker" } + +[lib] +name = "theseeker_engine" +path = "engine/src/lib.rs" + +[[bin]] +name = "theseeker_game" +path = "game/src/main.rs" + +[features] +dev = [ + "bevy/file_watcher", + "bevy_xpbd_2d/debug-plugin", +] + # dev: Enable max optimizations for dependencies, but not for our code [profile.dev.package."*"] opt-level = 3 @@ -21,43 +43,29 @@ lto = true codegen-units = 1 debug = false -[lib] -name = "theseeker_engine" -path = "engine/src/lib.rs" - -[[bin]] -name = "theseeker_game" -path = "game/src/main.rs" - -[features] -dev = [ - "bevy/filesystem_watcher", - "bevy_xpbd_2d/debug-plugin", -] - # Random little libraries [dependencies] -anyhow = "1.0.71" +anyhow = "1.0.79" derive_more = "0.99.17" directories = "5.0.1" enum-iterator = "1.4.1" -enum-map = "2.6.0" +enum-map = "2.7.3" fluent_content = "0.0.5" -glam = "0.23.0" +glam = "0.25.0" rand = "0.8.5" -serde_with = "3.1.0" -thiserror = "1.0.43" -toml = "0.7.6" -unic-langid = "0.9.1" +serde_with = "3.4.0" +thiserror = "1.0.56" +toml = "0.8.8" +unic-langid = "0.9.4" [dependencies.serde] -version = "1.0.167" +version = "1.0.194" features = [ "derive", ] [dependencies.bevy] -version = "0.11" +version = "0.12" default-features = false features = [ "multi-threaded", @@ -87,10 +95,7 @@ features = [ ] [dependencies.bevy_asset_loader] -# version = "0.17" -# FIXME: temporary until there is a new release with our dynamic asset api PRs -git = "https://github.com/NiklasEi/bevy_asset_loader" -rev = "d048c88348a393b28c51dcc650917ff772741a4a" +version = "0.19" features = [ "2d", "progress_tracking", @@ -98,23 +103,27 @@ features = [ ] [dependencies.bevy_common_assets] -version = "0.7" +version = "0.8" features = [ "toml", "ron", ] [dependencies.bevy_ecs_ldtk] -version = "0.8" +# version = "0.8" +git = "https://github.com/TheSeekerGame/bevy_ecs_ldtk" +rev = "68af1c11cb95b1ed85f9f5008e7308f41e8015f1" [dependencies.bevy_ecs_tilemap] -version = "0.11" +# version = "0.11" +git = "https://github.com/StarArawn/bevy_ecs_tilemap" +rev = "b08a5d997867d5e5a760e296dc38e435c6b268cc" [dependencies.bevy_fluent] -version = "0.7" +version = "0.8" [dependencies.bevy_tweening] -version = "0.8" +version = "0.9" [dependencies.iyes_bevy_extras] git = "https://github.com/IyesGames/iyes_bevy_extras" @@ -124,7 +133,7 @@ features = ["2d"] git = "https://github.com/IyesGames/iyes_cli" [dependencies.iyes_progress] -version = "0.9" +version = "0.10" features = ["assets"] [dependencies.iyes_ui] @@ -132,15 +141,15 @@ git = "https://github.com/IyesGames/iyes_ui" features = ["iyes_cli"] [dependencies.leafwing-input-manager] -version = "0.10" +version = "0.11" [dependencies.bevy_xpbd_2d] -version = "0.2.0" +version = "0.3.2" default-features = false features = [ "2d", - "collider-from-mesh", "f64", - "simd", + # "parallel", + # "simd", ] diff --git a/assets/levels/level.01.ldtk b/assets/levels/level.01.ldtk index d40bd076..514611d9 100644 --- a/assets/levels/level.01.ldtk +++ b/assets/levels/level.01.ldtk @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aafa7bbf464122c9f1218c02522a5f9331da1c709db1f9f899929e3fb51a740e -size 5375574 +oid sha256:8fb208c09acb592ce52cdf6a5365b9a89fcb7d041e81def66bd43c7e15d370b0 +size 5376477 diff --git a/assets/locale.assets.ron b/assets/locale.assets.ron deleted file mode 100644 index b31337f8..00000000 --- a/assets/locale.assets.ron +++ /dev/null @@ -1,9 +0,0 @@ -({ - "locale.bundles": Files ( - paths: [ - "locale/en-US/en-US.ftl.ron", - "locale/bg-BG/bg-BG.ftl.ron", - "locale/ru-RU/ru-RU.ftl.ron", - ], - ), -}) diff --git a/engine/src/assets.rs b/engine/src/assets.rs index e620aa04..cafdfcd7 100644 --- a/engine/src/assets.rs +++ b/engine/src/assets.rs @@ -119,7 +119,7 @@ pub fn resolve_asset_keys( /// and kept loaded at all times, even when unused. #[derive(Resource, Default)] pub struct PreloadedAssets { - handles: HashSet, + handles: HashSet, map: HashMap>, } @@ -141,7 +141,7 @@ impl PreloadedAssets { None } - pub fn get_multi_asset(&self, key: &str) -> Option<&[HandleUntyped]> { + pub fn get_multi_asset(&self, key: &str) -> Option<&[UntypedHandle]> { if let Some(d) = self.get_asset(key) { if let DynamicAssetType::Collection(handles) = d { return Some(handles.as_slice()); diff --git a/engine/src/assets/animation.rs b/engine/src/assets/animation.rs index 5eeb3a83..a12dba7f 100644 --- a/engine/src/assets/animation.rs +++ b/engine/src/assets/animation.rs @@ -7,7 +7,7 @@ use crate::prelude::*; /// Sprite Animation Asset type /// /// Would typically be loaded from TOML files. -#[derive(Debug, Clone)] +#[derive(Asset, Debug, Clone)] #[derive(Serialize, Deserialize)] #[derive(TypeUuid, TypePath)] #[uuid = "6D201246-BDB4-4803-A52A-76D95E3B6C77"] diff --git a/engine/src/assets/script.rs b/engine/src/assets/script.rs index dcc73f10..a006664a 100644 --- a/engine/src/assets/script.rs +++ b/engine/src/assets/script.rs @@ -6,7 +6,7 @@ use crate::prelude::*; /// Scripted Sequence Asset type /// /// Would typically be loaded from TOML files. -#[derive(Debug, Clone)] +#[derive(Asset, Debug, Clone)] #[derive(Serialize, Deserialize)] #[derive(TypeUuid, TypePath)] #[uuid = "8D1B7F2F-3798-4438-9EB8-A5EEC3EA77A9"] diff --git a/game/src/assets.rs b/game/src/assets.rs index eebe6877..8ef9d4fd 100644 --- a/game/src/assets.rs +++ b/game/src/assets.rs @@ -33,14 +33,9 @@ impl Plugin for AssetsPlugin { AppState::AssetsLoading, "ui.assets.ron", ); - app.add_dynamic_collection_to_loading_state::<_, StandardDynamicAssetCollection>( - AppState::AssetsLoading, - "locale.assets.ron", - ); // Some assets can be defined statically in Resource structs for ease of access app.add_collection_to_loading_state::<_, UiAssets>(AppState::AssetsLoading); - app.add_collection_to_loading_state::<_, LocaleAssets>(AppState::AssetsLoading); app.add_collection_to_loading_state::<_, MainMenuAssets>(AppState::AssetsLoading); } } @@ -62,9 +57,3 @@ pub struct MainMenuAssets { #[asset(key = "ui.mainmenu.logo")] pub logo: Handle, } - -#[derive(AssetCollection, Resource)] -pub struct LocaleAssets { - #[asset(key = "locale.bundles", collection(typed))] - pub bundles: Vec>, -} diff --git a/game/src/game/wall.rs b/game/src/game/wall.rs index 83854d9e..6f7a819b 100644 --- a/game/src/game/wall.rs +++ b/game/src/game/wall.rs @@ -40,8 +40,9 @@ pub fn spawn_wall_collision( mut commands: Commands, wall_query: Query<(&GridCoords, &Parent), Added>, parent_query: Query<&Parent, Without>, - level_query: Query<(Entity, &Handle)>, - levels: Res>, + level_query: Query<(Entity, &LevelIid)>, + ldtk_projects: Query<&Handle>, + ldtk_project_assets: Res>, ) { /// Represents a wide wall that is 1 tile tall /// Used to spawn wall collisions @@ -59,6 +60,10 @@ pub fn spawn_wall_collision( bottom: i32, } + if wall_query.is_empty() { + return; + } + // Consider where the walls are // storing them as GridCoords in a HashSet for quick, easy lookup // @@ -80,110 +85,109 @@ pub fn spawn_wall_collision( } }); - if !wall_query.is_empty() { - level_query.for_each(|(level_entity, level_handle)| { - if let Some(level_walls) = level_to_wall_locations.get(&level_entity) { - let level = levels - .get(level_handle) - .expect("Level should be loaded by this point"); - - let LayerInstance { - c_wid: width, - c_hei: height, - grid_size, - .. - } = level - .level - .layer_instances - .clone() - .expect("Level asset should have layers")[0]; - - // combine wall tiles into flat "plates" in each individual row - let mut plate_stack: Vec> = Vec::new(); - - for y in 0..height { - let mut row_plates: Vec = Vec::new(); - let mut plate_start = None; - - // + 1 to the width so the algorithm "terminates" plates that touch the right edge - for x in 0..width + 1 { - match ( - plate_start, - level_walls.contains(&GridCoords { x, y }), - ) { - (Some(s), false) => { - row_plates.push(Plate { - left: s, - right: x - 1, - }); - plate_start = None; - }, - (None, true) => plate_start = Some(x), - _ => (), - } + level_query.for_each(|(level_entity, level_iid)| { + if let Some(level_walls) = level_to_wall_locations.get(&level_entity) { + let ldtk_project = ldtk_project_assets + .get(ldtk_projects.single()) + .expect("Project should be loaded if level has spawned"); + + let level = ldtk_project + .as_standalone() + .get_loaded_level_by_iid(&level_iid.to_string()) + .expect("Spawned level should exist in LDtk project"); + + let LayerInstance { + c_wid: width, + c_hei: height, + grid_size, + .. + } = level.layer_instances()[0]; + + // combine wall tiles into flat "plates" in each individual row + let mut plate_stack: Vec> = Vec::new(); + + for y in 0..height { + let mut row_plates: Vec = Vec::new(); + let mut plate_start = None; + + // + 1 to the width so the algorithm "terminates" plates that touch the right edge + for x in 0..width + 1 { + match ( + plate_start, + level_walls.contains(&GridCoords { x, y }), + ) { + (Some(s), false) => { + row_plates.push(Plate { + left: s, + right: x - 1, + }); + plate_start = None; + }, + (None, true) => plate_start = Some(x), + _ => (), } - - plate_stack.push(row_plates); } - // combine "plates" into rectangles across multiple rows - let mut rect_builder: HashMap = HashMap::new(); - let mut prev_row: Vec = Vec::new(); - let mut wall_rects: Vec = Vec::new(); - - // an extra empty row so the algorithm "finishes" the rects that touch the top edge - plate_stack.push(Vec::new()); - - for (y, current_row) in plate_stack.into_iter().enumerate() { - for prev_plate in &prev_row { - if !current_row.contains(prev_plate) { - // remove the finished rect so that the same plate in the future starts a new rect - if let Some(rect) = rect_builder.remove(prev_plate) { - wall_rects.push(rect); - } + plate_stack.push(row_plates); + } + + // combine "plates" into rectangles across multiple rows + let mut rect_builder: HashMap = HashMap::new(); + let mut prev_row: Vec = Vec::new(); + let mut wall_rects: Vec = Vec::new(); + + // an extra empty row so the algorithm "finishes" the rects that touch the top edge + plate_stack.push(Vec::new()); + + for (y, current_row) in plate_stack.into_iter().enumerate() { + for prev_plate in &prev_row { + if !current_row.contains(prev_plate) { + // remove the finished rect so that the same plate in the future starts a new rect + if let Some(rect) = rect_builder.remove(prev_plate) { + wall_rects.push(rect); } } - for plate in ¤t_row { - rect_builder - .entry(plate.clone()) - .and_modify(|e| e.top += 1) - .or_insert(Rect { - bottom: y as i32, - top: y as i32, - left: plate.left, - right: plate.right, - }); - } - prev_row = current_row; } - - commands.entity(level_entity).with_children(|level| { - // Spawn colliders for every rectangle.. - // Making the collider a child of the level serves two purposes: - // 1. Adjusts the transforms to be relative to the level for free - // 2. the colliders will be despawned automatically when levels unload - for wall_rect in wall_rects { - level.spawn(( - Collider::cuboid( - (wall_rect.right as f64 - wall_rect.left as f64 + 1.) - * grid_size as f64, - (wall_rect.top as f64 - wall_rect.bottom as f64 + 1.) - * grid_size as f64, - ), - RigidBody::Static, - Friction::new(1.0), - Transform::from_xyz( - (wall_rect.left + wall_rect.right + 1) as f32 * grid_size as f32 - / 2., - (wall_rect.bottom + wall_rect.top + 1) as f32 * grid_size as f32 - / 2., - 10., - ), - GlobalTransform::default(), - )); - } - }); + for plate in ¤t_row { + rect_builder + .entry(plate.clone()) + .and_modify(|e| e.top += 1) + .or_insert(Rect { + bottom: y as i32, + top: y as i32, + left: plate.left, + right: plate.right, + }); + } + prev_row = current_row; } - }); - } + + commands.entity(level_entity).with_children(|level| { + // Spawn colliders for every rectangle.. + // Making the collider a child of the level serves two purposes: + // 1. Adjusts the transforms to be relative to the level for free + // 2. the colliders will be despawned automatically when levels unload + for wall_rect in wall_rects { + level.spawn(( + Collider::cuboid( + (wall_rect.right as f64 - wall_rect.left as f64 + 1.) + * grid_size as f64, + (wall_rect.top as f64 - wall_rect.bottom as f64 + 1.) + * grid_size as f64, + ), + RigidBody::Static, + Friction::new(1.0), + Transform::from_xyz( + (wall_rect.left + wall_rect.right + 1) as f32 * grid_size as f32 + / 2., + (wall_rect.bottom + wall_rect.top + 1) as f32 * grid_size as f32 + / 2., + 10., + ), + GlobalTransform::default(), + )); + } + }); + } + }); } diff --git a/game/src/locale.rs b/game/src/locale.rs index c4fcff68..670f03ca 100644 --- a/game/src/locale.rs +++ b/game/src/locale.rs @@ -1,8 +1,8 @@ +use bevy::asset::{LoadedFolder, LoadState}; use bevy_fluent::prelude::*; use fluent_content::Content; use unic_langid::LanguageIdentifier; -use crate::assets::LocaleAssets; use crate::prelude::*; pub struct LocalePlugin; @@ -10,9 +10,13 @@ pub struct LocalePlugin; impl Plugin for LocalePlugin { fn build(&self, app: &mut App) { app.register_clicommand_args("locale", cli_locale); - app.add_systems( - OnExit(AppState::AssetsLoading), - (detect_locales, init_l10n).chain(), + app.insert_resource( + Locale::new("en-US".parse().unwrap()).with_default("en-US".parse().unwrap()), + ); + app.add_systems(Update, + init_l10n + .track_progress() + .run_if(in_state(AppState::AssetsLoading)) ); app.add_systems( Update, @@ -51,37 +55,43 @@ fn cli_locale(In(args): In>, mut locale: ResMut, locales: Re } } -fn detect_locales(world: &mut World) { - let locales = { - let assets = world.resource::(); - let bundles = world.resource::>(); - assets - .bundles - .iter() - .map(|handle| { - let bundle = bundles.get(handle).unwrap(); - bundle.locales[0].clone() - }) - .collect() - }; - world.insert_resource( - // FIXME: do actual locale selection - Locale::new("en-US".parse().unwrap()).with_default("en-US".parse().unwrap()), - ); - world.insert_resource(Locales(locales)); -} +#[derive(Resource)] +pub struct LocalesFolder(Handle); -fn init_l10n(mut commands: Commands, l10n_builder: LocalizationBuilder, assets: Res) { - let l10n = l10n_builder.build(assets.bundles.iter()); - commands.insert_resource(l10n); +fn init_l10n( + mut commands: Commands, + l10n_builder: LocalizationBuilder, + l10n_bundles: Res>, + folder: Option>, + mut done: Local, + ass: Res, +) -> Progress { + match (*done, folder) { + (false, None) => { + commands.insert_resource(LocalesFolder(ass.load_folder("locale"))); + } + (false, Some(folder)) => { + if let Some(LoadState::Loaded) = ass.get_load_state(&folder.0) { + let locales = Locales(l10n_bundles.iter() + .map(|(_, bundle)| bundle.locales[0].clone()) + .collect()); + let l10n = l10n_builder.build(&folder.0); + commands.insert_resource(locales); + commands.insert_resource(l10n); + *done = true; + } + } + (true, _) => {} + } + (*done).into() } fn resolve_l10n( locale: Res, l10n_builder: LocalizationBuilder, - assets: Res, mut ass_ev: EventReader>, mut l10n: ResMut, + l10n_folder: Res, mut query: ParamSet<( Query<(&mut Text, &L10nKey), Changed>, Query<(&mut Text, &L10nKey)>, @@ -95,7 +105,7 @@ fn resolve_l10n( } if regenerate { - *l10n = l10n_builder.build(assets.bundles.iter()); + *l10n = l10n_builder.build(&l10n_folder.0); } // closure for updating UI text @@ -103,7 +113,7 @@ fn resolve_l10n( if let Some(string) = l10n.content(&key.0) { text.sections[0].value = string; } else { - text.sections[0].value = String::new(); + text.sections[0].value = key.0.clone(); } }; diff --git a/game/src/main.rs b/game/src/main.rs index 5ae1af97..1e1d49b8 100644 --- a/game/src/main.rs +++ b/game/src/main.rs @@ -39,11 +39,6 @@ fn main() { }); let bevy_plugins = bevy_plugins.set(ImagePlugin::default_nearest()); #[cfg(feature = "dev")] - let bevy_plugins = bevy_plugins.set(bevy::asset::AssetPlugin { - watch_for_changes: bevy::asset::ChangeWatcher::with_delay(Duration::from_millis(250)), - ..default() - }); - #[cfg(feature = "dev")] let bevy_plugins = bevy_plugins.set(bevy::log::LogPlugin { filter: "info,wgpu_core=warn,wgpu_hal=warn,iyes_progress=trace,theseeker_game=trace,theseeker_engine=trace".into(), level: bevy::log::Level::TRACE, @@ -62,8 +57,9 @@ fn main() { // and custom "engine" app.add_plugins(theseeker_engine::EnginePlugins); - app.insert_resource(PhysicsTimestep::FixedOnce(1.0 / 96.0)); + app.insert_resource(Time::new_with(Physics::fixed_hz(96.0))); app.insert_resource(Gravity::default()); + app.insert_resource(SubstepCount(1)); // external plugins app.add_plugins(( diff --git a/game/src/ui/console.rs b/game/src/ui/console.rs index c7ab4d88..b3c960d6 100644 --- a/game/src/ui/console.rs +++ b/game/src/ui/console.rs @@ -163,7 +163,7 @@ fn console_text_input( evr_char.clear(); return; } - for ev in evr_char.iter() { + for ev in evr_char.read() { for (mut text, mut hisentry, _) in &mut query { text.sections[1].value.push(ev.char); hisentry.0 = None;