From 669d776ec4f5d0074fb8fb252294ecea2fb689db Mon Sep 17 00:00:00 2001 From: Daniel Porteous Date: Mon, 13 Mar 2023 01:33:23 +0200 Subject: [PATCH] Update for bevy 0.10 --- Cargo.lock | 2120 ++++++++++++++++++++++++++++++++-------------- Cargo.toml | 4 +- src/bullet.rs | 8 +- src/main.rs | 25 +- src/main_menu.rs | 13 +- src/player.rs | 12 +- src/target.rs | 8 +- src/tower.rs | 17 +- 8 files changed, 1546 insertions(+), 661 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1029b8c..690722f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -18,6 +18,68 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330223a1aecc308757b9926e9391c9b47f8ef2dbd8aea9df88312aea18c5e8d6" +[[package]] +name = "accesskit" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "704d532b1cd3d912bb37499c55a81ac748cc1afa737eedd100ba441acdd47d38" + +[[package]] +name = "accesskit_consumer" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48ba8b23cfca3944012ee2e5c71c02077a400e034c720eed6bd927cb6b4d1fd9" +dependencies = [ + "accesskit", +] + +[[package]] +name = "accesskit_macos" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc50af17818440f580a894536c4c5a95ff9e4bad59f19ee68757ca959d001813" +dependencies = [ + "accesskit", + "accesskit_consumer", + "objc2", + "once_cell", +] + +[[package]] +name = "accesskit_windows" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aaf5b3c3828397ee832ba4a72fb1a4ace10f781e31885f774cbd531014059115" +dependencies = [ + "accesskit", + "accesskit_consumer", + "arrayvec", + "once_cell", + "paste", + "windows 0.44.0", +] + +[[package]] +name = "accesskit_winit" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eb880d83a5502edd311bdb3af1cf7113b250c9c2d92fbdd05342c7b9f38bf51" +dependencies = [ + "accesskit", + "accesskit_macos", + "accesskit_windows", + "winit", +] + +[[package]] +name = "addr2line" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +dependencies = [ + "gimli", +] + [[package]] name = "adler" version = "1.0.2" @@ -64,14 +126,14 @@ dependencies = [ [[package]] name = "alsa" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b" +checksum = "8512c9117059663fb5606788fbca3619e2a91dac0e3fe516242eab1fa6be5e44" dependencies = [ "alsa-sys", "bitflags", "libc", - "nix 0.23.1", + "nix 0.24.2", ] [[package]] @@ -84,6 +146,30 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "android-activity" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c77a0045eda8b888c76ea473c2b0515ba6f471d318f8927c5c72240937035a6" +dependencies = [ + "android-properties", + "bitflags", + "cc", + "jni-sys", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "num_enum", +] + +[[package]] +name = "android-properties" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + [[package]] name = "android_log-sys" version = "0.2.0" @@ -153,20 +239,20 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "ash" -version = "0.37.0+1.3.209" +version = "0.37.2+1.3.238" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006ca68e0f2b03f22d6fa9f2860f85aed430d257fec20f8879b2145e7c7ae1a6" +checksum = "28bf19c1f0a470be5fbf7522a308a05df06610252c5bcf5143e1b23f629a9a03" dependencies = [ "libloading", ] [[package]] name = "async-channel" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28" +checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" dependencies = [ - "concurrent-queue 1.2.4", + "concurrent-queue 2.0.0", "event-listener", "futures-core", ] @@ -214,10 +300,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] -name = "base-x" -version = "0.2.11" +name = "backtrace" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide 0.6.2", + "object", + "rustc-demangle", +] [[package]] name = "base64" @@ -231,8 +326,16 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3654d60973fcde065efcfe0c9066c81a76987d28c45233998b2ccdc581dcd914" dependencies = [ - "bevy_dylib", - "bevy_internal", + "bevy_internal 0.9.0", +] + +[[package]] +name = "bevy" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc88fece4660d68690585668f1a4e18e6dcbab160b08f337b498a96ccde91cfe" +dependencies = [ + "bevy_internal 0.10.0", ] [[package]] @@ -241,7 +344,7 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bbe6f9142de83d656fb45e9629bd7f3ede71d202439922bdf473814daceefe4" dependencies = [ - "bevy", + "bevy 0.9.0", "bevy-inspector-egui-derive", "bevy_egui", "image 0.23.14", @@ -263,27 +366,39 @@ dependencies = [ name = "bevy-tower-defense" version = "0.1.0" dependencies = [ - "bevy", + "bevy 0.10.0", "bevy-inspector-egui", "bevy_mod_picking", ] +[[package]] +name = "bevy_a11y" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a10b25cf04971b9d68271aa54e4601c673509db6edaf1f5359dd91fb3e84cc27" +dependencies = [ + "accesskit", + "bevy_app 0.10.0", + "bevy_derive 0.10.0", + "bevy_ecs 0.10.0", +] + [[package]] name = "bevy_animation" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc8187ba04e1cd4c390a5407502bdb40828e568e2aae9e1628bfe9ebac744f3f" +checksum = "1aabb803571785797c84e106ed63427eaf2cb12832a591923707896ee000bde8" dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_ecs", - "bevy_hierarchy", - "bevy_math", - "bevy_reflect", - "bevy_time", - "bevy_transform", - "bevy_utils", + "bevy_app 0.10.0", + "bevy_asset 0.10.0", + "bevy_core 0.10.0", + "bevy_ecs 0.10.0", + "bevy_hierarchy 0.10.0", + "bevy_math 0.10.0", + "bevy_reflect 0.10.0", + "bevy_time 0.10.0", + "bevy_transform 0.10.0", + "bevy_utils 0.10.0", ] [[package]] @@ -292,10 +407,25 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7240e455d6976b20d24bf8eda37cd9154116fe9cc2beef7bdc009b4c6fff139" dependencies = [ - "bevy_derive", - "bevy_ecs", - "bevy_reflect", - "bevy_utils", + "bevy_derive 0.9.0", + "bevy_ecs 0.9.0", + "bevy_reflect 0.9.0", + "bevy_utils 0.9.0", + "downcast-rs", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "bevy_app" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "960c6e444dc6a25dd51a2196f04872ae9e2e876802b66c391104849ec9225e38" +dependencies = [ + "bevy_derive 0.10.0", + "bevy_ecs 0.10.0", + "bevy_reflect 0.10.0", + "bevy_utils 0.10.0", "downcast-rs", "wasm-bindgen", "web-sys", @@ -308,18 +438,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86ca05c472cd4939aed5b2980ad9b416a250ae4674824e8c4b569ddf18ab5230" dependencies = [ "anyhow", - "bevy_app", - "bevy_diagnostic", - "bevy_ecs", - "bevy_log", - "bevy_reflect", - "bevy_tasks", - "bevy_utils", + "bevy_app 0.9.0", + "bevy_diagnostic 0.9.0", + "bevy_ecs 0.9.0", + "bevy_log 0.9.0", + "bevy_reflect 0.9.0", + "bevy_tasks 0.9.0", + "bevy_utils 0.9.0", "crossbeam-channel", "downcast-rs", "fastrand", "js-sys", "ndk-glue", + "parking_lot", + "serde", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "bevy_asset" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adea538a3d166c8609621994972c31be591c96f931f160f96e74697d8c24ba45" +dependencies = [ + "anyhow", + "bevy_app 0.10.0", + "bevy_diagnostic 0.10.0", + "bevy_ecs 0.10.0", + "bevy_log 0.10.0", + "bevy_reflect 0.10.0", + "bevy_tasks 0.10.0", + "bevy_utils 0.10.0", + "bevy_winit", + "crossbeam-channel", + "downcast-rs", + "fastrand", + "js-sys", "notify", "parking_lot", "serde", @@ -331,16 +488,19 @@ dependencies = [ [[package]] name = "bevy_audio" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "064d3733a2b4396ba0ca27f187d3957b1621c83d9ae65e7da458e57627d3541b" +checksum = "0841e98276000dc06e2cf7593ee20b16b84da3bc7faa7b549938cb982b33b0e1" dependencies = [ "anyhow", - "bevy_app", - "bevy_asset", - "bevy_ecs", - "bevy_reflect", - "bevy_utils", + "bevy_app 0.10.0", + "bevy_asset 0.10.0", + "bevy_ecs 0.10.0", + "bevy_math 0.10.0", + "bevy_reflect 0.10.0", + "bevy_transform 0.10.0", + "bevy_utils 0.10.0", + "oboe", "parking_lot", "rodio", ] @@ -351,12 +511,27 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d344ff340874fb3f1e458f03eca2b731cb8174495e9c0828f5e4569765489cb" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_tasks", - "bevy_utils", + "bevy_app 0.9.0", + "bevy_ecs 0.9.0", + "bevy_math 0.9.0", + "bevy_reflect 0.9.0", + "bevy_tasks 0.9.0", + "bevy_utils 0.9.0", + "bytemuck", +] + +[[package]] +name = "bevy_core" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed29797fa386c6969fa1e4ef9e194a27f89ddb2fa78751fe46838495d374f90f" +dependencies = [ + "bevy_app 0.10.0", + "bevy_ecs 0.10.0", + "bevy_math 0.10.0", + "bevy_reflect 0.10.0", + "bevy_tasks 0.10.0", + "bevy_utils 0.10.0", "bytemuck", ] @@ -366,15 +541,35 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13523e290f9aad62987e04836d66819fb97afeaf794847b6f64121c62a4db916" dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_derive", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_render", - "bevy_transform", - "bevy_utils", + "bevy_app 0.9.0", + "bevy_asset 0.9.0", + "bevy_derive 0.9.0", + "bevy_ecs 0.9.0", + "bevy_math 0.9.0", + "bevy_reflect 0.9.0", + "bevy_render 0.9.0", + "bevy_transform 0.9.0", + "bevy_utils 0.9.0", + "bitflags", + "radsort", + "serde", +] + +[[package]] +name = "bevy_core_pipeline" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3129d308df70dee3c46b6bb64e54d2552e7106fd3185d75732ad5e739a830fee" +dependencies = [ + "bevy_app 0.10.0", + "bevy_asset 0.10.0", + "bevy_derive 0.10.0", + "bevy_ecs 0.10.0", + "bevy_math 0.10.0", + "bevy_reflect 0.10.0", + "bevy_render 0.10.0", + "bevy_transform 0.10.0", + "bevy_utils 0.10.0", "bitflags", "radsort", "serde", @@ -386,7 +581,18 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a12e50d2ff8423438e971c44a90baefc9e351edd45b50b8d077f9ad4f7a0a2a5" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.9.0", + "quote", + "syn", +] + +[[package]] +name = "bevy_derive" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf11701c01bf4dc7a3fac9f4547f3643d3db4cc1682af40c8c86e2f8734b617" +dependencies = [ + "bevy_macro_utils 0.10.0", "quote", "syn", ] @@ -397,21 +603,27 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3415f3a220d8706daac84986d744374fd18883add3a22e894af8cddf2cf1c29" dependencies = [ - "bevy_app", - "bevy_core", - "bevy_ecs", - "bevy_log", - "bevy_time", - "bevy_utils", + "bevy_app 0.9.0", + "bevy_core 0.9.0", + "bevy_ecs 0.9.0", + "bevy_log 0.9.0", + "bevy_time 0.9.0", + "bevy_utils 0.9.0", ] [[package]] -name = "bevy_dylib" -version = "0.9.0" +name = "bevy_diagnostic" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d52cc91729fc26ea7038ad49ed773e0577688e328b6f7466be3d5070b45cea9" +checksum = "576508ffe7ad5124781edd352b79bdc79ffbb6e2f26bad6f722774f7c9fd16c9" dependencies = [ - "bevy_internal", + "bevy_app 0.10.0", + "bevy_core 0.10.0", + "bevy_ecs 0.10.0", + "bevy_log 0.10.0", + "bevy_time 0.10.0", + "bevy_utils 0.10.0", + "sysinfo", ] [[package]] @@ -421,11 +633,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43b29e39772df5e8939f7f540ee152569eebeb3c2cc35a68670688ae008ba2cf" dependencies = [ "async-channel", - "bevy_ecs_macros", - "bevy_ptr", - "bevy_reflect", - "bevy_tasks", - "bevy_utils", + "bevy_ecs_macros 0.9.0", + "bevy_ptr 0.9.0", + "bevy_reflect 0.9.0", + "bevy_tasks 0.9.0", + "bevy_utils 0.9.0", "downcast-rs", "event-listener", "fixedbitset", @@ -434,13 +646,45 @@ dependencies = [ "thread_local", ] +[[package]] +name = "bevy_ecs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc5b19451128091e8507c9247888359ca0bfa895e7f6ca749ccc55c5463bef6" +dependencies = [ + "async-channel", + "bevy_ecs_macros 0.10.0", + "bevy_ptr 0.10.0", + "bevy_reflect 0.10.0", + "bevy_tasks 0.10.0", + "bevy_utils 0.10.0", + "downcast-rs", + "event-listener", + "fixedbitset", + "rustc-hash", + "serde", + "thread_local", +] + [[package]] name = "bevy_ecs_macros" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10b8e7e7fb3ab9554c77e0f8a2531abd05d40ddb0145a8dfa72434cefa52ee5c" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.9.0", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "bevy_ecs_macros" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1e79757319533bde006a4f30c268223ec6426371297182925932075ccfdae30" +dependencies = [ + "bevy_macro_utils 0.10.0", "proc-macro2", "quote", "syn", @@ -453,7 +697,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1cec5fb091ccae94917266fe9b1af8339ef1e47763360b38273a31457598b030" dependencies = [ "arboard", - "bevy", + "bevy 0.9.0", "egui", "thread_local", "webbrowser", @@ -465,47 +709,57 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a0773119830d63dde225338c0c556f84cd68e8e69de5b62a1b172fdddc5b915" dependencies = [ - "bevy_macro_utils", - "encase_derive_impl", + "bevy_macro_utils 0.9.0", + "encase_derive_impl 0.4.0", +] + +[[package]] +name = "bevy_encase_derive" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "723d4838d1f88955f348294c0a9d067307f2437725400b0776e9677154914f14" +dependencies = [ + "bevy_macro_utils 0.10.0", + "encase_derive_impl 0.5.0", ] [[package]] name = "bevy_gilrs" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26d02e390b192c3d3b1b746fc2e049420b03f7b8319e7cf3a747babd7d88127" +checksum = "905e547d213e368f997d08f140f4e893923c7dce4760bf0fb63401232262fa79" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_input", - "bevy_utils", + "bevy_app 0.10.0", + "bevy_ecs 0.10.0", + "bevy_input 0.10.0", + "bevy_utils 0.10.0", "gilrs", ] [[package]] name = "bevy_gltf" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd77158983e09cbbb8115a2c629bdf3249cfff58e8e19f1c62861b1e5495eaf1" +checksum = "bb2994d7e47c36bfe36710c4a26d3f36dd8641bfaa2c5d4d0581e001942aab6f" dependencies = [ "anyhow", "base64", "bevy_animation", - "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_core_pipeline", - "bevy_ecs", - "bevy_hierarchy", - "bevy_log", - "bevy_math", - "bevy_pbr", - "bevy_reflect", - "bevy_render", + "bevy_app 0.10.0", + "bevy_asset 0.10.0", + "bevy_core 0.10.0", + "bevy_core_pipeline 0.10.0", + "bevy_ecs 0.10.0", + "bevy_hierarchy 0.10.0", + "bevy_log 0.10.0", + "bevy_math 0.10.0", + "bevy_pbr 0.10.0", + "bevy_reflect 0.10.0", + "bevy_render 0.10.0", "bevy_scene", - "bevy_tasks", - "bevy_transform", - "bevy_utils", + "bevy_tasks 0.10.0", + "bevy_transform 0.10.0", + "bevy_utils 0.10.0", "gltf", "percent-encoding", "thiserror", @@ -517,12 +771,27 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b5181dc3d621c3d18a1209791e82199409d6ddf5376ee19f2e26ad7bfd9b06" dependencies = [ - "bevy_app", - "bevy_core", - "bevy_ecs", - "bevy_log", - "bevy_reflect", - "bevy_utils", + "bevy_app 0.9.0", + "bevy_core 0.9.0", + "bevy_ecs 0.9.0", + "bevy_log 0.9.0", + "bevy_reflect 0.9.0", + "bevy_utils 0.9.0", + "smallvec", +] + +[[package]] +name = "bevy_hierarchy" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccd246c862fcaeef3a769f47c6297139f971db0c8fdd6188fe9419ee8873b7e8" +dependencies = [ + "bevy_app 0.10.0", + "bevy_core 0.10.0", + "bevy_ecs 0.10.0", + "bevy_log 0.10.0", + "bevy_reflect 0.10.0", + "bevy_utils 0.10.0", "smallvec", ] @@ -532,11 +801,25 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10f72c3037535eb41b863a22c2e58d3845a096401f9b92204b6a240e36a5151b" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_utils", + "bevy_app 0.9.0", + "bevy_ecs 0.9.0", + "bevy_math 0.9.0", + "bevy_reflect 0.9.0", + "bevy_utils 0.9.0", + "thiserror", +] + +[[package]] +name = "bevy_input" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c809b3df62e1fcbdc6744233ae6c95a67d2cc7e518db43ab81f417d5875ba3b" +dependencies = [ + "bevy_app 0.10.0", + "bevy_ecs 0.10.0", + "bevy_math 0.10.0", + "bevy_reflect 0.10.0", + "bevy_utils 0.10.0", "thiserror", ] @@ -546,36 +829,68 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ff89c2c2644c588d72cf505f15ad515479705c82ad7aa359ad2249646995a76" dependencies = [ + "bevy_app 0.9.0", + "bevy_asset 0.9.0", + "bevy_core 0.9.0", + "bevy_core_pipeline 0.9.0", + "bevy_derive 0.9.0", + "bevy_diagnostic 0.9.0", + "bevy_ecs 0.9.0", + "bevy_hierarchy 0.9.0", + "bevy_input 0.9.0", + "bevy_log 0.9.0", + "bevy_math 0.9.0", + "bevy_pbr 0.9.0", + "bevy_ptr 0.9.0", + "bevy_reflect 0.9.0", + "bevy_render 0.9.0", + "bevy_sprite 0.9.0", + "bevy_tasks 0.9.0", + "bevy_text 0.9.0", + "bevy_time 0.9.0", + "bevy_transform 0.9.0", + "bevy_ui 0.9.0", + "bevy_utils 0.9.0", + "bevy_window 0.9.0", + "ndk-glue", +] + +[[package]] +name = "bevy_internal" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a065c7ac81cd7cf3f1b8f15c4a93db5f07274ddaaec145ba7d0393be0c9c413" +dependencies = [ + "bevy_a11y", "bevy_animation", - "bevy_app", - "bevy_asset", + "bevy_app 0.10.0", + "bevy_asset 0.10.0", "bevy_audio", - "bevy_core", - "bevy_core_pipeline", - "bevy_derive", - "bevy_diagnostic", - "bevy_ecs", + "bevy_core 0.10.0", + "bevy_core_pipeline 0.10.0", + "bevy_derive 0.10.0", + "bevy_diagnostic 0.10.0", + "bevy_ecs 0.10.0", "bevy_gilrs", "bevy_gltf", - "bevy_hierarchy", - "bevy_input", - "bevy_log", - "bevy_math", - "bevy_pbr", - "bevy_ptr", - "bevy_reflect", - "bevy_render", + "bevy_hierarchy 0.10.0", + "bevy_input 0.10.0", + "bevy_log 0.10.0", + "bevy_math 0.10.0", + "bevy_pbr 0.10.0", + "bevy_ptr 0.10.0", + "bevy_reflect 0.10.0", + "bevy_render 0.10.0", "bevy_scene", - "bevy_sprite", - "bevy_tasks", - "bevy_text", - "bevy_time", - "bevy_transform", - "bevy_ui", - "bevy_utils", - "bevy_window", + "bevy_sprite 0.10.0", + "bevy_tasks 0.10.0", + "bevy_text 0.10.0", + "bevy_time 0.10.0", + "bevy_transform 0.10.0", + "bevy_ui 0.10.0", + "bevy_utils 0.10.0", + "bevy_window 0.10.0", "bevy_winit", - "ndk-glue", ] [[package]] @@ -585,9 +900,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66c1d5f2cbcf5c3ce87d42afb6ba98177f8f758278364cbc79a2b3bf38415f0e" dependencies = [ "android_log-sys", - "bevy_app", - "bevy_ecs", - "bevy_utils", + "bevy_app 0.9.0", + "bevy_ecs 0.9.0", + "bevy_utils 0.9.0", + "console_error_panic_hook", + "tracing-log", + "tracing-subscriber", + "tracing-wasm", +] + +[[package]] +name = "bevy_log" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47dcb09ec71145c80d88a84181cc1449d30f23c571bdd58c59c10eece82dfaa5" +dependencies = [ + "android_log-sys", + "bevy_app 0.10.0", + "bevy_ecs 0.10.0", + "bevy_utils 0.10.0", "console_error_panic_hook", "tracing-log", "tracing-subscriber", @@ -605,13 +936,34 @@ dependencies = [ "toml", ] +[[package]] +name = "bevy_macro_utils" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f24ca3363292f1435641fbafd5c24ce362137dd7d69bee56dcaaa2bc1d512ffe" +dependencies = [ + "quote", + "syn", + "toml_edit", +] + [[package]] name = "bevy_math" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b26459575a5f9695788e3487aa0a5f9252562e0fc57065e6f35f370dbfac7d4a" dependencies = [ - "glam", + "glam 0.22.0", + "serde", +] + +[[package]] +name = "bevy_math" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e45e46c2ac0a92db3ae622f2ed690928fe2612e7c9470a46d0ed4c2c77e2e95" +dependencies = [ + "glam 0.23.0", "serde", ] @@ -621,26 +973,33 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e67d9caff1be480eb097e1a5ee7332762e19a2ea3d07496017fc8221ea6bc46" dependencies = [ - "glam", + "glam 0.22.0", ] [[package]] -name = "bevy_mod_picking" +name = "bevy_mikktspace" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4b815c364e05f887421ad2f14dee74bf4c3e60f34be1878d634cb28fadf15d2" +checksum = "aaa0358a79823e6f0069b910d90b615d02dad08279b5856d3d1e401472b6379a" +dependencies = [ + "glam 0.23.0", +] + +[[package]] +name = "bevy_mod_picking" +version = "0.11.0" +source = "git+https://github.com/Fincap/bevy_mod_picking.git?branch=migrate-bevy-0.10.0#670a4b86f53386d1545377130f71a09689444b67" dependencies = [ - "bevy", + "bevy 0.10.0", "bevy_mod_raycast", ] [[package]] name = "bevy_mod_raycast" version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a5813c0224e31350919e5fbf5a2099c3be4c7b8c04e8584ee4dba4e87795a19" +source = "git+https://github.com/soerenmeier/bevy_mod_raycast?branch=bevy-0.10#ebec4facf385ff789080e32b7fd1f2ea99a6a986" dependencies = [ - "bevy", + "bevy 0.10.0", ] [[package]] @@ -649,17 +1008,39 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a2e5069b351743e5660f837671135a7aac585cd2c1d7d0b90d92a2d84c2a1fd" dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_core_pipeline", - "bevy_derive", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_render", - "bevy_transform", - "bevy_utils", - "bevy_window", + "bevy_app 0.9.0", + "bevy_asset 0.9.0", + "bevy_core_pipeline 0.9.0", + "bevy_derive 0.9.0", + "bevy_ecs 0.9.0", + "bevy_math 0.9.0", + "bevy_reflect 0.9.0", + "bevy_render 0.9.0", + "bevy_transform 0.9.0", + "bevy_utils 0.9.0", + "bevy_window 0.9.0", + "bitflags", + "bytemuck", + "radsort", +] + +[[package]] +name = "bevy_pbr" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90230c526ee7257229c1db0fc4aafaa947ea806bb4b0674785930ea59d0cc7f8" +dependencies = [ + "bevy_app 0.10.0", + "bevy_asset 0.10.0", + "bevy_core_pipeline 0.10.0", + "bevy_derive 0.10.0", + "bevy_ecs 0.10.0", + "bevy_math 0.10.0", + "bevy_reflect 0.10.0", + "bevy_render 0.10.0", + "bevy_transform 0.10.0", + "bevy_utils 0.10.0", + "bevy_window 0.10.0", "bitflags", "bytemuck", "radsort", @@ -671,19 +1052,45 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c36f4d3af0cda50c07e2010d0351ab79594681116edd280592ca394db73ef32b" +[[package]] +name = "bevy_ptr" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a96c24da064370917b92c2a84527e6a73b620c50ac5ef8b1af8c04ccf5256a7c" + [[package]] name = "bevy_reflect" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c39f74d7786a0016c74b6bfb57f44928d536bef8bf6db7505d4cbe9435aeda7b" dependencies = [ - "bevy_math", - "bevy_ptr", - "bevy_reflect_derive", - "bevy_utils", + "bevy_math 0.9.0", + "bevy_ptr 0.9.0", + "bevy_reflect_derive 0.9.0", + "bevy_utils 0.9.0", + "downcast-rs", + "erased-serde", + "glam 0.22.0", + "once_cell", + "parking_lot", + "serde", + "smallvec", + "thiserror", +] + +[[package]] +name = "bevy_reflect" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab880e0eed9df5c99ce1a2f89edc11cdef1bc78413719b29e9ad7e3bc27f4c20" +dependencies = [ + "bevy_math 0.10.0", + "bevy_ptr 0.10.0", + "bevy_reflect_derive 0.10.0", + "bevy_utils 0.10.0", "downcast-rs", "erased-serde", - "glam", + "glam 0.23.0", "once_cell", "parking_lot", "serde", @@ -697,7 +1104,21 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b2c0aab36b060e88cd93c56710d9ce8ab6107596dc4cbb8a9d84ba98f39c63b" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.9.0", + "bit-set", + "proc-macro2", + "quote", + "syn", + "uuid", +] + +[[package]] +name = "bevy_reflect_derive" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b361b8671bdffe93978270dd770b03b48560c3127fdf9003f98111fb806bb11" +dependencies = [ + "bevy_macro_utils 0.10.0", "bit-set", "proc-macro2", "quote", @@ -712,31 +1133,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14033813fdd9587663ffa6b6d84327f30bd0398b40386677704bd4d608625420" dependencies = [ "anyhow", - "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_derive", - "bevy_ecs", - "bevy_encase_derive", - "bevy_hierarchy", - "bevy_log", - "bevy_math", - "bevy_mikktspace", - "bevy_reflect", - "bevy_render_macros", - "bevy_time", - "bevy_transform", - "bevy_utils", - "bevy_window", + "bevy_app 0.9.0", + "bevy_asset 0.9.0", + "bevy_core 0.9.0", + "bevy_derive 0.9.0", + "bevy_ecs 0.9.0", + "bevy_encase_derive 0.9.0", + "bevy_hierarchy 0.9.0", + "bevy_log 0.9.0", + "bevy_math 0.9.0", + "bevy_mikktspace 0.9.0", + "bevy_reflect 0.9.0", + "bevy_render_macros 0.9.0", + "bevy_time 0.9.0", + "bevy_transform 0.9.0", + "bevy_utils 0.9.0", + "bevy_window 0.9.0", "bitflags", "codespan-reporting", "downcast-rs", - "encase", + "encase 0.4.0", "futures-lite", "hex", "hexasphere", "image 0.24.5", - "naga", + "naga 0.10.0", "once_cell", "parking_lot", "regex", @@ -744,7 +1165,53 @@ dependencies = [ "smallvec", "thiserror", "thread_local", - "wgpu", + "wgpu 0.14.0", +] + +[[package]] +name = "bevy_render" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e352868ab1a9ad9fbaa6ff025505e685781ad1790377b2d038afeb9df18214" +dependencies = [ + "anyhow", + "async-channel", + "bevy_app 0.10.0", + "bevy_asset 0.10.0", + "bevy_core 0.10.0", + "bevy_derive 0.10.0", + "bevy_ecs 0.10.0", + "bevy_encase_derive 0.10.0", + "bevy_hierarchy 0.10.0", + "bevy_log 0.10.0", + "bevy_math 0.10.0", + "bevy_mikktspace 0.10.0", + "bevy_reflect 0.10.0", + "bevy_render_macros 0.10.0", + "bevy_tasks 0.10.0", + "bevy_time 0.10.0", + "bevy_transform 0.10.0", + "bevy_utils 0.10.0", + "bevy_window 0.10.0", + "bitflags", + "codespan-reporting", + "downcast-rs", + "encase 0.5.0", + "futures-lite", + "hexasphere", + "image 0.24.5", + "ktx2", + "naga 0.11.0", + "once_cell", + "parking_lot", + "regex", + "ruzstd", + "serde", + "smallvec", + "thiserror", + "thread_local", + "wgpu 0.15.1", + "wgpu-hal 0.15.3", ] [[package]] @@ -753,7 +1220,19 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e29db44fb38743a08e71bed324a19b8ce2e9f2853abcb4640e03625dd55cc186" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.9.0", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "bevy_render_macros" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "570b1d0f38439c5ac8ab75572804c9979b9caa372c49bd00803f60a22a3e1328" +dependencies = [ + "bevy_macro_utils 0.10.0", "proc-macro2", "quote", "syn", @@ -761,20 +1240,20 @@ dependencies = [ [[package]] name = "bevy_scene" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b98c58cba6417961856a57ba1116d78db3364b8e791ac517175f04b9abdb6b" +checksum = "3995f756e482e964e0244a5d388e757f272d1dcdc02136730b1c45f4d5eeb516" dependencies = [ "anyhow", - "bevy_app", - "bevy_asset", - "bevy_derive", - "bevy_ecs", - "bevy_hierarchy", - "bevy_reflect", - "bevy_render", - "bevy_transform", - "bevy_utils", + "bevy_app 0.10.0", + "bevy_asset 0.10.0", + "bevy_derive 0.10.0", + "bevy_ecs 0.10.0", + "bevy_hierarchy 0.10.0", + "bevy_reflect 0.10.0", + "bevy_render 0.10.0", + "bevy_transform 0.10.0", + "bevy_utils 0.10.0", "ron", "serde", "thiserror", @@ -787,17 +1266,42 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b135b2ccf7c5eaf9b3e20e39ef80081842f122081c8ce988cb2054afd1af270e" dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_core_pipeline", - "bevy_derive", - "bevy_ecs", - "bevy_log", - "bevy_math", - "bevy_reflect", - "bevy_render", - "bevy_transform", - "bevy_utils", + "bevy_app 0.9.0", + "bevy_asset 0.9.0", + "bevy_core_pipeline 0.9.0", + "bevy_derive 0.9.0", + "bevy_ecs 0.9.0", + "bevy_log 0.9.0", + "bevy_math 0.9.0", + "bevy_reflect 0.9.0", + "bevy_render 0.9.0", + "bevy_transform 0.9.0", + "bevy_utils 0.9.0", + "bitflags", + "bytemuck", + "fixedbitset", + "guillotiere", + "rectangle-pack", + "thiserror", +] + +[[package]] +name = "bevy_sprite" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14aa41c9480b76d7b3c3f1ed89f95c9d6e2a39d3c3367ca82c122d853ac0463e" +dependencies = [ + "bevy_app 0.10.0", + "bevy_asset 0.10.0", + "bevy_core_pipeline 0.10.0", + "bevy_derive 0.10.0", + "bevy_ecs 0.10.0", + "bevy_log 0.10.0", + "bevy_math 0.10.0", + "bevy_reflect 0.10.0", + "bevy_render 0.10.0", + "bevy_transform 0.10.0", + "bevy_utils 0.10.0", "bitflags", "bytemuck", "fixedbitset", @@ -821,6 +1325,21 @@ dependencies = [ "wasm-bindgen-futures", ] +[[package]] +name = "bevy_tasks" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e368e4177fe70d695d5cb67fb7480fa262de79948d9b883a21788b9abf5a85a" +dependencies = [ + "async-channel", + "async-executor", + "async-task", + "concurrent-queue 2.0.0", + "futures-lite", + "once_cell", + "wasm-bindgen-futures", +] + [[package]] name = "bevy_text" version = "0.9.0" @@ -829,16 +1348,39 @@ checksum = "fe4282d77fb5dd38bb2a7736a770f5e499782b8c546b9f7d73f6893ab04c8041" dependencies = [ "ab_glyph", "anyhow", - "bevy_app", - "bevy_asset", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_render", - "bevy_sprite", - "bevy_transform", - "bevy_utils", - "bevy_window", + "bevy_app 0.9.0", + "bevy_asset 0.9.0", + "bevy_ecs 0.9.0", + "bevy_math 0.9.0", + "bevy_reflect 0.9.0", + "bevy_render 0.9.0", + "bevy_sprite 0.9.0", + "bevy_transform 0.9.0", + "bevy_utils 0.9.0", + "bevy_window 0.9.0", + "glyph_brush_layout", + "serde", + "thiserror", +] + +[[package]] +name = "bevy_text" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33fc934d7cbadbb6dac11547dfb805d3e6b3f0b40f6e66e437fe4b3c7581cc5c" +dependencies = [ + "ab_glyph", + "anyhow", + "bevy_app 0.10.0", + "bevy_asset 0.10.0", + "bevy_ecs 0.10.0", + "bevy_math 0.10.0", + "bevy_reflect 0.10.0", + "bevy_render 0.10.0", + "bevy_sprite 0.10.0", + "bevy_transform 0.10.0", + "bevy_utils 0.10.0", + "bevy_window 0.10.0", "glyph_brush_layout", "serde", "thiserror", @@ -850,11 +1392,25 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a259a4b04f5ae2d02998247a69e5a711b0754eb22971320bf727c6f4d7bf38fa" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_reflect", - "bevy_utils", + "bevy_app 0.9.0", + "bevy_ecs 0.9.0", + "bevy_reflect 0.9.0", + "bevy_utils 0.9.0", + "crossbeam-channel", +] + +[[package]] +name = "bevy_time" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2f2863cfc08fa38909e047a1bbc2dd71d0836057ed0840c69ace9dff3e0c298" +dependencies = [ + "bevy_app 0.10.0", + "bevy_ecs 0.10.0", + "bevy_reflect 0.10.0", + "bevy_utils 0.10.0", "crossbeam-channel", + "thiserror", ] [[package]] @@ -863,11 +1419,24 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7b4cdac87f8a58c3ec166b5673dd35565c61eb0ec648e3b0cc30083170c0fb3" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_hierarchy", - "bevy_math", - "bevy_reflect", + "bevy_app 0.9.0", + "bevy_ecs 0.9.0", + "bevy_hierarchy 0.9.0", + "bevy_math 0.9.0", + "bevy_reflect 0.9.0", +] + +[[package]] +name = "bevy_transform" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de9cda3df545ac889b4f6b702109e51d29d7b4b6f402f2bb9b4d1d9f9c382b63" +dependencies = [ + "bevy_app 0.10.0", + "bevy_ecs 0.10.0", + "bevy_hierarchy 0.10.0", + "bevy_math 0.10.0", + "bevy_reflect 0.10.0", ] [[package]] @@ -876,26 +1445,56 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da6d85fcefe5a2bf259c2ff58a7a29b6102070242dc385b42a2656f4e8918883" dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_core_pipeline", - "bevy_derive", - "bevy_ecs", - "bevy_hierarchy", - "bevy_input", - "bevy_log", - "bevy_math", - "bevy_reflect", - "bevy_render", - "bevy_sprite", - "bevy_text", - "bevy_transform", - "bevy_utils", - "bevy_window", + "bevy_app 0.9.0", + "bevy_asset 0.9.0", + "bevy_core_pipeline 0.9.0", + "bevy_derive 0.9.0", + "bevy_ecs 0.9.0", + "bevy_hierarchy 0.9.0", + "bevy_input 0.9.0", + "bevy_log 0.9.0", + "bevy_math 0.9.0", + "bevy_reflect 0.9.0", + "bevy_render 0.9.0", + "bevy_sprite 0.9.0", + "bevy_text 0.9.0", + "bevy_transform 0.9.0", + "bevy_utils 0.9.0", + "bevy_window 0.9.0", + "bytemuck", + "serde", + "smallvec", + "taffy 0.1.0", + "thiserror", +] + +[[package]] +name = "bevy_ui" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc341d652ba20fac0170a46eff8310829a862f4e52db06164dc6200706768934" +dependencies = [ + "bevy_a11y", + "bevy_app 0.10.0", + "bevy_asset 0.10.0", + "bevy_core_pipeline 0.10.0", + "bevy_derive 0.10.0", + "bevy_ecs 0.10.0", + "bevy_hierarchy 0.10.0", + "bevy_input 0.10.0", + "bevy_log 0.10.0", + "bevy_math 0.10.0", + "bevy_reflect 0.10.0", + "bevy_render 0.10.0", + "bevy_sprite 0.10.0", + "bevy_text 0.10.0", + "bevy_transform 0.10.0", + "bevy_utils 0.10.0", + "bevy_window 0.10.0", "bytemuck", "serde", "smallvec", - "taffy", + "taffy 0.3.7", "thiserror", ] @@ -913,36 +1512,84 @@ dependencies = [ "uuid", ] +[[package]] +name = "bevy_utils" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04d90ce493910ad9af3b4220ea6864c7d1472761086a98230ecac59c8d547e95" +dependencies = [ + "ahash 0.7.6", + "bevy_utils_proc_macros", + "getrandom", + "hashbrown", + "instant", + "petgraph", + "thiserror", + "tracing", + "uuid", +] + +[[package]] +name = "bevy_utils_proc_macros" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62a42e465c446800c57a5bf65b64f4fa1c1f3a74efc2a64a2a001e4a4f548a2e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "bevy_window" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07a0d03022a6d1ec0d05c01a77f5592a9602bbc1cfc11ba457788b69f9ca175d" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_input", - "bevy_math", - "bevy_reflect", - "bevy_utils", - "raw-window-handle 0.5.0", + "bevy_app 0.9.0", + "bevy_ecs 0.9.0", + "bevy_input 0.9.0", + "bevy_math 0.9.0", + "bevy_reflect 0.9.0", + "bevy_utils 0.9.0", + "raw-window-handle", +] + +[[package]] +name = "bevy_window" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da8a2c523302ad64768991a7474c6010c76b9eb78323309ef3911521887fd108" +dependencies = [ + "bevy_app 0.10.0", + "bevy_ecs 0.10.0", + "bevy_input 0.10.0", + "bevy_math 0.10.0", + "bevy_reflect 0.10.0", + "bevy_utils 0.10.0", + "raw-window-handle", ] [[package]] name = "bevy_winit" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc7b4e4f83e268dcbd6f9c4e1c18f7382e457f5f1b160da4c85d9a3f489771a" +checksum = "8eb6eb9b9790c1ad925d900a3f315abf15b11fb56c6464747a96560e559e1a9c" dependencies = [ + "accesskit_winit", "approx", - "bevy_app", - "bevy_ecs", - "bevy_input", - "bevy_math", - "bevy_utils", - "bevy_window", + "bevy_a11y", + "bevy_app 0.10.0", + "bevy_derive 0.10.0", + "bevy_ecs 0.10.0", + "bevy_hierarchy 0.10.0", + "bevy_input 0.10.0", + "bevy_math 0.10.0", + "bevy_utils 0.10.0", + "bevy_window 0.10.0", "crossbeam-channel", - "raw-window-handle 0.5.0", + "once_cell", + "raw-window-handle", "wasm-bindgen", "web-sys", "winit", @@ -995,6 +1642,25 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" +[[package]] +name = "block-sys" +version = "0.1.0-beta.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146" +dependencies = [ + "objc-sys", +] + +[[package]] +name = "block2" +version = "0.2.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42" +dependencies = [ + "block-sys", + "objc2-encode", +] + [[package]] name = "bumpalo" version = "3.11.1" @@ -1080,52 +1746,21 @@ name = "clang-sys" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "clipboard-win" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4ab1b92798304eedc095b53942963240037c0516452cb11aeba709d420b2219" -dependencies = [ - "error-code", - "str-buf", - "winapi", -] - -[[package]] -name = "cocoa" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" -dependencies = [ - "bitflags", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types", +dependencies = [ + "glob", "libc", - "objc", + "libloading", ] [[package]] -name = "cocoa-foundation" -version = "0.1.0" +name = "clipboard-win" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" +checksum = "c4ab1b92798304eedc095b53942963240037c0516452cb11aeba709d420b2219" dependencies = [ - "bitflags", - "block", - "core-foundation", - "core-graphics-types", - "foreign-types", - "libc", - "objc", + "error-code", + "str-buf", + "winapi", ] [[package]] @@ -1144,6 +1779,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" +[[package]] +name = "com-rs" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" + [[package]] name = "combine" version = "4.6.6" @@ -1194,10 +1835,16 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ - "core-foundation-sys", + "core-foundation-sys 0.8.3", "libc", ] +[[package]] +name = "core-foundation-sys" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" + [[package]] name = "core-foundation-sys" version = "0.8.3" @@ -1231,11 +1878,12 @@ dependencies = [ [[package]] name = "coreaudio-rs" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11894b20ebfe1ff903cbdc52259693389eea03b94918a2def2c30c3bf227ad88" +checksum = "cb17e2d1795b1996419648915df94bc7103c28f7b48062d7acf4652fc371b2ff" dependencies = [ "bitflags", + "core-foundation-sys 0.6.2", "coreaudio-sys", ] @@ -1250,28 +1898,28 @@ dependencies = [ [[package]] name = "cpal" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e73413ddcb69c398125f5529714492e070c64c6a090ad5b01d8c082b320a0809" +checksum = "d34fa7b20adf588f73f094cd9b1d944977c686e37a2759ea217ab174f017e10a" dependencies = [ "alsa", - "core-foundation-sys", + "core-foundation-sys 0.8.3", "coreaudio-rs", + "dasp_sample", "jni 0.19.0", "js-sys", "libc", "mach", - "ndk 0.7.0", + "ndk", "ndk-context", - "nix 0.25.0", "oboe", "once_cell", "parking_lot", - "stdweb", "thiserror", "wasm-bindgen", + "wasm-bindgen-futures", "web-sys", - "windows", + "windows 0.44.0", ] [[package]] @@ -1319,6 +1967,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "d3d12" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" +dependencies = [ + "bitflags", + "libloading", + "winapi", +] + [[package]] name = "darling" version = "0.13.4" @@ -1354,6 +2013,12 @@ dependencies = [ "syn", ] +[[package]] +name = "dasp_sample" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" + [[package]] name = "deflate" version = "0.8.6" @@ -1364,12 +2029,6 @@ dependencies = [ "byteorder", ] -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - [[package]] name = "dispatch" version = "0.2.0" @@ -1409,8 +2068,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6bdd416eb91cd6fb73a22fbc9fa1ea013641cce1a58905c31623ff9c562e811" dependencies = [ "const_panic", - "encase_derive", - "glam", + "encase_derive 0.4.0", + "glam 0.22.0", + "thiserror", +] + +[[package]] +name = "encase" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6591f13a63571c4821802eb5b10fd1155b1290bce87086440003841c8c3909b" +dependencies = [ + "const_panic", + "encase_derive 0.5.0", + "glam 0.23.0", "thiserror", ] @@ -1420,7 +2091,16 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df06cd7ea02426c2a0a164656bf116813584b461b8a7bb059b7941ab981105d3" dependencies = [ - "encase_derive_impl", + "encase_derive_impl 0.4.0", +] + +[[package]] +name = "encase_derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f1da6deed1f8b6f5909616ffa695f63a5de54d6a0f084fa715c70c8ed3abac9" +dependencies = [ + "encase_derive_impl 0.5.0", ] [[package]] @@ -1434,6 +2114,17 @@ dependencies = [ "syn", ] +[[package]] +name = "encase_derive_impl" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae489d58959f3c4cdd1250866a05acfb341469affe4fced71aff3ba228be1693" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "env_logger" version = "0.9.3" @@ -1510,7 +2201,7 @@ checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "windows-sys 0.42.0", ] @@ -1630,9 +2321,9 @@ dependencies = [ [[package]] name = "gilrs" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ba7c37bf8ea7ba0c3e3795dfa1a7771b1e47c4bb417c4d27c7b338d79685f" +checksum = "7d0342acdc7b591d171212e17c9350ca02383b86d5f9af33c6e3598e03a6c57e" dependencies = [ "fnv", "gilrs-core", @@ -1643,9 +2334,9 @@ dependencies = [ [[package]] name = "gilrs-core" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a8d94a7fc5afd27e894e08a4cfe5a49237f85bcc7140e90721bad3399c7d02" +checksum = "6789d356476c3280a4e15365d23f62b4b4f1bcdac81fdd552f65807bce4666dd" dependencies = [ "core-foundation", "io-kit-sys", @@ -1653,15 +2344,20 @@ dependencies = [ "libc", "libudev-sys", "log", - "nix 0.24.2", - "rusty-xinput", + "nix 0.25.0", "uuid", "vec_map", "wasm-bindgen", "web-sys", - "winapi", + "windows 0.43.0", ] +[[package]] +name = "gimli" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" + [[package]] name = "glam" version = "0.22.0" @@ -1672,6 +2368,16 @@ dependencies = [ "serde", ] +[[package]] +name = "glam" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e4afd9ad95555081e109fe1d21f2a30c691b5f0919c67dfa690a2e1eb6bd51c" +dependencies = [ + "bytemuck", + "serde", +] + [[package]] name = "glob" version = "0.3.0" @@ -1690,6 +2396,18 @@ dependencies = [ "web-sys", ] +[[package]] +name = "glow" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e007a07a24de5ecae94160f141029e9a347282cfe25d1d58d85d845cf3130f1" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "gltf" version = "1.0.0" @@ -1755,6 +2473,19 @@ dependencies = [ "bitflags", ] +[[package]] +name = "gpu-allocator" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8" +dependencies = [ + "backtrace", + "log", + "thiserror", + "winapi", + "windows 0.44.0", +] + [[package]] name = "gpu-descriptor" version = "0.2.3" @@ -1815,6 +2546,21 @@ dependencies = [ "serde", ] +[[package]] +name = "hassle-rs" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90601c6189668c7345fc53842cb3f3a3d872203d523be1b3cb44a36a3e62fb85" +dependencies = [ + "bitflags", + "com-rs", + "libc", + "libloading", + "thiserror", + "widestring 0.5.1", + "winapi", +] + [[package]] name = "hex" version = "0.4.3" @@ -1823,11 +2569,11 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hexasphere" -version = "8.0.0" +version = "8.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "619ce654558681d7d0a7809e1b20249c7032ff13ee6baa7bb7ff64f7f28a906a" +checksum = "bd41d443f978bfa380a6dad58b62a08c43bcb960631f13e9d015b911eaf73588" dependencies = [ - "glam", + "glam 0.23.0", "once_cell", ] @@ -1944,7 +2690,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7789f7f3c9686f96164f5109d69152de759e76e284f736bd57661c6df5091919" dependencies = [ - "core-foundation-sys", + "core-foundation-sys 0.8.3", "mach", ] @@ -2005,9 +2751,9 @@ checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] @@ -2043,6 +2789,15 @@ dependencies = [ "libc", ] +[[package]] +name = "ktx2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87d65e08a9ec02e409d27a0139eaa6b9756b4d81fe7cde71f6941a83730ce838" +dependencies = [ + "bitflags", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -2245,16 +3000,25 @@ dependencies = [ ] [[package]] -name = "ndk" -version = "0.6.0" +name = "naga" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +checksum = "5eafe22a23b797c9bc227c6c896419b26b5bb88fa903417a3adaed08778850d5" dependencies = [ + "bit-set", "bitflags", - "jni-sys", - "ndk-sys 0.3.0", - "num_enum", + "codespan-reporting", + "hexf-parse", + "indexmap", + "log", + "num-traits", + "petgraph", + "pp-rs", + "rustc-hash", + "spirv", + "termcolor", "thiserror", + "unicode-xid", ] [[package]] @@ -2265,9 +3029,9 @@ checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" dependencies = [ "bitflags", "jni-sys", - "ndk-sys 0.4.0", + "ndk-sys", "num_enum", - "raw-window-handle 0.5.0", + "raw-window-handle", "thiserror", ] @@ -2286,10 +3050,10 @@ dependencies = [ "android_logger", "libc", "log", - "ndk 0.7.0", + "ndk", "ndk-context", "ndk-macro", - "ndk-sys 0.4.0", + "ndk-sys", "once_cell", "parking_lot", ] @@ -2307,15 +3071,6 @@ dependencies = [ "syn", ] -[[package]] -name = "ndk-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" -dependencies = [ - "jni-sys", -] - [[package]] name = "ndk-sys" version = "0.4.0" @@ -2338,19 +3093,6 @@ dependencies = [ "memoffset", ] -[[package]] -name = "nix" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" -dependencies = [ - "bitflags", - "cc", - "cfg-if", - "libc", - "memoffset", -] - [[package]] name = "nix" version = "0.24.2" @@ -2372,8 +3114,6 @@ dependencies = [ "bitflags", "cfg-if", "libc", - "memoffset", - "pin-utils", ] [[package]] @@ -2410,6 +3150,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "ntapi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc51db7b362b205941f71232e56c625156eb9a929f8cf74a428fd5bc094a4afc" +dependencies = [ + "winapi", +] + [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -2525,6 +3274,32 @@ dependencies = [ "objc_id", ] +[[package]] +name = "objc-sys" +version = "0.2.0-beta.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" + +[[package]] +name = "objc2" +version = "0.3.0-beta.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe31e5425d3d0b89a15982c024392815da40689aceb34bad364d58732bcfd649" +dependencies = [ + "block2", + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +version = "2.0.0-pre.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" +dependencies = [ + "objc-sys", +] + [[package]] name = "objc_exception" version = "0.1.2" @@ -2543,14 +3318,23 @@ dependencies = [ "objc", ] +[[package]] +name = "object" +version = "0.30.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +dependencies = [ + "memchr", +] + [[package]] name = "oboe" -version = "0.4.6" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27f63c358b4fa0fbcfefd7c8be5cfc39c08ce2389f5325687e7762a48d30a5c1" +checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0" dependencies = [ - "jni 0.19.0", - "ndk 0.6.0", + "jni 0.20.0", + "ndk", "ndk-context", "num-derive", "num-traits", @@ -2559,9 +3343,9 @@ dependencies = [ [[package]] name = "oboe-sys" -version = "0.4.5" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd" +checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2" dependencies = [ "cc", ] @@ -2581,6 +3365,18 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +[[package]] +name = "orbclient" +version = "0.3.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "974465c5e83cf9df05c1e4137b271d29035c902e39e5ad4c1939837e22160af8" +dependencies = [ + "cfg-if", + "redox_syscall 0.2.16", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "overload" version = "0.1.1" @@ -2620,11 +3416,17 @@ checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", "windows-sys 0.42.0", ] +[[package]] +name = "paste" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" + [[package]] name = "peeking_take_while" version = "0.1.2" @@ -2653,12 +3455,6 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - [[package]] name = "pkg-config" version = "0.3.26" @@ -2751,15 +3547,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63e935c45e09cc6dcf00d2f0b2d630a58f4095320223d47fc68918722f0538b6" -[[package]] -name = "raw-window-handle" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" -dependencies = [ - "cty", -] - [[package]] name = "raw-window-handle" version = "0.5.0" @@ -2784,6 +3571,15 @@ dependencies = [ "bitflags", ] +[[package]] +name = "redox_syscall" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb02a9aee8e8c7ad8d86890f1e16b49e0bbbffc9961ff3788c31d57c98bcbf03" +dependencies = [ + "bitflags", +] + [[package]] name = "regex" version = "1.7.0" @@ -2818,9 +3614,9 @@ checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157" [[package]] name = "rodio" -version = "0.16.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb10b653d5ec0e9411a2e7d46e2c7f4046fd87d35b9955bd73ba4108d69072b5" +checksum = "bdf1d4dea18dff2e9eb6dca123724f8b60ef44ad74a9ad283cdfe025df7e73fa" dependencies = [ "cpal", "hound", @@ -2839,29 +3635,25 @@ dependencies = [ ] [[package]] -name = "rustc-hash" -version = "1.1.0" +name = "rustc-demangle" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" [[package]] -name = "rustc_version" -version = "0.2.3" +name = "rustc-hash" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver", -] +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] -name = "rusty-xinput" -version = "1.2.0" +name = "ruzstd" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2aa654bc32eb9ca14cce1a084abc9dfe43949a4547c35269a094c39272db3bb" +checksum = "8cada0ef59efa6a5f4dc5e491f93d9f31e3fc7758df421ff1de8a706338e1100" dependencies = [ - "lazy_static", - "log", - "winapi", + "byteorder", + "twox-hash", ] [[package]] @@ -2882,29 +3674,14 @@ dependencies = [ [[package]] name = "scoped_threadpool" version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" [[package]] -name = "semver-parser" -version = "0.7.0" +name = "scopeguard" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" @@ -2937,21 +3714,6 @@ dependencies = [ "serde", ] -[[package]] -name = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - [[package]] name = "sharded-slab" version = "0.1.4" @@ -3010,55 +3772,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_derive", - "syn", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde", - "serde_derive", - "serde_json", - "sha1", - "syn", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - [[package]] name = "str-buf" version = "1.0.6" @@ -3088,6 +3801,20 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "sysinfo" +version = "0.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e847e2de7a137c8c2cede5095872dbb00f4f9bf34d061347e36b43322acd56" +dependencies = [ + "cfg-if", + "core-foundation-sys 0.8.3", + "libc", + "ntapi", + "once_cell", + "winapi", +] + [[package]] name = "taffy" version = "0.1.0" @@ -3101,6 +3828,17 @@ dependencies = [ "typenum", ] +[[package]] +name = "taffy" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ee314c07429e51c4770287734f62d23bb27cb9e941823f969b57f50171079ee" +dependencies = [ + "arrayvec", + "num-traits", + "slotmap", +] + [[package]] name = "termcolor" version = "1.1.3" @@ -3174,6 +3912,23 @@ dependencies = [ "serde", ] +[[package]] +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" + +[[package]] +name = "toml_edit" +version = "0.19.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7082a95d48029677a28f181e5f6422d0c8339ad8396a39d3f33d62a90c1f6c30" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + [[package]] name = "tracing" version = "0.1.37" @@ -3253,6 +4008,16 @@ version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "375812fa44dab6df41c195cd2f7fecb488f6c09fbaafb62807488cefab642bff" +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "static_assertions", +] + [[package]] name = "typenum" version = "1.15.0" @@ -3356,9 +4121,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3366,9 +4131,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log", @@ -3381,9 +4146,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ "cfg-if", "js-sys", @@ -3393,9 +4158,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3403,9 +4168,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", @@ -3416,15 +4181,26 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" + +[[package]] +name = "wayland-scanner" +version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" +dependencies = [ + "proc-macro2", + "quote", + "xml-rs", +] [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", @@ -3439,10 +4215,10 @@ dependencies = [ "jni 0.20.0", "ndk-context", "objc", - "raw-window-handle 0.5.0", + "raw-window-handle", "url", "web-sys", - "widestring", + "widestring 1.0.2", "winapi", ] @@ -3461,17 +4237,41 @@ dependencies = [ "arrayvec", "js-sys", "log", - "naga", + "naga 0.10.0", + "parking_lot", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core 0.14.0", + "wgpu-hal 0.14.1", + "wgpu-types 0.14.1", +] + +[[package]] +name = "wgpu" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d745a1b6d91d85c33defbb29f0eee0450e1d2614d987e14bf6baf26009d132d7" +dependencies = [ + "arrayvec", + "cfg-if", + "js-sys", + "log", + "naga 0.11.0", "parking_lot", - "raw-window-handle 0.5.0", + "profiling", + "raw-window-handle", "smallvec", "static_assertions", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu-core", - "wgpu-hal", - "wgpu-types", + "wgpu-core 0.15.1", + "wgpu-hal 0.15.3", + "wgpu-types 0.15.2", ] [[package]] @@ -3487,15 +4287,38 @@ dependencies = [ "codespan-reporting", "fxhash", "log", - "naga", + "naga 0.10.0", + "parking_lot", + "profiling", + "raw-window-handle", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal 0.14.1", + "wgpu-types 0.14.1", +] + +[[package]] +name = "wgpu-core" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7131408d940e335792645a98f03639573b0480e9e2e7cddbbab74f7c6d9f3fff" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags", + "codespan-reporting", + "fxhash", + "log", + "naga 0.11.0", "parking_lot", "profiling", - "raw-window-handle 0.5.0", + "raw-window-handle", "smallvec", "thiserror", "web-sys", - "wgpu-hal", - "wgpu-types", + "wgpu-hal 0.15.3", + "wgpu-types 0.15.2", ] [[package]] @@ -3511,29 +4334,71 @@ dependencies = [ "bitflags", "block", "core-graphics-types", - "d3d12", + "d3d12 0.5.0", + "foreign-types", + "fxhash", + "glow 0.11.2", + "gpu-alloc", + "gpu-descriptor", + "js-sys", + "khronos-egl", + "libloading", + "log", + "metal", + "naga 0.10.0", + "objc", + "parking_lot", + "profiling", + "range-alloc", + "raw-window-handle", + "renderdoc-sys", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types 0.14.1", + "winapi", +] + +[[package]] +name = "wgpu-hal" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7762ae7fcc06943c1b5d4987ab0194e82aaba7767fbfb75d3458844c5b82cc45" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags", + "block", + "core-graphics-types", + "d3d12 0.6.0", "foreign-types", "fxhash", - "glow", + "glow 0.12.1", "gpu-alloc", + "gpu-allocator", "gpu-descriptor", + "hassle-rs", "js-sys", "khronos-egl", + "libc", "libloading", "log", "metal", - "naga", + "naga 0.11.0", "objc", "parking_lot", "profiling", "range-alloc", - "raw-window-handle 0.5.0", + "raw-window-handle", "renderdoc-sys", "smallvec", "thiserror", "wasm-bindgen", "web-sys", - "wgpu-types", + "wgpu-types 0.15.2", "winapi", ] @@ -3546,6 +4411,23 @@ dependencies = [ "bitflags", ] +[[package]] +name = "wgpu-types" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32444e121b0bd00cb02c0de32fde457a9491bd44e03e7a5db6df9b1da2f6f110" +dependencies = [ + "bitflags", + "js-sys", + "web-sys", +] + +[[package]] +name = "widestring" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" + [[package]] name = "widestring" version = "1.0.2" @@ -3594,155 +4476,142 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.37.0" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647" +checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244" dependencies = [ - "windows_aarch64_msvc 0.37.0", - "windows_i686_gnu 0.37.0", - "windows_i686_msvc 0.37.0", - "windows_x86_64_gnu 0.37.0", - "windows_x86_64_msvc 0.37.0", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] -name = "windows-sys" -version = "0.36.1" +name = "windows" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", + "windows-implement", + "windows-interface", + "windows-targets", ] [[package]] -name = "windows-sys" -version = "0.42.0" +name = "windows-implement" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "6ce87ca8e3417b02dc2a8a22769306658670ec92d78f1bd420d6310a67c245c6" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.37.0" +name = "windows-interface" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a" +checksum = "853f69a591ecd4f810d29f17e902d40e349fb05b0b11fff63b08b826bfe39c7f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] [[package]] -name = "windows_aarch64_msvc" +name = "windows-sys" version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] [[package]] -name = "windows_i686_gnu" -version = "0.36.1" +name = "windows-sys" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] [[package]] -name = "windows_i686_gnu" -version = "0.37.0" +name = "windows-targets" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] [[package]] -name = "windows_i686_gnu" -version = "0.42.0" +name = "windows_aarch64_gnullvm" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] -name = "windows_i686_msvc" -version = "0.36.1" +name = "windows_aarch64_msvc" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] -name = "windows_i686_msvc" -version = "0.37.0" +name = "windows_i686_gnu" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.37.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" [[package]] name = "winit" -version = "0.27.5" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c" +checksum = "9d38e7dc904dda347b54dbec3b2d4bf534794f4fb4e6df0be91a264f4f2ed1cf" dependencies = [ + "android-activity", "bitflags", - "cocoa", + "cfg_aliases", "core-foundation", "core-graphics", "dispatch", @@ -3750,20 +4619,29 @@ dependencies = [ "libc", "log", "mio", - "ndk 0.7.0", - "ndk-glue", - "objc", + "ndk", + "objc2", "once_cell", - "parking_lot", + "orbclient", "percent-encoding", - "raw-window-handle 0.4.3", - "raw-window-handle 0.5.0", + "raw-window-handle", + "redox_syscall 0.3.4", "wasm-bindgen", + "wayland-scanner", "web-sys", - "windows-sys 0.36.1", + "windows-sys 0.45.0", "x11-dl", ] +[[package]] +name = "winnow" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee7b2c67f962bf5042bfd8b6a916178df33a26eec343ae064cb8e069f638fa6f" +dependencies = [ + "memchr", +] + [[package]] name = "x11-dl" version = "2.20.0" @@ -3792,3 +4670,9 @@ name = "xi-unicode" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" + +[[package]] +name = "xml-rs" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" diff --git a/Cargo.toml b/Cargo.toml index 9dff3ff..2486906 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ opt-level = 1 opt-level = 3 [dependencies] -bevy = {version = "0.9", features = ["dynamic", "wav"] } +bevy = {version = "0.10", features = ["wav"] } bevy-inspector-egui = "0.14.0" -bevy_mod_picking = "0.10" +bevy_mod_picking = { git = "https://github.com/Fincap/bevy_mod_picking.git", branch = "migrate-bevy-0.10.0" } diff --git a/src/bullet.rs b/src/bullet.rs index f65e91e..d620900 100644 --- a/src/bullet.rs +++ b/src/bullet.rs @@ -19,11 +19,9 @@ impl Plugin for BulletPlugin { fn build(&self, app: &mut App) { app.register_type::() .register_type::() - .add_system_set( - SystemSet::on_update(GameState::Gameplay) - .with_system(bullet_collision) - .with_system(move_bullets) - .with_system(bullet_despawn), + .add_systems( + (bullet_collision, move_bullets, bullet_despawn) + .in_set(OnUpdate(GameState::Gameplay)), ); } } diff --git a/src/main.rs b/src/main.rs index e1ac497..5c7d301 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,5 @@ -use bevy::{pbr::NotShadowCaster, prelude::*, utils::FloatOrd}; -use bevy_inspector_egui::{Inspectable, RegisterInspectable, WorldInspectorPlugin}; +use bevy::{pbr::NotShadowCaster, prelude::*, utils::FloatOrd, window::WindowResolution}; +use bevy_inspector_egui::Inspectable; use bevy_mod_picking::*; pub const HEIGHT: f32 = 720.0; @@ -29,8 +29,9 @@ pub use player::*; pub use target::*; pub use tower::*; -#[derive(Debug, Clone, Eq, PartialEq, Hash)] +#[derive(States, Debug, Default, Clone, Eq, PartialEq, Hash)] pub enum GameState { + #[default] MainMenu, Gameplay, } @@ -40,21 +41,21 @@ fn main() { // Window Setup .insert_resource(ClearColor(Color::rgb(0.3, 0.3, 0.3))) .add_plugins(DefaultPlugins.set(WindowPlugin { - window: WindowDescriptor { - width: WIDTH, - height: HEIGHT, + primary_window: Some(Window { + resolution: WindowResolution::new(WIDTH, HEIGHT), title: "Bevy Tower Defense".to_string(), resizable: false, ..default() - }, + }), ..default() })) // Inspector Setup - .add_plugin(WorldInspectorPlugin::new()) + // TODO: Update to a new version of bevy_inspector_egui + // .add_plugin(WorldInspectorPlugin::new()) // Mod Picking .add_plugins(DefaultPickingPlugins) // Our State - .add_state(GameState::MainMenu) + .add_state::() // Our Systems .add_plugin(TowerPlugin) .add_plugin(TargetPlugin) @@ -62,9 +63,9 @@ fn main() { .add_plugin(MainMenuPlugin) .add_plugin(PlayerPlugin) //TODO despawn scene on returning to main menu (on_exit) - .add_system_set(SystemSet::on_enter(GameState::Gameplay).with_system(spawn_basic_scene)) + .add_system(spawn_basic_scene.in_schedule(OnEnter(GameState::Gameplay))) .add_startup_system(spawn_camera) - .add_startup_system_to_stage(StartupStage::PreStartup, asset_loading) + .add_startup_system(asset_loading.in_base_set(StartupSet::PreStartup)) .add_system(camera_controls) .run(); } @@ -138,7 +139,7 @@ fn spawn_basic_scene( ) { commands .spawn(PbrBundle { - mesh: meshes.add(Mesh::from(shape::Plane { size: 50.0 })), + mesh: meshes.add(Mesh::from(shape::Plane::from_size(50.0))), material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()), ..default() }) diff --git a/src/main_menu.rs b/src/main_menu.rs index 3c23233..51579b1 100644 --- a/src/main_menu.rs +++ b/src/main_menu.rs @@ -15,13 +15,18 @@ pub struct MainMenuPlugin; impl Plugin for MainMenuPlugin { fn build(&self, app: &mut App) { - app.add_system_set(SystemSet::on_enter(GameState::MainMenu).with_system(spawn_main_menu)) - // This could just be a normal system because the button should only exist during the menu state + /* + app.add_systems(SystemSet::on_enter(GameState::MainMenu).with_system(spawn_main_menu)) .add_system_set( SystemSet::on_update(GameState::MainMenu) .with_system(start_button_clicked) .with_system(quit_button_clicked), ); + */ + app.add_system(spawn_main_menu.in_schedule(OnEnter(GameState::MainMenu))) + .add_systems( + (start_button_clicked, quit_button_clicked).in_set(OnUpdate(GameState::MainMenu)), + ); } } @@ -29,7 +34,7 @@ fn start_button_clicked( mut commands: Commands, interactions: Query<&Interaction, (With, Changed)>, menu_root: Query>, - mut game_state: ResMut>, + mut game_state: ResMut>, mut mouse_input: ResMut>, ) { for interaction in &interactions { @@ -37,7 +42,7 @@ fn start_button_clicked( let root_entity = menu_root.single(); commands.entity(root_entity).despawn_recursive(); - game_state.set(GameState::Gameplay).unwrap(); + game_state.set(GameState::Gameplay); mouse_input.clear(); } } diff --git a/src/player.rs b/src/player.rs index 36a8da5..f8fcf74 100644 --- a/src/player.rs +++ b/src/player.rs @@ -24,15 +24,11 @@ pub struct PlayerPlugin; impl Plugin for PlayerPlugin { fn build(&self, app: &mut App) { app.register_type::() - .add_system_set( - SystemSet::on_enter(GameState::Gameplay) - .with_system(spawn_player) - .with_system(spawn_gameplay_ui), + .add_systems( + (spawn_player, spawn_gameplay_ui).in_schedule(OnEnter(GameState::Gameplay)), ) - .add_system_set( - SystemSet::on_update(GameState::Gameplay) - .with_system(give_money_on_kill) - .with_system(update_player_ui), + .add_systems( + (give_money_on_kill, update_player_ui).in_set(OnUpdate(GameState::Gameplay)), ); } } diff --git a/src/target.rs b/src/target.rs index 8b5ecfd..70013a6 100644 --- a/src/target.rs +++ b/src/target.rs @@ -38,11 +38,9 @@ impl Plugin for TargetPlugin { Vec2::new(9.0, 9.0), ], }) - .add_system_set( - SystemSet::on_update(GameState::Gameplay) - .with_system(move_targets) - .with_system(hurt_player.after(move_targets)) - .with_system(target_death), + .add_systems( + (move_targets, hurt_player.after(move_targets), target_death) + .in_set(OnUpdate(GameState::Gameplay)), ); } } diff --git a/src/tower.rs b/src/tower.rs index 1bc7352..03b5ebc 100644 --- a/src/tower.rs +++ b/src/tower.rs @@ -32,14 +32,17 @@ pub struct TowerPlugin; impl Plugin for TowerPlugin { fn build(&self, app: &mut App) { app.register_type::() - .register_inspectable::() + // TODO: Figure out what to do here: + // .register_inspectable::() .register_type::() - .add_system_set( - SystemSet::on_update(GameState::Gameplay) - .with_system(tower_shooting) - .with_system(tower_button_clicked) - .with_system(create_ui_on_selection) - .with_system(grey_tower_buttons.after(create_ui_on_selection)), + .add_systems( + ( + tower_shooting, + tower_button_clicked, + create_ui_on_selection, + grey_tower_buttons.after(create_ui_on_selection), + ) + .in_set(OnUpdate(GameState::Gameplay)), ); } }