From eca7e95e10e103d87e872166f8cbc9ce866b00d3 Mon Sep 17 00:00:00 2001 From: Elijah Voigt Date: Wed, 6 Dec 2023 21:25:48 -0800 Subject: [PATCH] So close to getting it to compile... Then the real fun begins... --- Cargo.lock | 1130 +++++++++++++++++++++++++++++++----------------- Cargo.toml | 6 +- src/credits.rs | 36 +- src/debug.rs | 13 +- src/loading.rs | 44 +- src/main.rs | 5 +- src/menu.rs | 1 - src/prelude.rs | 1 - src/tweak.rs | 28 +- 9 files changed, 790 insertions(+), 474 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 91fc745..e673a1f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -20,24 +20,24 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] name = "accesskit" -version = "0.11.2" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eb1adf08c5bcaa8490b9851fd53cca27fa9880076f178ea9d29f05196728a8" +checksum = "ca8410747ed85a17c4a1e9ed3f5a74d3e7bdcc876cf9a18ff40ae21d645997b2" [[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", @@ -190,6 +190,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + [[package]] name = "arrayvec" version = "0.7.4" @@ -205,6 +211,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" @@ -212,31 +228,67 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", + "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.0", + "event-listener-strategy", "futures-core", + "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" dependencies = [ - "async-lock", + "async-lock 3.2.0", "async-task", "concurrent-queue", "fastrand 2.0.1", - "futures-lite", + "futures-lite 2.1.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 = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +dependencies = [ + "event-listener 4.0.0", + "event-listener-strategy", + "pin-project-lite", ] [[package]] @@ -245,6 +297,12 @@ version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "autocfg" version = "1.1.0" @@ -280,42 +338,42 @@ checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "bevy" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91c6d3ec4f89e85294dc97334c5b271ddc301fdf67ac9bb994fe44d9273e6ed7" +checksum = "e4bc7e09282a82a48d70ade0c4c1154b0fd7882a735a39c66766a5d0f4718ea9" dependencies = [ "bevy_internal", ] [[package]] name = "bevy_a11y" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "132c9e35a77c5395951f6d25fa2c52ee92296353426df4f961e60f3ff47e2e42" +checksum = "68080288c932634f6563d3a8299efe0ddc9ea6787539c4c771ba250d089a94f0" dependencies = [ "accesskit", - "bevy_app", - "bevy_derive", - "bevy_ecs", + "bevy_app 0.12.1", + "bevy_derive 0.12.1", + "bevy_ecs 0.12.1", ] [[package]] name = "bevy_animation" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f44eae3f1c35a87e38ad146f72317f19ce7616dad8bbdfb88ee752c1282d28c5" +checksum = "7aa37683b1281e1ba8cf285644e6e3f0704f14b3901c5ee282067ff7ff6f4a56" dependencies = [ - "bevy_app", + "bevy_app 0.12.1", "bevy_asset", "bevy_core", - "bevy_ecs", + "bevy_ecs 0.12.1", "bevy_hierarchy", "bevy_math", - "bevy_reflect", + "bevy_reflect 0.12.1", "bevy_render", "bevy_time", "bevy_transform", - "bevy_utils", + "bevy_utils 0.12.1", ] [[package]] @@ -324,38 +382,57 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f557a7d59e1e16892d7544fc37316506ee598cb5310ef0365125a30783c11531" dependencies = [ - "bevy_derive", - "bevy_ecs", - "bevy_reflect", - "bevy_tasks", - "bevy_utils", + "bevy_derive 0.11.3", + "bevy_ecs 0.11.3", + "bevy_reflect 0.11.3", + "bevy_tasks 0.11.3", + "bevy_utils 0.11.3", "downcast-rs", "wasm-bindgen", "web-sys", ] [[package]] -name = "bevy_asset" -version = "0.11.3" +name = "bevy_app" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9714af523da4cdf58c42a317e5ed40349708ad954a18533991fd64c8ae0a6f68" +checksum = "d41731817993f92e4363dd3335558e779e290bc71eefc0b5547052b85810907e" dependencies = [ - "anyhow", - "async-channel", - "bevy_app", - "bevy_diagnostic", - "bevy_ecs", - "bevy_log", - "bevy_reflect", - "bevy_tasks", - "bevy_utils", + "bevy_derive 0.12.1", + "bevy_ecs 0.12.1", + "bevy_reflect 0.12.1", + "bevy_tasks 0.12.1", + "bevy_utils 0.12.1", + "downcast-rs", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "bevy_asset" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "935984568f75867dd7357133b06f4b1502cd2be55e4642d483ce597e46e63bff" +dependencies = [ + "async-broadcast", + "async-fs", + "async-lock 2.8.0", + "bevy_app 0.12.1", + "bevy_asset_macros", + "bevy_ecs 0.12.1", + "bevy_log 0.12.1", + "bevy_reflect 0.12.1", + "bevy_tasks 0.12.1", + "bevy_utils 0.12.1", "bevy_winit", + "blake3", "crossbeam-channel", "downcast-rs", - "fastrand 1.9.0", + "futures-io", + "futures-lite 1.13.0", "js-sys", - "notify", "parking_lot", + "ron", "serde", "thiserror", "wasm-bindgen", @@ -363,58 +440,69 @@ dependencies = [ "web-sys", ] +[[package]] +name = "bevy_asset_macros" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f48b9bbe4ec605e4910b5cd1e1a0acbfbe0b80af5f3bcc4489a9fdd1e80058c" +dependencies = [ + "bevy_macro_utils 0.12.1", + "proc-macro2", + "quote", + "syn 2.0.39", +] + [[package]] name = "bevy_audio" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4de308bd63a2f7a0b77ffeb7cf00cc185ec01393c5db2091fe03964f97152749" +checksum = "18a69889e1bfa4dbac4e641536b94f91c441da55796ad9832e77836b8264688b" dependencies = [ - "anyhow", - "bevy_app", + "bevy_app 0.12.1", "bevy_asset", - "bevy_derive", - "bevy_ecs", + "bevy_derive 0.12.1", + "bevy_ecs 0.12.1", "bevy_math", - "bevy_reflect", + "bevy_reflect 0.12.1", "bevy_transform", - "bevy_utils", + "bevy_utils 0.12.1", "oboe", - "parking_lot", "rodio", ] [[package]] name = "bevy_core" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d5272321be5fcf5ce2fb16023bc825bb10dfcb71611117296537181ce950f48" +checksum = "3daa24502a14839509f02407bc7e48299fe84d260877de23b60662de0f4f4b6c" dependencies = [ - "bevy_app", - "bevy_ecs", + "bevy_app 0.12.1", + "bevy_ecs 0.12.1", "bevy_math", - "bevy_reflect", - "bevy_tasks", - "bevy_utils", + "bevy_reflect 0.12.1", + "bevy_tasks 0.12.1", + "bevy_utils 0.12.1", "bytemuck", "serde", ] [[package]] name = "bevy_core_pipeline" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67382fa9c96ce4f4e5833ed7cedd9886844a8f3284b4a717bd4ac738dcdea0c3" +checksum = "b4b77c4fca6e90edbe2e72da7bc9aa7aed7dfdfded0920ae0a0c845f5e11084a" dependencies = [ - "bevy_app", + "bevy_app 0.12.1", "bevy_asset", "bevy_core", - "bevy_derive", - "bevy_ecs", + "bevy_derive 0.12.1", + "bevy_ecs 0.12.1", + "bevy_log 0.12.1", "bevy_math", - "bevy_reflect", + "bevy_reflect 0.12.1", "bevy_render", "bevy_transform", - "bevy_utils", + "bevy_utils 0.12.1", "bitflags 2.4.1", "radsort", "serde", @@ -426,23 +514,34 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44e4e2784a81430199e4157e02903a987a32127c773985506f020e7d501b62e" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.11.3", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "bevy_derive" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f484318350462c58ba3942a45a656c1fd6b6e484a6b6b7abc3a787ad1a51e500" +dependencies = [ + "bevy_macro_utils 0.12.1", "quote", "syn 2.0.39", ] [[package]] name = "bevy_diagnostic" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6babb230dc383c98fdfc9603e3a7a2a49e1e2879dbe8291059ef37dca897932e" +checksum = "fa38ca5967d335cc1006a0e0f1a86c350e2f15fd1878449f61d04cd57a7c4060" dependencies = [ - "bevy_app", + "bevy_app 0.12.1", "bevy_core", - "bevy_ecs", - "bevy_log", + "bevy_ecs 0.12.1", + "bevy_log 0.12.1", "bevy_time", - "bevy_utils", + "bevy_utils 0.12.1", "sysinfo", ] @@ -452,14 +551,35 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "266144b36df7e834d5198049e037ecdf2a2310a76ce39ed937d1b0a6a2c4e8c6" dependencies = [ - "async-channel", - "bevy_ecs_macros", - "bevy_ptr", - "bevy_reflect", - "bevy_tasks", - "bevy_utils", + "async-channel 1.9.0", + "bevy_ecs_macros 0.11.3", + "bevy_ptr 0.11.3", + "bevy_reflect 0.11.3", + "bevy_tasks 0.11.3", + "bevy_utils 0.11.3", + "downcast-rs", + "event-listener 2.5.3", + "fixedbitset", + "rustc-hash", + "serde", + "thiserror", + "thread_local", +] + +[[package]] +name = "bevy_ecs" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7709fbd22f81fb681534cd913c41e1cd18b17143368743281195d7f024b61aea" +dependencies = [ + "async-channel 1.9.0", + "bevy_ecs_macros 0.12.1", + "bevy_ptr 0.12.1", + "bevy_reflect 0.12.1", + "bevy_tasks 0.12.1", + "bevy_utils 0.12.1", "downcast-rs", - "event-listener", + "event-listener 2.5.3", "fixedbitset", "rustc-hash", "serde", @@ -473,7 +593,19 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7157a9c3be038d5008ee3f114feb6cf6b39c1d3d32ee21a7cacb8f81fccdfa80" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.11.3", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "bevy_ecs_macros" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8843aa489f159f25cdcd9fee75cd7d221a7098a71eaa72cb2d6b40ac4e3f1ba" +dependencies = [ + "bevy_macro_utils 0.12.1", "proc-macro2", "quote", "syn 2.0.39", @@ -481,19 +613,18 @@ dependencies = [ [[package]] name = "bevy_encase_derive" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ac0f55ad6bca1be7b0f35bbd5fc95ed3d31e4e9db158fee8e5327f59006001" +checksum = "5328a3715e933ebbff07d0e99528dc423c4f7a53590ed1ac19a120348b028990" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.12.1", "encase_derive_impl", ] [[package]] name = "bevy_fmod" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e6508acdf8569c561f46f7aae93ac08da3f7df99181c54080317dd46e7b5e6e" +source = "git+https://github.com/Salzian/bevy_fmod?branch=update-0.12#97841c667ba242a547d197b1c9487a2e6367dd24" dependencies = [ "anyhow", "bevy", @@ -503,64 +634,63 @@ dependencies = [ [[package]] name = "bevy_gilrs" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65f4d79c55829f8016014593a42453f61a564ffb06ef79460d25696ccdfac67b" +checksum = "9b81ca2ebf66cbc7f998f1f142b15038ffe3c4ae1d51f70adda26dcf51b0c4ca" dependencies = [ - "bevy_app", - "bevy_ecs", + "bevy_app 0.12.1", + "bevy_ecs 0.12.1", "bevy_input", - "bevy_log", + "bevy_log 0.12.1", "bevy_time", - "bevy_utils", + "bevy_utils 0.12.1", "gilrs", "thiserror", ] [[package]] name = "bevy_gizmos" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e286a3e7276431963f4aa29165ea5429fa7dbbc6d5c5ba0c531e7dd44ecc88a2" +checksum = "db232274ddca2ae452eb2731b98267b795d133ddd14013121bc7daddde1c7491" dependencies = [ - "bevy_app", + "bevy_app 0.12.1", "bevy_asset", "bevy_core", "bevy_core_pipeline", - "bevy_ecs", + "bevy_ecs 0.12.1", "bevy_math", "bevy_pbr", - "bevy_reflect", + "bevy_reflect 0.12.1", "bevy_render", "bevy_sprite", "bevy_transform", - "bevy_utils", + "bevy_utils 0.12.1", ] [[package]] name = "bevy_gltf" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f07494a733dca032e71a20f4b1f423de765da49cbff34406ae6cd813f9b50c41" +checksum = "85adc6b1fc86687bf67149e0bafaa4d6da432232fa956472d1b37f19121d3ace" dependencies = [ - "anyhow", "base64 0.13.1", "bevy_animation", - "bevy_app", + "bevy_app 0.12.1", "bevy_asset", "bevy_core", "bevy_core_pipeline", - "bevy_ecs", + "bevy_ecs 0.12.1", "bevy_hierarchy", - "bevy_log", + "bevy_log 0.12.1", "bevy_math", "bevy_pbr", - "bevy_reflect", + "bevy_reflect 0.12.1", "bevy_render", "bevy_scene", - "bevy_tasks", + "bevy_tasks 0.12.1", "bevy_transform", - "bevy_utils", + "bevy_utils 0.12.1", "gltf", "percent-encoding", "serde", @@ -570,69 +700,69 @@ dependencies = [ [[package]] name = "bevy_hierarchy" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "103f8f58416ac6799b8c7f0b418f1fac9eba44fa924df3b0e16b09256b897e3d" +checksum = "06bd477152ce2ae1430f5e0a4f19216e5785c22fee1ab23788b5982dc59d1a55" dependencies = [ - "bevy_app", + "bevy_app 0.12.1", "bevy_core", - "bevy_ecs", - "bevy_log", - "bevy_reflect", - "bevy_utils", + "bevy_ecs 0.12.1", + "bevy_log 0.12.1", + "bevy_reflect 0.12.1", + "bevy_utils 0.12.1", "smallvec", ] [[package]] name = "bevy_input" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbd935401101ac8003f3c3aea70788c65ad03f7a32716a10608bedda7a648bc" +checksum = "cab9a599189b2a694c182d60cd52219dd9364f9892ff542d87799b8e45d9e6dc" dependencies = [ - "bevy_app", - "bevy_ecs", + "bevy_app 0.12.1", + "bevy_ecs 0.12.1", "bevy_math", - "bevy_reflect", - "bevy_utils", + "bevy_reflect 0.12.1", + "bevy_utils 0.12.1", "serde", "thiserror", ] [[package]] name = "bevy_internal" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0e35a9b2bd29aa784b3cc416bcbf2a298f69f00ca51fd042ea39d9af7fad37e" +checksum = "f124bece9831afd80897815231072d51bfe3ac58c6bb58eca8880963b6d0487c" dependencies = [ "bevy_a11y", "bevy_animation", - "bevy_app", + "bevy_app 0.12.1", "bevy_asset", "bevy_audio", "bevy_core", "bevy_core_pipeline", - "bevy_derive", + "bevy_derive 0.12.1", "bevy_diagnostic", - "bevy_ecs", + "bevy_ecs 0.12.1", "bevy_gilrs", "bevy_gizmos", "bevy_gltf", "bevy_hierarchy", "bevy_input", - "bevy_log", + "bevy_log 0.12.1", "bevy_math", "bevy_pbr", - "bevy_ptr", - "bevy_reflect", + "bevy_ptr 0.12.1", + "bevy_reflect 0.12.1", "bevy_render", "bevy_scene", "bevy_sprite", - "bevy_tasks", + "bevy_tasks 0.12.1", "bevy_text", "bevy_time", "bevy_transform", "bevy_ui", - "bevy_utils", + "bevy_utils 0.12.1", "bevy_window", "bevy_winit", ] @@ -644,11 +774,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07dcc615ff4f617b06c3f9522fca3c55d56f9644db293318f8ab68fcdea5d4fe" dependencies = [ "android_log-sys", - "bevy_app", - "bevy_ecs", - "bevy_utils", + "bevy_app 0.11.3", + "bevy_ecs 0.11.3", + "bevy_utils 0.11.3", + "console_error_panic_hook", + "tracing-log 0.1.4", + "tracing-subscriber", + "tracing-wasm", +] + +[[package]] +name = "bevy_log" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc10ba1d225a8477b9e80a1bf797d8a8b8274e83c9b24fb4d9351aec9229755" +dependencies = [ + "android_log-sys", + "bevy_app 0.12.1", + "bevy_ecs 0.12.1", + "bevy_utils 0.12.1", "console_error_panic_hook", - "tracing-log", + "tracing-log 0.1.4", "tracing-subscriber", "tracing-wasm", ] @@ -665,11 +811,24 @@ dependencies = [ "toml_edit 0.19.15", ] +[[package]] +name = "bevy_macro_utils" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e566640c6b6dced73d2006c764c2cffebe1a82be4809486c4a5d7b4b50efed4d" +dependencies = [ + "proc-macro2", + "quote", + "rustc-hash", + "syn 2.0.39", + "toml_edit 0.20.7", +] + [[package]] name = "bevy_math" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78286a81fead796dc4b45ab14f4f02fe29a94423d3587bcfef872b2a8e0a474b" +checksum = "58ddc2b76783939c530178f88e5711a1b01044d7b02db4033e2eb8b43b6cf4ec" dependencies = [ "glam", "serde", @@ -677,9 +836,9 @@ dependencies = [ [[package]] name = "bevy_mikktspace" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cfc2a21ea47970a9b1f0f4735af3256a8f204815bd756110051d10f9d909497" +checksum = "8ec4962977a746d870170532fc92759e04d3dbcae8b7b82e7ca3bb83b1d75277" dependencies = [ "glam", ] @@ -691,9 +850,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce5940b047c5efb58b70ae44b2434b874788f79244267236de532e0fe95bf5ea" dependencies = [ "anyhow", - "bevy_log", + "bevy_log 0.11.3", "bevy_mod_sysfail_macros", - "bevy_utils", + "bevy_utils 0.11.3", ] [[package]] @@ -710,25 +869,28 @@ dependencies = [ [[package]] name = "bevy_pbr" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63ca796a619e61cd43a0a3b11fde54644f7f0732a1fba1eef5d406248c6eba85" +checksum = "520bfd2a898c74f84ea52cfb8eb061f37373ad15e623489d5f75d27ebd6138fe" dependencies = [ - "bevy_app", + "bevy_app 0.12.1", "bevy_asset", "bevy_core_pipeline", - "bevy_derive", - "bevy_ecs", + "bevy_derive 0.12.1", + "bevy_ecs 0.12.1", "bevy_math", - "bevy_reflect", + "bevy_reflect 0.12.1", "bevy_render", "bevy_transform", - "bevy_utils", + "bevy_utils 0.12.1", "bevy_window", "bitflags 2.4.1", "bytemuck", + "fixedbitset", "naga_oil", "radsort", + "smallvec", + "thread_local", ] [[package]] @@ -737,22 +899,43 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72c7586401a46f7d8e436028225c1df5288f2e0082d066b247a82466fea155c6" +[[package]] +name = "bevy_ptr" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c77ec20c8fafcdc196508ef5ccb4f0400a8d193cb61f7b14a36ed9a25ad423cf" + [[package]] name = "bevy_reflect" version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0778197a1eb3e095a71417c74b7152ede02975cdc95b5ea4ddc5251ed00a2eb5" dependencies = [ - "bevy_math", - "bevy_ptr", - "bevy_reflect_derive", - "bevy_utils", + "bevy_ptr 0.11.3", + "bevy_reflect_derive 0.11.3", + "bevy_utils 0.11.3", "downcast-rs", "erased-serde", - "glam", "once_cell", "parking_lot", "serde", + "thiserror", +] + +[[package]] +name = "bevy_reflect" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7921f15fc944c9c8ad01d7dbcea6505b8909c6655cd9382bab1407181556038" +dependencies = [ + "bevy_math", + "bevy_ptr 0.12.1", + "bevy_reflect_derive 0.12.1", + "bevy_utils 0.12.1", + "downcast-rs", + "erased-serde", + "glam", + "serde", "smallvec", "smol_str", "thiserror", @@ -764,7 +947,7 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "342a4b2d09db22c48607d23ad59a056aff1ee004549050a51d490d375ba29528" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.11.3", "bit-set", "proc-macro2", "quote", @@ -772,45 +955,55 @@ dependencies = [ "uuid", ] +[[package]] +name = "bevy_reflect_derive" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4a8c5475f216e751ef4452a1306b00711f33d2d04d9f149e4c845dfeb6753a0" +dependencies = [ + "bevy_macro_utils 0.12.1", + "proc-macro2", + "quote", + "syn 2.0.39", + "uuid", +] + [[package]] name = "bevy_render" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39df4824b760928c27afc7b00fb649c7a63c9d76661ab014ff5c86537ee906cb" +checksum = "bdefdd3737125b0d94a6ff20bb70fa8cfe9d7d5dcd72ba4dfe6c5f1d30d9f6e4" dependencies = [ - "anyhow", - "async-channel", - "bevy_app", + "async-channel 1.9.0", + "bevy_app 0.12.1", "bevy_asset", "bevy_core", - "bevy_derive", - "bevy_ecs", + "bevy_derive 0.12.1", + "bevy_ecs 0.12.1", "bevy_encase_derive", "bevy_hierarchy", - "bevy_log", + "bevy_log 0.12.1", "bevy_math", "bevy_mikktspace", - "bevy_reflect", + "bevy_reflect 0.12.1", "bevy_render_macros", - "bevy_tasks", + "bevy_tasks 0.12.1", "bevy_time", "bevy_transform", - "bevy_utils", + "bevy_utils 0.12.1", "bevy_window", "bitflags 2.4.1", "bytemuck", "codespan-reporting", "downcast-rs", "encase", - "futures-lite", + "futures-lite 1.13.0", "hexasphere", "image", "js-sys", "ktx2", "naga", "naga_oil", - "parking_lot", - "regex", "ruzstd", "serde", "smallvec", @@ -819,16 +1012,15 @@ dependencies = [ "wasm-bindgen", "web-sys", "wgpu", - "wgpu-hal", ] [[package]] name = "bevy_render_macros" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd08c740aac73363e32fb45af869b10cec65bcb76fe3e6cd0f8f7eebf4c36c9" +checksum = "64d86bfc5a1e7fbeeaec0c4ceab18155530f5506624670965db3415f75826bea" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.12.1", "proc-macro2", "quote", "syn 2.0.39", @@ -836,20 +1028,19 @@ dependencies = [ [[package]] name = "bevy_scene" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd47e1263506153bef3a8be97fe2d856f206d315668c4f97510ca6cc181d9681" +checksum = "e7df078b5e406e37c8a1c6ba0d652bf105fde713ce3c3efda7263fe27467eee5" dependencies = [ - "anyhow", - "bevy_app", + "bevy_app 0.12.1", "bevy_asset", - "bevy_derive", - "bevy_ecs", + "bevy_derive 0.12.1", + "bevy_ecs 0.12.1", "bevy_hierarchy", - "bevy_reflect", + "bevy_reflect 0.12.1", "bevy_render", "bevy_transform", - "bevy_utils", + "bevy_utils 0.12.1", "ron", "serde", "thiserror", @@ -858,25 +1049,26 @@ dependencies = [ [[package]] name = "bevy_sprite" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a8ca824fad75c6ef74cfbbba0a4ce3ccc435fa23d6bf3f003f260548813397" +checksum = "c7cc0c9d946e17e3e0aaa202f182837bc796c4f862b2e5a805134f873f21cf7f" dependencies = [ - "bevy_app", + "bevy_app 0.12.1", "bevy_asset", "bevy_core_pipeline", - "bevy_derive", - "bevy_ecs", - "bevy_log", + "bevy_derive 0.12.1", + "bevy_ecs 0.12.1", + "bevy_log 0.12.1", "bevy_math", - "bevy_reflect", + "bevy_reflect 0.12.1", "bevy_render", "bevy_transform", - "bevy_utils", + "bevy_utils 0.12.1", "bitflags 2.4.1", "bytemuck", "fixedbitset", "guillotiere", + "radsort", "rectangle-pack", "thiserror", ] @@ -887,31 +1079,44 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c73bbb847c83990d3927005090df52f8ac49332e1643d2ad9aac3cd2974e66bf" dependencies = [ - "async-channel", + "async-channel 1.9.0", + "async-executor", + "async-task", + "concurrent-queue", + "futures-lite 1.13.0", + "wasm-bindgen-futures", +] + +[[package]] +name = "bevy_tasks" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fefa7fe0da8923525f7500e274f1bd60dbd79918a25cf7d0dfa0a6ba15c1cf" +dependencies = [ + "async-channel 1.9.0", "async-executor", "async-task", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", "wasm-bindgen-futures", ] [[package]] name = "bevy_text" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692288ab7b0a9f8b38058964c52789fc6bcb63703b23de51cce90ec41bfca355" +checksum = "3a9a79d49ca06170d69149949b134c14e8b99ace1444c1ca2cd4743b19d5b055" dependencies = [ "ab_glyph", - "anyhow", - "bevy_app", + "bevy_app 0.12.1", "bevy_asset", - "bevy_ecs", + "bevy_ecs 0.12.1", "bevy_math", - "bevy_reflect", + "bevy_reflect 0.12.1", "bevy_render", "bevy_sprite", "bevy_transform", - "bevy_utils", + "bevy_utils 0.12.1", "bevy_window", "glyph_brush_layout", "serde", @@ -920,14 +1125,14 @@ dependencies = [ [[package]] name = "bevy_time" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d58d6dbae9c8225d8c0e0f04d2c5dbb71d22adc01ecd5ab3cebc364139e4a6d" +checksum = "e6250d76eed3077128b6a3d004f9f198b01107800b9824051e32bb658054e837" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_reflect", - "bevy_utils", + "bevy_app 0.12.1", + "bevy_ecs 0.12.1", + "bevy_reflect 0.12.1", + "bevy_utils 0.12.1", "crossbeam-channel", "serde", "thiserror", @@ -935,40 +1140,41 @@ dependencies = [ [[package]] name = "bevy_transform" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9b0ac0149a57cd846cb357a35fc99286f9848e53d4481954608ac9552ed2d4" +checksum = "d541e0c292edbd96afae816ee680e02247422423ccd5dc635c1e211a20ed64be" dependencies = [ - "bevy_app", - "bevy_ecs", + "bevy_app 0.12.1", + "bevy_ecs 0.12.1", "bevy_hierarchy", "bevy_math", - "bevy_reflect", + "bevy_reflect 0.12.1", "serde", + "thiserror", ] [[package]] name = "bevy_ui" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b6d295a755e5b79e869a09e087029d72974562a521ec7ccfba7141fa948a32" +checksum = "d785e3b75dabcb2a8ad0d50933f8f3446d59e512cabc2d2a145e28c2bb8792ba" dependencies = [ "bevy_a11y", - "bevy_app", + "bevy_app 0.12.1", "bevy_asset", "bevy_core_pipeline", - "bevy_derive", - "bevy_ecs", + "bevy_derive 0.12.1", + "bevy_ecs 0.12.1", "bevy_hierarchy", "bevy_input", - "bevy_log", + "bevy_log 0.12.1", "bevy_math", - "bevy_reflect", + "bevy_reflect 0.12.1", "bevy_render", "bevy_sprite", "bevy_text", "bevy_transform", - "bevy_utils", + "bevy_utils 0.12.1", "bevy_window", "bytemuck", "serde", @@ -984,10 +1190,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d9484e32434ea84dc548cff246ce0c6f756c1336f5ea03f24ac120a48595c7" dependencies = [ "ahash", - "bevy_utils_proc_macros", + "bevy_utils_proc_macros 0.11.3", + "getrandom", + "hashbrown 0.14.3", + "instant", + "petgraph", + "thiserror", + "tracing", + "uuid", +] + +[[package]] +name = "bevy_utils" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7915222f4a08ccc782e08d10b751b42e5f9d786e697d0cb3fd09333cb7e8b6ea" +dependencies = [ + "ahash", + "bevy_utils_proc_macros 0.12.1", "getrandom", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "instant", + "nonmax", "petgraph", "thiserror", "tracing", @@ -1005,39 +1229,51 @@ dependencies = [ "syn 2.0.39", ] +[[package]] +name = "bevy_utils_proc_macros" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aafecc952b6b8eb1a93c12590bd867d25df2f4ae1033a01dfdfc3c35ebccfff" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + [[package]] name = "bevy_window" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd584c0da7c4ada6557b09f57f30fb7cff21ccedc641473fc391574b4c9b7944" +checksum = "41ee72bf7f974000e9b31bb971a89387f1432ba9413f35c4fef59fef49767260" dependencies = [ - "bevy_app", - "bevy_ecs", + "bevy_a11y", + "bevy_app 0.12.1", + "bevy_ecs 0.12.1", "bevy_input", "bevy_math", - "bevy_reflect", - "bevy_utils", + "bevy_reflect 0.12.1", + "bevy_utils 0.12.1", "raw-window-handle", "serde", ] [[package]] name = "bevy_winit" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdc044abdb95790c20053e6326760f0a2985f0dcd78613d397bf35f16039d53" +checksum = "1eb71f287eca9006dda998784c7b931e400ae2cc4c505da315882a8b082f21ad" dependencies = [ "accesskit_winit", "approx", "bevy_a11y", - "bevy_app", - "bevy_derive", - "bevy_ecs", + "bevy_app 0.12.1", + "bevy_derive 0.12.1", + "bevy_ecs 0.12.1", "bevy_hierarchy", "bevy_input", "bevy_math", - "bevy_tasks", - "bevy_utils", + "bevy_tasks 0.12.1", + "bevy_utils 0.12.1", "bevy_window", "crossbeam-channel", "raw-window-handle", @@ -1048,9 +1284,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.68.1" +version = "0.69.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" +checksum = "9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2" dependencies = [ "bitflags 2.4.1", "cexpr", @@ -1096,6 +1332,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" @@ -1121,6 +1370,22 @@ dependencies = [ "objc2-encode", ] +[[package]] +name = "blocking" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +dependencies = [ + "async-channel 2.1.1", + "async-lock 3.2.0", + "async-task", + "fastrand 2.0.1", + "futures-io", + "futures-lite 2.1.0", + "piper", + "tracing", +] + [[package]] name = "bumpalo" version = "3.14.0" @@ -1241,9 +1506,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", ] @@ -1270,6 +1535,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" @@ -1281,9 +1552,9 @@ dependencies = [ [[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", @@ -1291,9 +1562,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" @@ -1304,15 +1575,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", @@ -1332,9 +1603,9 @@ dependencies = [ [[package]] name = "coreaudio-sys" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8478e5bdad14dce236b9898ea002eabfa87cbe14f0aa538dbe3b6a4bec4332d" +checksum = "f3120ebb80a9de008e638ad833d4127d50ea3d3a960ea23ea69bc66d9358a028" dependencies = [ "bindgen", ] @@ -1394,12 +1665,12 @@ dependencies = [ [[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", ] @@ -1446,9 +1717,9 @@ checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "dispatch" @@ -1524,6 +1795,27 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +[[package]] +name = "event-listener" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.0", + "pin-project-lite", +] + [[package]] name = "fastrand" version = "1.9.0" @@ -1548,18 +1840,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "filetime" -version = "0.2.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", -] - [[package]] name = "fixedbitset" version = "0.4.2" @@ -1588,7 +1868,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.39", ] [[package]] @@ -1598,13 +1899,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] -name = "fsevent-sys" -version = "4.1.0" +name = "foreign-types-shared" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" -dependencies = [ - "libc", -] +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" [[package]] name = "futures-core" @@ -1633,11 +1931,24 @@ dependencies = [ "waker-fn", ] +[[package]] +name = "futures-lite" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +dependencies = [ + "fastrand 2.0.1", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "js-sys", @@ -1648,9 +1959,9 @@ dependencies = [ [[package]] name = "gilrs" -version = "0.10.2" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62fd19844d0eb919aca41d3e4ea0e0b6bf60e1e827558b101c269015b8f5f27a" +checksum = "d8b2e57a9cb946b5d04ae8638c5f554abb5a9f82c4c950fd5b1fee6d119592fb" dependencies = [ "fnv", "gilrs-core", @@ -1661,17 +1972,18 @@ dependencies = [ [[package]] name = "gilrs-core" -version = "0.5.7" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ccc99e9b8d63ffcaa334c4babfa31f46e156618a11f63efb6e8e6bcb37b830d" +checksum = "178769da179a47b187837d1ab2b5b9b684a21180166a77a4ca37e7e58ee3833d" dependencies = [ "core-foundation", + "inotify", "io-kit-sys", "js-sys", "libc", "libudev-sys", "log", - "nix 0.26.4", + "nix 0.27.1", "uuid", "vec_map", "wasm-bindgen", @@ -1681,9 +1993,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "glam" @@ -1761,21 +2073,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]] @@ -1799,7 +2111,7 @@ checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" dependencies = [ "bitflags 2.4.1", "gpu-descriptor-types", - "hashbrown 0.14.2", + "hashbrown 0.14.3", ] [[package]] @@ -1835,9 +2147,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash", "allocator-api2", @@ -1913,7 +2225,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown 0.14.3", ] [[package]] @@ -1924,9 +2236,9 @@ checksum = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a" [[package]] name = "inotify" -version = "0.9.6" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc" dependencies = [ "bitflags 1.3.2", "inotify-sys", @@ -1956,9 +2268,9 @@ dependencies = [ [[package]] name = "io-kit-sys" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2d4429acc1deff0fbdece0325b4997bdb02b2c245ab7023fd5deca0f6348de" +checksum = "4769cb30e5dcf1710fc6730d3e94f78c47723a014a567de385e113c737394640" dependencies = [ "core-foundation-sys", "mach2", @@ -2021,9 +2333,9 @@ checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" [[package]] name = "js-sys" -version = "0.3.65" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] @@ -2039,26 +2351,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "kqueue" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" -dependencies = [ - "kqueue-sys", - "libc", -] - -[[package]] -name = "kqueue-sys" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" -dependencies = [ - "bitflags 1.3.2", - "libc", -] - [[package]] name = "ktx2" version = "0.3.0" @@ -2185,9 +2477,11 @@ dependencies = [ name = "martian-chess" version = "0.1.0" dependencies = [ + "anyhow", "bevy", "bevy_fmod", "serde", + "thiserror", "toml", ] @@ -2208,16 +2502,17 @@ checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[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]] @@ -2238,9 +2533,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", @@ -2250,12 +2545,12 @@ dependencies = [ [[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", @@ -2271,9 +2566,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", @@ -2282,7 +2577,7 @@ dependencies = [ "naga", "once_cell", "regex", - "regex-syntax 0.6.29", + "regex-syntax 0.7.5", "rustc-hash", "thiserror", "tracing", @@ -2331,11 +2626,11 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.4" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "cfg-if", "libc", ] @@ -2351,23 +2646,10 @@ dependencies = [ ] [[package]] -name = "notify" -version = "6.1.1" +name = "nonmax" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" -dependencies = [ - "bitflags 2.4.1", - "crossbeam-channel", - "filetime", - "fsevent-sys", - "inotify", - "kqueue", - "libc", - "log", - "mio", - "walkdir", - "windows-sys 0.48.0", -] +checksum = "610a5acd306ec67f907abe5567859a3c693fb9886eb1f012ab8f2a47bef3db51" [[package]] name = "ntapi" @@ -2630,9 +2912,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" @@ -2650,6 +2932,17 @@ 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" @@ -2690,9 +2983,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] @@ -2792,6 +3085,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" @@ -2872,18 +3171,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.192" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.192" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", @@ -2942,18 +3241,18 @@ 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", ] [[package]] name = "smallvec" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" dependencies = [ "serde", ] @@ -3019,9 +3318,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.29.10" +version = "0.29.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a18d114d420ada3a891e6bc8e96a2023402203296a47cdd65083377dad18ba5" +checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" dependencies = [ "cfg-if", "core-foundation-sys", @@ -3045,9 +3344,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] @@ -3063,22 +3362,22 @@ dependencies = [ [[package]] name = "thiserror-core" -version = "1.0.38" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d97345f6437bb2004cd58819d8a9ef8e36cdd7661c2abc4bbde0a7c40d9f497" +checksum = "c001ee18b7e5e3f62cbf58c7fe220119e68d902bb7443179c0c8aef30090e999" dependencies = [ "thiserror-core-impl", ] [[package]] name = "thiserror-core-impl" -version = "1.0.38" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10ac1c5050e43014d16b2f94d0d2ce79e65ffdd8b38d8048f9c8f6a8a6da62ac" +checksum = "e4c60d69f36615a077cc7663b9cb8e42275722d23e58a7fa3d2c7f2915d09d04" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] @@ -3149,6 +3448,17 @@ dependencies = [ "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" @@ -3205,11 +3515,22 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", @@ -3220,7 +3541,7 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log", + "tracing-log 0.2.0", ] [[package]] @@ -3270,9 +3591,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "uuid" -version = "1.5.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" dependencies = [ "getrandom", "serde", @@ -3320,9 +3641,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3330,9 +3651,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", @@ -3345,9 +3666,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" dependencies = [ "cfg-if", "js-sys", @@ -3357,9 +3678,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3367,9 +3688,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", @@ -3380,9 +3701,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "wayland-scanner" @@ -3397,9 +3718,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", @@ -3407,9 +3728,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", @@ -3431,9 +3752,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", @@ -3454,9 +3775,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", @@ -3466,7 +3787,6 @@ dependencies = [ "block", "core-graphics-types", "d3d12", - "foreign-types", "glow", "gpu-alloc", "gpu-allocator", @@ -3496,9 +3816,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", @@ -3776,9 +4096,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.5.19" +version = "0.5.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +checksum = "b7e87b8dfbe3baffbe687eef2e164e32286eff31a5ee16463ce03d991643ec94" dependencies = [ "memchr", ] @@ -3808,18 +4128,18 @@ checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" [[package]] name = "zerocopy" -version = "0.7.25" +version = "0.7.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557" +checksum = "5d075cf85bbb114e933343e087b92f2146bac0d55b534cbb8188becf0039948e" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.25" +version = "0.7.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b" +checksum = "86cd5ca076997b97ef09d3ad65efe811fa68c9e874cb636ccb211223a813b0c2" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 000069e..a872fd4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,10 +5,12 @@ edition = "2021" build = "build.rs" [dependencies] -bevy_fmod = { version = "0.3", features = ["live-update"] } -bevy = { version = "0.11", features = ["jpeg", "hdr", "serialize"] } +bevy_fmod = { branch = "update-0.12", git = "https://github.com/Salzian/bevy_fmod", features = ["live-update"] } +bevy = { version = "0.12", features = ["jpeg", "hdr", "serialize"] } serde = "1" toml = { version = "0.8", features = ["parse"] } +anyhow = "*" +thiserror = "*" [profile.dev] opt-level = 3 diff --git a/src/credits.rs b/src/credits.rs index 147618b..a79373c 100644 --- a/src/credits.rs +++ b/src/credits.rs @@ -1,7 +1,8 @@ use std::str::Utf8Error; +use thiserror::Error; use bevy::{ - asset::{AssetLoader, LoadContext, LoadedAsset}, + asset::{io::Reader, AssetLoader, LoadContext}, reflect::{TypePath, TypeUuid}, utils::BoxedFuture, }; @@ -12,8 +13,8 @@ pub(crate) struct CreditsPlugin; impl Plugin for CreditsPlugin { fn build(&self, app: &mut App) { - app.add_asset::() - .init_asset_loader::() + app.register_asset_loader(CreditsTextLoader) + .init_asset::() .add_systems(Startup, init_credits_ui) .add_systems( Update, @@ -27,25 +28,36 @@ impl Plugin for CreditsPlugin { } } -#[derive(Debug, TypeUuid, TypePath)] +#[derive(Debug, TypeUuid, TypePath, Asset)] #[uuid = "43df4a09-b5f0-4619-9223-8cf67dc9e844"] pub struct CreditsText { sections: Vec, } +#[derive(Debug, Error)] +enum CreditsError { + IO(#[from] std::io::Error), + Parse(#[from] Utf8Error), +} + #[derive(Default)] struct CreditsTextLoader; impl AssetLoader for CreditsTextLoader { + type Asset = CreditsText; + type Settings = (); + type Error = CreditsError; + fn load<'a>( &'a self, - bytes: &'a [u8], + reader: &'a mut Reader, + settings: &'a Self::Settings, load_context: &'a mut LoadContext, - ) -> BoxedFuture<'a, Result<(), bevy::asset::Error>> { + ) -> BoxedFuture<'a, Result> { Box::pin(async move { - let custom_asset = parse_credits(bytes)?; - load_context.set_default_asset(LoadedAsset::new(custom_asset)); - Ok(()) + let mut bytes = Vec::new(); + reader.read_to_end(&mut bytes).await?; + parse_credits(bytes.as_slice()) }) } @@ -112,10 +124,12 @@ fn update_credits( mut query: Query<(&mut Text, &Handle)>, ) { reader.iter().for_each(|event| match event { - AssetEvent::Created { handle } | AssetEvent::Modified { handle } => { + AssetEvent::Added { id } + | AssetEvent::LoadedWithDependencies { id } + | AssetEvent::Modified { id } => { query .iter_mut() - .filter(|(_, this_handle)| handle.clone() == (*this_handle).clone()) + .filter(|(_, this_handle)| id == (*this_handle).id()) .for_each(|(mut text, this_handle)| { if let Some(credits_text) = credits_texts.get(this_handle) { text.sections = credits_text.sections.clone(); diff --git a/src/debug.rs b/src/debug.rs index e55fd83..c3ec2e2 100644 --- a/src/debug.rs +++ b/src/debug.rs @@ -1,5 +1,4 @@ use bevy::{ - asset::diagnostic::AssetCountDiagnosticsPlugin, diagnostic::{ DiagnosticsStore, EntityCountDiagnosticsPlugin, FrameTimeDiagnosticsPlugin, SystemInformationDiagnosticsPlugin, @@ -17,10 +16,6 @@ impl Plugin for DebugPlugin { app.add_plugins(( FrameTimeDiagnosticsPlugin, EntityCountDiagnosticsPlugin::default(), - AssetCountDiagnosticsPlugin::::default(), - AssetCountDiagnosticsPlugin::::default(), - AssetCountDiagnosticsPlugin::::default(), - AssetCountDiagnosticsPlugin::::default(), SystemInformationDiagnosticsPlugin::default(), )) .init_resource::() @@ -132,11 +127,9 @@ fn display_diagnostics( }); } -fn camera_info( - mut debug_infos: ResMut, - cameras: Query<(&Camera, &Name)>, -) { - let camera_names = cameras.iter() +fn camera_info(mut debug_infos: ResMut, cameras: Query<(&Camera, &Name)>) { + let camera_names = cameras + .iter() .filter(|(c, _)| c.is_active) .map(|(_, n)| n.as_str()) .collect::>() diff --git a/src/loading.rs b/src/loading.rs index 13cb1e6..9a988a3 100644 --- a/src/loading.rs +++ b/src/loading.rs @@ -57,40 +57,20 @@ fn loading( tweakfile: Res>, mut next_state: ResMut>, ) { - let s_ids = sprites - .ids() - .filter(|&id| matches!(id, HandleId::AssetPathId(_))) - .collect::>(); - - let g_ids = gltfs - .ids() - .filter(|&id| matches!(id, HandleId::AssetPathId(_))) - .collect::>(); - - let t_ids = tweakfile - .ids() - .filter(|&id| matches!(id, HandleId::AssetPathId(_))) - .collect::>(); - - debug!( - "Sprite len: {:?} | GLTF len: {:?} | Tweakfile: {:?}", - s_ids.len(), - g_ids.len(), - t_ids.len(), - ); - - if s_ids.len() > 0 && g_ids.len() > 0 { - let s_ready = s_ids + let s = sprites.iter().len() > 0 + && sprites .iter() - .all(|&id| server.get_load_state(id) == LoadState::Loaded); - let g_ready = g_ids + .all(|id| server.is_loaded_with_dependencies(id)); + let g = gltfs.iter().len() > 0 + && gltfs .iter() - .all(|&id| server.get_load_state(id) == LoadState::Loaded); - let t_ready = t_ids + .all(|id| server.is_loaded_with_dependencies(id)); + let t = tweakfile.iter().len() > 0 + && tweakfile .iter() - .all(|&id| server.get_load_state(id) == LoadState::Loaded); - if s_ready && g_ready && t_ready { - next_state.set(GameState::Menu) - } + .all(|id| server.is_loaded_with_dependencies(id)); + + if s && g && t { + next_state.set(GameState::Menu) } } diff --git a/src/main.rs b/src/main.rs index 4b5775c..53190f7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -16,10 +16,7 @@ mod ui; use std::time::Duration; -use bevy::{ - asset::{ChangeWatcher, HandleId}, - input::ButtonState, -}; +use bevy::input::ButtonState; use crate::prelude::*; diff --git a/src/menu.rs b/src/menu.rs index 83660e0..7e8f171 100644 --- a/src/menu.rs +++ b/src/menu.rs @@ -1,7 +1,6 @@ use bevy::{ app::AppExit, input::{keyboard::KeyboardInput, ButtonState}, - window::PrimaryWindow, }; use crate::prelude::*; diff --git a/src/prelude.rs b/src/prelude.rs index 4db8512..ee46e60 100644 --- a/src/prelude.rs +++ b/src/prelude.rs @@ -1,4 +1,3 @@ pub use crate::*; -pub use bevy::asset::LoadState; pub use bevy::gltf::Gltf; pub use bevy::prelude::*; diff --git a/src/tweak.rs b/src/tweak.rs index 3227b18..364ea5d 100644 --- a/src/tweak.rs +++ b/src/tweak.rs @@ -1,10 +1,11 @@ use crate::prelude::*; use bevy::{ - asset::{AssetLoader, LoadContext, LoadedAsset}, + asset::{io::Reader, AssetLoader, LoadContext}, reflect::{TypePath, TypeUuid}, utils::BoxedFuture, }; use serde::Deserialize; +use thiserror::Error; /// A Tweakfile is resource used to specify game customization like asset names, /// and non-user customizations made to the game during development. @@ -28,7 +29,7 @@ fn load_tweakfile(server: Res, mut commands: Commands) { struct GameTweakfile(Handle); /// Tweakfile contains tweaks made to other parts of the game -#[derive(Debug, Deserialize, TypeUuid, TypePath)] +#[derive(Debug, Deserialize, TypeUuid, TypePath, Asset)] #[uuid = "e5768efe-edce-4267-bdf4-dd8f8ca613c7"] pub(crate) struct Tweakfile { #[serde(default)] @@ -42,17 +43,28 @@ pub(crate) struct Tweakfile { #[derive(Default)] pub struct TweakfileLoader; +#[derive(Debug, Error)] +enum TweakfileError { + IO(#[from] std::io::Error), + Parse(#[from] toml::de::Error), +} + impl AssetLoader for TweakfileLoader { + type Asset = Tweakfile; + type Settings = (); + type Error = TweakfileError; + fn load<'a>( &'a self, - bytes: &'a [u8], + reader: &'a mut Reader, + settings: &'a Self::Settings, load_context: &'a mut LoadContext, - ) -> BoxedFuture<'a, Result<(), bevy::asset::Error>> { + ) -> BoxedFuture<'a, Result> { Box::pin(async move { - let s = std::str::from_utf8(bytes)?; - let custom_asset = toml::from_str::(s)?; - load_context.set_default_asset(LoadedAsset::new(custom_asset)); - Ok(()) + let mut bytes = Vec::new(); + reader.read_to_end(&mut bytes).await?; + let s = std::str::from_utf8(bytes.as_slice())?; + toml::from_str::(s)? }) }