From 63d3bb87d4137a05dd4c317baebd93147c29ec6b Mon Sep 17 00:00:00 2001 From: Joe Ardent Date: Thu, 9 Mar 2023 17:50:14 -0800 Subject: [PATCH] ok, works --- Cargo.lock | 1391 ++++++++------------------------------------- Cargo.toml | 7 +- src/action/mod.rs | 4 +- src/bike/mod.rs | 6 +- src/camera.rs | 23 +- src/glamor.rs | 90 ++- src/input.rs | 49 +- src/lib.rs | 11 +- src/lights.rs | 33 +- src/main.rs | 9 +- src/planet.rs | 2 +- 11 files changed, 371 insertions(+), 1254 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 08d1ffc..f46db24 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -147,18 +147,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e" -[[package]] -name = "android_logger" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8619b80c242aa7bd638b5c7ddd952addeecb71f69c75e33f1d47b2804f8f883a" -dependencies = [ - "android_log-sys", - "env_logger", - "log", - "once_cell", -] - [[package]] name = "android_system_properties" version = "0.1.5" @@ -224,7 +212,7 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" dependencies = [ - "concurrent-queue 2.1.0", + "concurrent-queue", "event-listener", "futures-core", ] @@ -237,7 +225,7 @@ checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" dependencies = [ "async-lock", "async-task", - "concurrent-queue 2.1.0", + "concurrent-queue", "fastrand", "futures-lite", "slab", @@ -291,22 +279,13 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" -[[package]] -name = "bevy" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dae99b246505811f5bc19d2de1e406ec5d2816b421d58fa223779eb576f472c9" -dependencies = [ - "bevy_internal 0.9.1", -] - [[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", + "bevy_internal", ] [[package]] @@ -316,20 +295,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69bffd8614a60f187983e9f805bba13c298294f4666172ae7ab9c39ad61919fa" dependencies = [ "bevy-inspector-egui-derive", - "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_app", + "bevy_asset", + "bevy_core", + "bevy_core_pipeline", + "bevy_ecs", "bevy_egui", - "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_utils 0.10.0", - "bevy_window 0.10.0", + "bevy_hierarchy", + "bevy_log", + "bevy_math", + "bevy_pbr", + "bevy_reflect", + "bevy_render", + "bevy_utils", + "bevy_window", "egui", "image", "once_cell", @@ -355,24 +334,9 @@ 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_app" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "536e4d0018347478545ed8b6cb6e57b9279ee984868e81b7c0e78e0fb3222e42" -dependencies = [ - "bevy_derive 0.9.1", - "bevy_ecs 0.9.1", - "bevy_reflect 0.9.1", - "bevy_utils 0.9.1", - "downcast-rs", - "wasm-bindgen", - "web-sys", + "bevy_app", + "bevy_derive", + "bevy_ecs", ] [[package]] @@ -381,42 +345,15 @@ 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", + "bevy_derive", + "bevy_ecs", + "bevy_reflect", + "bevy_utils", "downcast-rs", "wasm-bindgen", "web-sys", ] -[[package]] -name = "bevy_asset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db1bb550168304df69c867c09125e1aae7ff51cf21575396e1598bf293442c4" -dependencies = [ - "anyhow", - "bevy_app 0.9.1", - "bevy_diagnostic 0.9.1", - "bevy_ecs 0.9.1", - "bevy_log 0.9.1", - "bevy_reflect 0.9.1", - "bevy_tasks 0.9.1", - "bevy_utils 0.9.1", - "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" @@ -424,13 +361,13 @@ 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_app", + "bevy_diagnostic", + "bevy_ecs", + "bevy_log", + "bevy_reflect", + "bevy_tasks", + "bevy_utils", "bevy_winit", "crossbeam-channel", "downcast-rs", @@ -444,147 +381,67 @@ dependencies = [ "web-sys", ] -[[package]] -name = "bevy_core" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96299aceb3c8362cb4aa39ff81c7ef758a5f4e768d16b5046a91628eff114ac0" -dependencies = [ - "bevy_app 0.9.1", - "bevy_ecs 0.9.1", - "bevy_math 0.9.1", - "bevy_reflect 0.9.1", - "bevy_tasks 0.9.1", - "bevy_utils 0.9.1", - "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", + "bevy_app", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_tasks", + "bevy_utils", "bytemuck", ] -[[package]] -name = "bevy_core_pipeline" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc128a9860aadf16fb343ae427f2768986fd91dce64d945455acda9759c48014" -dependencies = [ - "bevy_app 0.9.1", - "bevy_asset 0.9.1", - "bevy_derive 0.9.1", - "bevy_ecs 0.9.1", - "bevy_math 0.9.1", - "bevy_reflect 0.9.1", - "bevy_render 0.9.1", - "bevy_transform 0.9.1", - "bevy_utils 0.9.1", - "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", + "bevy_app", + "bevy_asset", + "bevy_derive", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", "bitflags", "radsort", "serde", ] -[[package]] -name = "bevy_derive" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7baf73c58d41c353c6fd08e6764a2e7420c9f19e8227b391c50981db6d0282a6" -dependencies = [ - "bevy_macro_utils 0.9.1", - "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", + "bevy_macro_utils", "quote", "syn", ] -[[package]] -name = "bevy_diagnostic" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63bf96ec7980fa25b77ff6c72dfafada477936c0dab76c1edf6c028c0e5fe0e4" -dependencies = [ - "bevy_app 0.9.1", - "bevy_core 0.9.1", - "bevy_ecs 0.9.1", - "bevy_log 0.9.1", - "bevy_time 0.9.1", - "bevy_utils 0.9.1", -] - [[package]] name = "bevy_diagnostic" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "576508ffe7ad5124781edd352b79bdc79ffbb6e2f26bad6f722774f7c9fd16c9" dependencies = [ - "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", + "bevy_app", + "bevy_core", + "bevy_ecs", + "bevy_log", + "bevy_time", + "bevy_utils", "sysinfo", ] -[[package]] -name = "bevy_ecs" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c071d7c6bc9801253485e05d0c257284150de755391902746837ba21c0cf74" -dependencies = [ - "async-channel", - "bevy_ecs_macros 0.9.1", - "bevy_ptr 0.9.1", - "bevy_reflect 0.9.1", - "bevy_tasks 0.9.1", - "bevy_utils 0.9.1", - "downcast-rs", - "event-listener", - "fixedbitset", - "fxhash", - "serde", - "thread_local", -] - [[package]] name = "bevy_ecs" version = "0.10.0" @@ -592,11 +449,11 @@ 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", + "bevy_ecs_macros", + "bevy_ptr", + "bevy_reflect", + "bevy_tasks", + "bevy_utils", "downcast-rs", "event-listener", "fixedbitset", @@ -605,25 +462,13 @@ dependencies = [ "thread_local", ] -[[package]] -name = "bevy_ecs_macros" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15bd45438eeb681ad74f2d205bb07a5699f98f9524462a30ec764afab2742ce" -dependencies = [ - "bevy_macro_utils 0.9.1", - "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", + "bevy_macro_utils", "proc-macro2", "quote", "syn", @@ -636,30 +481,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf0efb32c83ae6d2cc36bda08a029d74fdeb45870489599d3779a36649802bce" dependencies = [ "arboard", - "bevy 0.10.0", + "bevy", "egui", "thread_local", "webbrowser", ] -[[package]] -name = "bevy_encase_derive" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "962b6bb0d30e92ec2e6c29837acce9e55b920733a634e7c3c5fd5a514bea7a24" -dependencies = [ - "bevy_macro_utils 0.9.1", - "encase_derive_impl 0.4.1", -] - [[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", + "bevy_macro_utils", + "encase_derive_impl", ] [[package]] @@ -668,132 +503,70 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "905e547d213e368f997d08f140f4e893923c7dce4760bf0fb63401232262fa79" dependencies = [ - "bevy_app 0.10.0", - "bevy_ecs 0.10.0", - "bevy_input 0.10.0", - "bevy_utils 0.10.0", + "bevy_app", + "bevy_ecs", + "bevy_input", + "bevy_utils", "gilrs", ] [[package]] name = "bevy_gltf" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e853e346ba412354e02292c7aa5b9a9dccdfa748e273b1b7ebf8f6a172f89712" +checksum = "bb2994d7e47c36bfe36710c4a26d3f36dd8641bfaa2c5d4d0581e001942aab6f" dependencies = [ "anyhow", "base64", - "bevy_app 0.9.1", - "bevy_asset 0.9.1", - "bevy_core 0.9.1", - "bevy_core_pipeline 0.9.1", - "bevy_ecs 0.9.1", - "bevy_hierarchy 0.9.1", - "bevy_log 0.9.1", - "bevy_math 0.9.1", - "bevy_pbr 0.9.1", - "bevy_reflect 0.9.1", - "bevy_render 0.9.1", - "bevy_scene 0.9.1", - "bevy_tasks 0.9.1", - "bevy_transform 0.9.1", - "bevy_utils 0.9.1", + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_core_pipeline", + "bevy_ecs", + "bevy_hierarchy", + "bevy_log", + "bevy_math", + "bevy_pbr", + "bevy_reflect", + "bevy_render", + "bevy_scene", + "bevy_tasks", + "bevy_transform", + "bevy_utils", "gltf", "percent-encoding", "thiserror", ] -[[package]] -name = "bevy_hierarchy" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd6d50c48c6e1bcb5e08a768b765323292bb3bf3a439b992754c57ffb85b23a" -dependencies = [ - "bevy_app 0.9.1", - "bevy_core 0.9.1", - "bevy_ecs 0.9.1", - "bevy_log 0.9.1", - "bevy_reflect 0.9.1", - "bevy_utils 0.9.1", - "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", + "bevy_app", + "bevy_core", + "bevy_ecs", + "bevy_log", + "bevy_reflect", + "bevy_utils", "smallvec", ] -[[package]] -name = "bevy_input" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3378b5171284f4c4c0e8307081718a9fe458f846444616bd82d69110dcabca51" -dependencies = [ - "bevy_app 0.9.1", - "bevy_ecs 0.9.1", - "bevy_math 0.9.1", - "bevy_reflect 0.9.1", - "bevy_utils 0.9.1", - "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", + "bevy_app", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_utils", "thiserror", ] -[[package]] -name = "bevy_internal" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c46014b7e885b1311de06b6039e448454a4db55b8d35464798ba88faa186e11" -dependencies = [ - "bevy_app 0.9.1", - "bevy_asset 0.9.1", - "bevy_core 0.9.1", - "bevy_core_pipeline 0.9.1", - "bevy_derive 0.9.1", - "bevy_diagnostic 0.9.1", - "bevy_ecs 0.9.1", - "bevy_gltf", - "bevy_hierarchy 0.9.1", - "bevy_input 0.9.1", - "bevy_log 0.9.1", - "bevy_math 0.9.1", - "bevy_pbr 0.9.1", - "bevy_ptr 0.9.1", - "bevy_reflect 0.9.1", - "bevy_render 0.9.1", - "bevy_sprite 0.9.1", - "bevy_tasks 0.9.1", - "bevy_text 0.9.1", - "bevy_time 0.9.1", - "bevy_transform 0.9.1", - "bevy_ui 0.9.1", - "bevy_utils 0.9.1", - "bevy_window 0.9.1", - "ndk-glue", -] - [[package]] name = "bevy_internal" version = "0.10.0" @@ -801,49 +574,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a065c7ac81cd7cf3f1b8f15c4a93db5f07274ddaaec145ba7d0393be0c9c413" dependencies = [ "bevy_a11y", - "bevy_app 0.10.0", - "bevy_asset 0.10.0", - "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_app", + "bevy_asset", + "bevy_core", + "bevy_core_pipeline", + "bevy_derive", + "bevy_diagnostic", + "bevy_ecs", "bevy_gilrs", - "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 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_gltf", + "bevy_hierarchy", + "bevy_input", + "bevy_log", + "bevy_math", + "bevy_pbr", + "bevy_ptr", + "bevy_reflect", + "bevy_render", + "bevy_scene", + "bevy_sprite", + "bevy_tasks", + "bevy_text", + "bevy_time", + "bevy_transform", + "bevy_ui", + "bevy_utils", + "bevy_window", "bevy_winit", ] -[[package]] -name = "bevy_log" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c480bac54cf4ae76edc3ae9ae3fa7c5e1b385e7f2111ef5ec3fd00cf3a7998b" -dependencies = [ - "android_log-sys", - "bevy_app 0.9.1", - "bevy_ecs 0.9.1", - "bevy_utils 0.9.1", - "console_error_panic_hook", - "tracing-log", - "tracing-subscriber", - "tracing-wasm", -] - [[package]] name = "bevy_log" version = "0.10.0" @@ -851,26 +610,15 @@ 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", + "bevy_app", + "bevy_ecs", + "bevy_utils", "console_error_panic_hook", "tracing-log", "tracing-subscriber", "tracing-wasm", ] -[[package]] -name = "bevy_macro_utils" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "022bb69196deeea691b6997414af85bbd7f2b34a8914c4aa7a7ff4dfa44f7677" -dependencies = [ - "quote", - "syn", - "toml", -] - [[package]] name = "bevy_macro_utils" version = "0.10.0" @@ -882,16 +630,6 @@ dependencies = [ "toml_edit", ] -[[package]] -name = "bevy_math" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d434c77ab766c806ed9062ef8a7285b3b02b47df51f188d4496199c3ac062eaf" -dependencies = [ - "glam 0.22.0", - "serde", -] - [[package]] name = "bevy_math" version = "0.10.0" @@ -902,15 +640,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bevy_mikktspace" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbfb5908d33fd613069be516180b8f138aaaf6e41c36b1fd98c6c29c00c24a13" -dependencies = [ - "glam 0.22.0", -] - [[package]] name = "bevy_mikktspace" version = "0.10.0" @@ -920,67 +649,28 @@ dependencies = [ "glam 0.23.0", ] -[[package]] -name = "bevy_pbr" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "310b1f260a475d81445623e138e1b7245759a42310bc1f84b550a3f4ff8763bf" -dependencies = [ - "bevy_app 0.9.1", - "bevy_asset 0.9.1", - "bevy_core_pipeline 0.9.1", - "bevy_derive 0.9.1", - "bevy_ecs 0.9.1", - "bevy_math 0.9.1", - "bevy_reflect 0.9.1", - "bevy_render 0.9.1", - "bevy_transform 0.9.1", - "bevy_utils 0.9.1", - "bevy_window 0.9.1", - "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", + "bevy_app", + "bevy_asset", + "bevy_core_pipeline", + "bevy_derive", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", + "bevy_window", "bitflags", "bytemuck", "radsort", ] -[[package]] -name = "bevy_polyline" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea592675cbb5ed69add81ebcf0f5dbaf315fa7f2868dfe20e24a1292b66314e6" -dependencies = [ - "bevy 0.9.1", - "bitflags", - "naga 0.10.0", -] - -[[package]] -name = "bevy_ptr" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ec44f7655039546bc5d34d98de877083473f3e9b2b81d560c528d6d74d3eff4" - [[package]] name = "bevy_ptr" version = "0.10.0" @@ -993,43 +683,23 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4bce8074f19467fd55ab172ae6c11fca3ca28f66804590ab10c930bd5e9cd24" dependencies = [ - "bevy 0.10.0", + "bevy", "bitflags", "log", "nalgebra", "rapier3d", ] -[[package]] -name = "bevy_reflect" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6deae303a7f69dc243b2fa35b5e193cc920229f448942080c8eb2dbd9de6d37a" -dependencies = [ - "bevy_math 0.9.1", - "bevy_ptr 0.9.1", - "bevy_reflect_derive 0.9.1", - "bevy_utils 0.9.1", - "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", + "bevy_math", + "bevy_ptr", + "bevy_reflect_derive", + "bevy_utils", "downcast-rs", "erased-serde", "glam 0.23.0", @@ -1040,27 +710,13 @@ dependencies = [ "thiserror", ] -[[package]] -name = "bevy_reflect_derive" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bf4cb9cd5acb4193f890f36cb63679f1502e2de025e66a63b194b8b133d018" -dependencies = [ - "bevy_macro_utils 0.9.1", - "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", + "bevy_macro_utils", "bit-set", "proc-macro2", "quote", @@ -1068,48 +724,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "bevy_render" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e3282a8f8779d2aced93207fbed73f740937c6c2bd27bd84f0799b081c7fca5" -dependencies = [ - "anyhow", - "bevy_app 0.9.1", - "bevy_asset 0.9.1", - "bevy_core 0.9.1", - "bevy_derive 0.9.1", - "bevy_ecs 0.9.1", - "bevy_encase_derive 0.9.1", - "bevy_hierarchy 0.9.1", - "bevy_log 0.9.1", - "bevy_math 0.9.1", - "bevy_mikktspace 0.9.1", - "bevy_reflect 0.9.1", - "bevy_render_macros 0.9.1", - "bevy_time 0.9.1", - "bevy_transform 0.9.1", - "bevy_utils 0.9.1", - "bevy_window 0.9.1", - "bitflags", - "codespan-reporting", - "downcast-rs", - "encase 0.4.1", - "futures-lite", - "hex", - "hexasphere 8.1.0", - "image", - "naga 0.10.0", - "once_cell", - "parking_lot", - "regex", - "serde", - "smallvec", - "thiserror", - "thread_local", - "wgpu 0.14.2", -] - [[package]] name = "bevy_render" version = "0.10.0" @@ -1118,31 +732,31 @@ 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", + "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_tasks", + "bevy_time", + "bevy_transform", + "bevy_utils", + "bevy_window", "bitflags", "codespan-reporting", "downcast-rs", - "encase 0.5.0", + "encase", "futures-lite", "hexasphere 8.1.0", "image", - "naga 0.11.0", + "naga", "once_cell", "parking_lot", "regex", @@ -1150,20 +764,8 @@ dependencies = [ "smallvec", "thiserror", "thread_local", - "wgpu 0.15.1", - "wgpu-hal 0.15.3", -] - -[[package]] -name = "bevy_render_macros" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7acae697776ac05bea523e1725cf2660c91c53abe72c66782ea1e1b9eedb572" -dependencies = [ - "bevy_macro_utils 0.9.1", - "proc-macro2", - "quote", - "syn", + "wgpu", + "wgpu-hal", ] [[package]] @@ -1172,34 +774,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "570b1d0f38439c5ac8ab75572804c9979b9caa372c49bd00803f60a22a3e1328" dependencies = [ - "bevy_macro_utils 0.10.0", + "bevy_macro_utils", "proc-macro2", "quote", "syn", ] -[[package]] -name = "bevy_scene" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9c66a628c833d53bae54fe94cbc0d3f12c29e9d2e6c3f2356d45ad57db0c8c" -dependencies = [ - "anyhow", - "bevy_app 0.9.1", - "bevy_asset 0.9.1", - "bevy_derive 0.9.1", - "bevy_ecs 0.9.1", - "bevy_hierarchy 0.9.1", - "bevy_reflect 0.9.1", - "bevy_render 0.9.1", - "bevy_transform 0.9.1", - "bevy_utils 0.9.1", - "ron", - "serde", - "thiserror", - "uuid", -] - [[package]] name = "bevy_scene" version = "0.10.0" @@ -1207,63 +787,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3995f756e482e964e0244a5d388e757f272d1dcdc02136730b1c45f4d5eeb516" dependencies = [ "anyhow", - "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", + "bevy_app", + "bevy_asset", + "bevy_derive", + "bevy_ecs", + "bevy_hierarchy", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", "ron", "serde", "thiserror", "uuid", ] -[[package]] -name = "bevy_sprite" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ec01c7db7f698d95bcb70708527c3ae6bcdc78fc247abe74f935cae8f0a1145" -dependencies = [ - "bevy_app 0.9.1", - "bevy_asset 0.9.1", - "bevy_core_pipeline 0.9.1", - "bevy_derive 0.9.1", - "bevy_ecs 0.9.1", - "bevy_log 0.9.1", - "bevy_math 0.9.1", - "bevy_reflect 0.9.1", - "bevy_render 0.9.1", - "bevy_transform 0.9.1", - "bevy_utils 0.9.1", - "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", + "bevy_app", + "bevy_asset", + "bevy_core_pipeline", + "bevy_derive", + "bevy_ecs", + "bevy_log", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", "bitflags", "bytemuck", "fixedbitset", @@ -1272,21 +827,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "bevy_tasks" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "680b16b53df9c9f24681dd95f4d772d83760bd19adf8bca00f358a3aad997853" -dependencies = [ - "async-channel", - "async-executor", - "async-task", - "concurrent-queue 1.2.4", - "futures-lite", - "once_cell", - "wasm-bindgen-futures", -] - [[package]] name = "bevy_tasks" version = "0.10.0" @@ -1296,35 +836,12 @@ dependencies = [ "async-channel", "async-executor", "async-task", - "concurrent-queue 2.1.0", + "concurrent-queue", "futures-lite", "once_cell", "wasm-bindgen-futures", ] -[[package]] -name = "bevy_text" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60c74c1bdaabde7db28f6728aa13bc7b1d744a2201b2bbfd83d2224404c57f5c" -dependencies = [ - "ab_glyph", - "anyhow", - "bevy_app 0.9.1", - "bevy_asset 0.9.1", - "bevy_ecs 0.9.1", - "bevy_math 0.9.1", - "bevy_reflect 0.9.1", - "bevy_render 0.9.1", - "bevy_sprite 0.9.1", - "bevy_transform 0.9.1", - "bevy_utils 0.9.1", - "bevy_window 0.9.1", - "glyph_brush_layout", - "serde", - "thiserror", -] - [[package]] name = "bevy_text" version = "0.10.0" @@ -1333,101 +850,46 @@ 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", + "bevy_app", + "bevy_asset", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_sprite", + "bevy_transform", + "bevy_utils", + "bevy_window", "glyph_brush_layout", "serde", "thiserror", ] -[[package]] -name = "bevy_time" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c38a6d3ea929c7f81e6adf5a6c62cf7e8c40f5106c2174d6057e9d8ea624d" -dependencies = [ - "bevy_app 0.9.1", - "bevy_ecs 0.9.1", - "bevy_reflect 0.9.1", - "bevy_utils 0.9.1", - "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", + "bevy_app", + "bevy_ecs", + "bevy_reflect", + "bevy_utils", "crossbeam-channel", "thiserror", ] -[[package]] -name = "bevy_transform" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba13c57a040b89767191a6f6d720a635b7792793628bfa41a9e38b7026484aec" -dependencies = [ - "bevy_app 0.9.1", - "bevy_ecs 0.9.1", - "bevy_hierarchy 0.9.1", - "bevy_math 0.9.1", - "bevy_reflect 0.9.1", -] - [[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]] -name = "bevy_ui" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60e82ace6156f11fcdf2319102ff8fb8367b82d1e32b7d05d387a1963602f965" -dependencies = [ - "bevy_app 0.9.1", - "bevy_asset 0.9.1", - "bevy_core_pipeline 0.9.1", - "bevy_derive 0.9.1", - "bevy_ecs 0.9.1", - "bevy_hierarchy 0.9.1", - "bevy_input 0.9.1", - "bevy_log 0.9.1", - "bevy_math 0.9.1", - "bevy_reflect 0.9.1", - "bevy_render 0.9.1", - "bevy_sprite 0.9.1", - "bevy_text 0.9.1", - "bevy_transform 0.9.1", - "bevy_utils 0.9.1", - "bevy_window 0.9.1", - "bytemuck", - "serde", - "smallvec", - "taffy 0.1.0", - "thiserror", + "bevy_app", + "bevy_ecs", + "bevy_hierarchy", + "bevy_math", + "bevy_reflect", ] [[package]] @@ -1437,43 +899,29 @@ 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", + "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", "bytemuck", "serde", "smallvec", - "taffy 0.3.6", + "taffy", "thiserror", ] -[[package]] -name = "bevy_utils" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16750aae52cd35bd7b60eb61cee883420b250e11b4a290b8d44b2b2941795739" -dependencies = [ - "ahash 0.7.6", - "getrandom", - "hashbrown", - "instant", - "tracing", - "uuid", -] - [[package]] name = "bevy_utils" version = "0.10.0" @@ -1502,33 +950,18 @@ dependencies = [ "syn", ] -[[package]] -name = "bevy_window" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a44d3f3bd54a2261f4f57f614bf7bccc8d2832761493c0cd7dab81d98cc151e" -dependencies = [ - "bevy_app 0.9.1", - "bevy_ecs 0.9.1", - "bevy_input 0.9.1", - "bevy_math 0.9.1", - "bevy_reflect 0.9.1", - "bevy_utils 0.9.1", - "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", + "bevy_app", + "bevy_ecs", + "bevy_input", + "bevy_math", + "bevy_reflect", + "bevy_utils", "raw-window-handle", ] @@ -1541,14 +974,14 @@ dependencies = [ "accesskit_winit", "approx", "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", + "bevy_app", + "bevy_derive", + "bevy_ecs", + "bevy_hierarchy", + "bevy_input", + "bevy_math", + "bevy_utils", + "bevy_window", "crossbeam-channel", "once_cell", "raw-window-handle", @@ -1641,12 +1074,6 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" -[[package]] -name = "cache-padded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" - [[package]] name = "cc" version = "1.0.79" @@ -1717,15 +1144,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "concurrent-queue" -version = "1.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" -dependencies = [ - "cache-padded", -] - [[package]] name = "concurrent-queue" version = "2.1.0" @@ -1872,25 +1290,13 @@ dependencies = [ name = "cyber_rider" version = "0.1.0" dependencies = [ - "bevy 0.10.0", + "bevy", "bevy-inspector-egui", - "bevy_polyline", "bevy_rapier3d", "hexasphere 7.2.1", "noise", "rand", - "wgpu 0.15.1", -] - -[[package]] -name = "d3d12" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "827914e1f53b1e0e025ecd3d967a7836b7bcb54520f90e21ef8df7b4d88a2759" -dependencies = [ - "bitflags", - "libloading", - "winapi", + "wgpu", ] [[package]] @@ -1904,41 +1310,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "darling" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -dependencies = [ - "darling_core", - "quote", - "syn", -] - [[package]] name = "dirs" version = "4.0.0" @@ -2006,18 +1377,6 @@ dependencies = [ "bytemuck", ] -[[package]] -name = "encase" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ec50086547d597b5c871a78399ec04a14828a6a5c445a61ed4687c540edec6" -dependencies = [ - "const_panic", - "encase_derive 0.4.1", - "glam 0.22.0", - "thiserror", -] - [[package]] name = "encase" version = "0.5.0" @@ -2025,38 +1384,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6591f13a63571c4821802eb5b10fd1155b1290bce87086440003841c8c3909b" dependencies = [ "const_panic", - "encase_derive 0.5.0", + "encase_derive", "glam 0.23.0", "thiserror", ] -[[package]] -name = "encase_derive" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda93e9714c7683c474f49a461a2ae329471d2bda43c4302d41c6d8339579e92" -dependencies = [ - "encase_derive_impl 0.4.1", -] - [[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]] -name = "encase_derive_impl" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec27b639e942eb0297513b81cc6d87c50f6c77dc8c37af00a39ed5db3b9657ee" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "encase_derive_impl", ] [[package]] @@ -2070,16 +1409,6 @@ dependencies = [ "syn", ] -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "log", - "regex", -] - [[package]] name = "epaint" version = "0.21.0" @@ -2289,16 +1618,6 @@ version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "518faa5064866338b013ff9b2350dc318e14cc4fcd6cb8206d7e7c9886c98815" -[[package]] -name = "glam" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f597d56c1bd55a811a1be189459e8fad2bbc272616375602443bdfb37fa774" -dependencies = [ - "bytemuck", - "serde", -] - [[package]] name = "glam" version = "0.23.0" @@ -2309,18 +1628,6 @@ dependencies = [ "serde", ] -[[package]] -name = "glow" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8bd5877156a19b8ac83a29b2306fe20537429d318f3ff0a1a2119f8d9c61919" -dependencies = [ - "js-sys", - "slotmap", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "glow" version = "0.12.1" @@ -2442,26 +1749,6 @@ dependencies = [ "svg_fmt", ] -[[package]] -name = "hash32" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" -dependencies = [ - "byteorder", -] - -[[package]] -name = "hash32-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59d2aba832b60be25c1b169146b27c64115470981b128ed84c8db18c1b03c6ff" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "hashbrown" version = "0.12.3" @@ -2487,12 +1774,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - [[package]] name = "hexasphere" version = "7.2.1" @@ -2519,12 +1800,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - [[package]] name = "idna" version = "0.3.0" @@ -2802,28 +2077,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "naga" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "262d2840e72dbe250e8cf2f522d080988dfca624c4112c096238a4845f591707" -dependencies = [ - "bit-set", - "bitflags", - "codespan-reporting", - "hexf-parse", - "indexmap", - "log", - "num-traits", - "petgraph", - "pp-rs", - "rustc-hash", - "spirv", - "termcolor", - "thiserror", - "unicode-xid", -] - [[package]] name = "naga" version = "0.11.0" @@ -2894,36 +2147,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" -[[package]] -name = "ndk-glue" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0434fabdd2c15e0aab768ca31d5b7b333717f03cf02037d5a0a3ff3c278ed67f" -dependencies = [ - "android_logger", - "libc", - "log", - "ndk", - "ndk-context", - "ndk-macro", - "ndk-sys", - "once_cell", - "parking_lot", -] - -[[package]] -name = "ndk-macro" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" -dependencies = [ - "darling", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "ndk-sys" version = "0.4.1+23.1.7779620" @@ -3657,12 +2880,6 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "svg_fmt" version = "0.4.1" @@ -3694,19 +2911,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "taffy" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec27dea659b100d489dffa57cf0efc6d7bfefb119af817b92cc14006c0b214e3" -dependencies = [ - "arrayvec", - "hash32", - "hash32-derive", - "num-traits", - "typenum", -] - [[package]] name = "taffy" version = "0.3.6" @@ -3783,15 +2987,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - [[package]] name = "toml_datetime" version = "0.6.1" @@ -4105,28 +3300,6 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" -[[package]] -name = "wgpu" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81f643110d228fd62a60c5ed2ab56c4d5b3704520bd50561174ec4ec74932937" -dependencies = [ - "arrayvec", - "js-sys", - "log", - "naga 0.10.0", - "parking_lot", - "raw-window-handle", - "smallvec", - "static_assertions", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "wgpu-core 0.14.2", - "wgpu-hal 0.14.1", - "wgpu-types 0.14.1", -] - [[package]] name = "wgpu" version = "0.15.1" @@ -4137,7 +3310,7 @@ dependencies = [ "cfg-if", "js-sys", "log", - "naga 0.11.0", + "naga", "parking_lot", "profiling", "raw-window-handle", @@ -4146,33 +3319,9 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu-core 0.15.1", - "wgpu-hal 0.15.3", - "wgpu-types 0.15.2", -] - -[[package]] -name = "wgpu-core" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6000d1284ef8eec6076fd5544a73125fd7eb9b635f18dceeb829d826f41724ca" -dependencies = [ - "arrayvec", - "bit-vec", - "bitflags", - "cfg_aliases", - "codespan-reporting", - "fxhash", - "log", - "naga 0.10.0", - "parking_lot", - "profiling", - "raw-window-handle", - "smallvec", - "thiserror", - "web-sys", - "wgpu-hal 0.14.1", - "wgpu-types 0.14.1", + "wgpu-core", + "wgpu-hal", + "wgpu-types", ] [[package]] @@ -4187,54 +3336,15 @@ dependencies = [ "codespan-reporting", "fxhash", "log", - "naga 0.11.0", + "naga", "parking_lot", "profiling", "raw-window-handle", "smallvec", "thiserror", "web-sys", - "wgpu-hal 0.15.3", - "wgpu-types 0.15.2", -] - -[[package]] -name = "wgpu-hal" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc320a61acb26be4f549c9b1b53405c10a223fbfea363ec39474c32c348d12f" -dependencies = [ - "android_system_properties", - "arrayvec", - "ash", - "bit-set", - "bitflags", - "block", - "core-graphics-types", - "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", + "wgpu-hal", + "wgpu-types", ] [[package]] @@ -4250,10 +3360,10 @@ dependencies = [ "bitflags", "block", "core-graphics-types", - "d3d12 0.6.0", + "d3d12", "foreign-types", "fxhash", - "glow 0.12.1", + "glow", "gpu-alloc", "gpu-allocator", "gpu-descriptor", @@ -4264,7 +3374,7 @@ dependencies = [ "libloading", "log", "metal", - "naga 0.11.0", + "naga", "objc", "parking_lot", "profiling", @@ -4275,19 +3385,10 @@ dependencies = [ "thiserror", "wasm-bindgen", "web-sys", - "wgpu-types 0.15.2", + "wgpu-types", "winapi", ] -[[package]] -name = "wgpu-types" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb6b28ef22cac17b9109b25b3bf8c9a103eeb293d7c5f78653979b09140375f6" -dependencies = [ - "bitflags", -] - [[package]] name = "wgpu-types" version = "0.15.2" diff --git a/Cargo.toml b/Cargo.toml index 74a31ca..60fd637 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,12 +5,11 @@ edition = "2021" [dependencies] rand = "0.8" -bevy_polyline = "0.4" +# bevy_polyline = "0.4" noise = { git = "https://github.com/Razaekel/noise-rs" } hexasphere = "7" wgpu = "0.15" bevy-inspector-egui = "0.18" -# wgpu = "0.12" [features] inspector = [] @@ -25,7 +24,9 @@ features = [ "hdr", "x11", "bevy_ui", - "bevy_text" + "bevy_text", + "bevy_gltf", + "bevy_sprite" ] [dependencies.bevy_rapier3d] diff --git a/src/action/mod.rs b/src/action/mod.rs index 02cb159..8937120 100644 --- a/src/action/mod.rs +++ b/src/action/mod.rs @@ -1,7 +1,7 @@ use bevy::{ diagnostic::FrameTimeDiagnosticsPlugin, ecs::reflect::ReflectResource, - prelude::{App, Plugin, Resource}, + prelude::{App, IntoSystemConfigs, Plugin, Resource}, reflect::Reflect, }; use bevy_rapier3d::prelude::{NoUserData, RapierPhysicsPlugin}; @@ -42,6 +42,6 @@ impl Plugin for CyberActionPlugin { surface_fix, ) .chain(), - ) + ); } } diff --git a/src/bike/mod.rs b/src/bike/mod.rs index eec5292..68f6121 100644 --- a/src/bike/mod.rs +++ b/src/bike/mod.rs @@ -2,7 +2,9 @@ mod body; mod components; mod wheels; -use bevy::prelude::{App, Assets, Mesh, Plugin, ResMut, StandardMaterial, StartupSet}; +use bevy::prelude::{ + App, Assets, IntoSystemConfig, Mesh, Plugin, ResMut, StandardMaterial, StartupSet, +}; use bevy_rapier3d::prelude::Group; pub(crate) use self::components::*; @@ -21,6 +23,6 @@ impl Plugin for CyberBikePlugin { fn build(&self, app: &mut App) { app.insert_resource(WheelConfig::default()) .register_type::() - .add_startup_system(StartupSet::PostStartup, spawn_cyberbike); + .add_startup_system(spawn_cyberbike.in_base_set(StartupSet::PostStartup)); } } diff --git a/src/camera.rs b/src/camera.rs index 4c7473b..7ac4da6 100644 --- a/src/camera.rs +++ b/src/camera.rs @@ -5,18 +5,13 @@ use crate::{bike::CyberBikeBody, input::InputState}; // 85 degrees in radians const MAX_PITCH: f32 = 1.48353; -#[derive(Clone, Copy, Eq, PartialEq, Debug, Hash, Component, States)] +#[derive(Clone, Copy, Eq, PartialEq, Debug, Hash, Component, States, Default)] enum CyberCameras { + #[default] Hero, Debug, } -impl Default for CyberCameras { - fn default() -> Self { - Self::Hero - } -} - #[derive(Debug, Resource)] pub struct DebugCamOffset { pub rot: f32, @@ -105,7 +100,7 @@ fn update_active_camera( ) { // find the camera with the current state, set it as the ActiveCamera query.iter_mut().for_each(|(mut cam, cyber)| { - if cyber.eq(state.current()) { + if cyber.eq(&state.0) { cam.is_active = true; } else { cam.is_active = false; @@ -113,11 +108,15 @@ fn update_active_camera( }); } -fn cycle_cam_state(mut state: ResMut>, mut keys: ResMut>) { +fn cycle_cam_state( + state: Res>, + mut next: ResMut>, + mut keys: ResMut>, +) { if keys.just_pressed(KeyCode::D) { - let new_state = state.current().next(); + let new_state = state.0.next(); info!("{:?}", new_state); - state.set(new_state).unwrap(); + next.set(new_state); keys.reset(KeyCode::D); } } @@ -133,7 +132,7 @@ impl Plugin for CyberCamPlugin { fn common(app: &mut bevy::prelude::App) { app.insert_resource(DebugCamOffset::default()) .add_startup_system(setup_cybercams) - .add_state(CyberCameras::Hero) + .add_state::() .add_system(cycle_cam_state) .add_system(update_active_camera) .add_system(follow_cyberbike); diff --git a/src/glamor.rs b/src/glamor.rs index 8800163..48acb25 100644 --- a/src/glamor.rs +++ b/src/glamor.rs @@ -2,60 +2,60 @@ use bevy::{ prelude::*, render::mesh::{Indices, VertexAttributeValues}, }; -use bevy_polyline::prelude::{Polyline, PolylineBundle, PolylineMaterial, PolylinePlugin}; +// use bevy_polyline::prelude::{Polyline, PolylineBundle, PolylineMaterial, PolylinePlugin}; use rand::{thread_rng, Rng}; use crate::{lights::AnimateCyberLightWireframe, planet::CyberPlanet}; pub const BISEXY_COLOR: Color = Color::hsla(292.0, 0.9, 0.60, 1.1); -fn wireframe_planet( - mut commands: Commands, - mut meshes: ResMut>, - mut polylines: ResMut>, - mut polymats: ResMut>, - query: Query<&Handle, With>, -) { - let handle = query.single(); - let mesh = meshes.get_mut(handle).unwrap(); - let vertices = mesh.attribute(Mesh::ATTRIBUTE_POSITION).unwrap(); +// fn wireframe_planet( +// mut commands: Commands, +// mut meshes: ResMut>, +// mut polylines: ResMut>, +// mut polymats: ResMut>, +// query: Query<&Handle, With>, +// ) { +// let handle = query.single(); +// let mesh = meshes.get_mut(handle).unwrap(); +// let vertices = mesh.attribute(Mesh::ATTRIBUTE_POSITION).unwrap(); - let mut pts = Vec::with_capacity(vertices.len()); +// let mut pts = Vec::with_capacity(vertices.len()); - if let VertexAttributeValues::Float32x3(verts) = vertices { - let indices = mesh.indices().unwrap(); - if let Indices::U32(indices) = indices { - for i in indices.iter() { - let v = verts[*i as usize]; - let v = Vec3::from_slice(&v); - pts.push(v); - } - } - } +// if let VertexAttributeValues::Float32x3(verts) = vertices { +// let indices = mesh.indices().unwrap(); +// if let Indices::U32(indices) = indices { +// for i in indices.iter() { +// let v = verts[*i as usize]; +// let v = Vec3::from_slice(&v); +// pts.push(v); +// } +// } +// } - let mut verts = Vec::with_capacity((pts.len() as f32 * 1.4) as usize); - for pts in pts.chunks(3) { - if pts.len() > 1 { - verts.extend_from_slice(pts); - verts.push(Vec3::NAN); - } - } +// let mut verts = Vec::with_capacity((pts.len() as f32 * 1.4) as usize); +// for pts in pts.chunks(3) { +// if pts.len() > 1 { +// verts.extend_from_slice(pts); +// verts.push(Vec3::NAN); +// } +// } - // don't need the indices anymore - mesh.duplicate_vertices(); - mesh.compute_flat_normals(); +// // don't need the indices anymore +// mesh.duplicate_vertices(); +// mesh.compute_flat_normals(); - commands.spawn(PolylineBundle { - polyline: polylines.add(Polyline { vertices: verts }), - material: polymats.add(PolylineMaterial { - width: 101.0, - color: BISEXY_COLOR, - perspective: true, - depth_bias: -0.001, - }), - ..Default::default() - }); -} +// commands.spawn(PolylineBundle { +// polyline: polylines.add(Polyline { vertices: verts }), +// material: polymats.add(PolylineMaterial { +// width: 101.0, +// color: BISEXY_COLOR, +// perspective: true, +// depth_bias: -0.001, +// }), +// ..Default::default() +// }); +// } fn wireframify_lights(mut lights: Query<&mut AnimateCyberLightWireframe>) { let chance = 0.005; @@ -98,8 +98,6 @@ impl Plugin for CyberGlamorPlugin { app.add_plugin(rplugin); } - app.add_startup_system(StartupSet::PostStartup, wireframe_planet) - .add_system(wireframify_lights) - .add_plugin(PolylinePlugin); + app.add_system(wireframify_lights); } } diff --git a/src/input.rs b/src/input.rs index 7407fa3..6d92d1a 100644 --- a/src/input.rs +++ b/src/input.rs @@ -1,4 +1,8 @@ -use bevy::{input::gamepad::GamepadEvent, prelude::*, utils::HashSet}; +use bevy::{ + input::gamepad::{GamepadAxisChangedEvent, GamepadButtonChangedEvent, GamepadEvent}, + prelude::*, + utils::HashSet, +}; use crate::camera::DebugCamOffset; @@ -48,29 +52,32 @@ fn update_debug_cam(mut offset: ResMut, mut keys: ResMut, mut istate: ResMut) { for pad_event in events.iter() { match pad_event { - GamepadEvent::Button(GamepadButtonType::RightTrigger2, val) => { - istate.throttle = val; - } - GamepadEvent::Button(GamepadButtonType::LeftTrigger2, val) => { - istate.throttle = -val; - } - GamepadEvent::Button(GamepadButtonType::East, val) => { - if val > 0.5 { - istate.brake = true; - } else { - istate.brake = false; + GamepadEvent::Button(button_event) => { + let GamepadButtonChangedEvent { + button_type, value, .. + } = button_event; + match button_type { + GamepadButtonType::RightTrigger => istate.throttle = *value, + GamepadButtonType::LeftTrigger => istate.throttle = -value, + GamepadButtonType::East => { + if value > &0.5 { + istate.brake = true; + } else { + istate.brake = false; + } + } + _ => info!("unhandled button press: {button_event:?}"), } } - GamepadEvent::Axis(GamepadAxisType::LeftStickX, val) => { - istate.yaw = val; - } - // ignore spurious vertical movement for now - GamepadEvent::Axis(GamepadAxisType::LeftStickY, val) => { - istate.pitch = val; - } - _ => { - info!("unhandled gamepad event: {:?}", pad_event); + GamepadEvent::Axis(axis_event) => { + let GamepadAxisChangedEvent { + axis_type, value, .. + } = axis_event; + match axis_type { + _ => info!("unhandled axis event: {axis_event:?}"), + } } + GamepadEvent::Connection(_) => {} } } } diff --git a/src/lib.rs b/src/lib.rs index 0612a02..dd94e9f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,6 +1,7 @@ use bevy::{ ecs::schedule::SystemSet, - prelude::{Query, Vec3, Window}, + prelude::{Query, Vec3, Window, With}, + window::PrimaryWindow, }; pub mod action; @@ -20,10 +21,10 @@ pub enum Label { Action, } -pub fn disable_mouse_trap(mut windows: Query<&Window>) { - let window = windows.get_primary_mut().unwrap(); - window.set_cursor_grab_mode(bevy::window::CursorGrabMode::None); - window.set_cursor_visibility(true); +pub fn disable_mouse_trap(mut window: Query<&mut Window, With>) { + let mut window = window.get_single_mut().unwrap(); + window.cursor.grab_mode = bevy::window::CursorGrabMode::None; + window.cursor.visible = true; } pub fn random_unit_vec(r: &mut impl rand::prelude::Rng) -> Vec3 { diff --git a/src/lights.rs b/src/lights.rs index 194a8fa..fe29d44 100644 --- a/src/lights.rs +++ b/src/lights.rs @@ -74,10 +74,13 @@ fn spawn_moving_lights( builder // now a simple mesh to show a wireframe. .spawn(PbrBundle { - mesh: meshes.add(Mesh::from(shape::Icosphere { - radius, - subdivisions: 1, - })), + mesh: meshes.add( + Mesh::try_from(shape::Icosphere { + radius, + subdivisions: 1, + }) + .unwrap(), + ), material: materials.add(StandardMaterial { base_color: Color::hsla(272.0, 0.7, 0.56, 0.7), emissive: color, @@ -128,10 +131,13 @@ fn spawn_static_lights( }) .with_children(|builder| { builder.spawn(PbrBundle { - mesh: meshes.add(Mesh::from(shape::Icosphere { - radius: 10.0, - subdivisions: 2, - })), + mesh: meshes.add( + Mesh::try_from(shape::Icosphere { + radius: 10.0, + subdivisions: 2, + }) + .unwrap(), + ), material: materials.add(StandardMaterial { base_color: Color::BLUE, emissive: Color::PINK, @@ -149,10 +155,13 @@ fn spawn_static_lights( }) .with_children(|builder| { builder.spawn(PbrBundle { - mesh: meshes.add(Mesh::from(shape::Icosphere { - radius: 10.0, - subdivisions: 2, - })), + mesh: meshes.add( + Mesh::try_from(shape::Icosphere { + radius: 10.0, + subdivisions: 2, + }) + .unwrap(), + ), material: materials.add(StandardMaterial { base_color: Color::PINK, emissive: Color::BLUE, diff --git a/src/main.rs b/src/main.rs index 3bb5906..fc1be03 100644 --- a/src/main.rs +++ b/src/main.rs @@ -10,14 +10,13 @@ const CYBER_SKY: Color = Color::rgb(0.07, 0.001, 0.02); fn main() { let mut app = App::new(); - app.insert_resource(Msaa { samples: 4 }) + app.insert_resource(Msaa::Sample4) .insert_resource(ClearColor(CYBER_SKY)) .add_plugins(DefaultPlugins.set(WindowPlugin { - window: WindowDescriptor { - width: 2560.0, - height: 1440.0, + primary_window: Some(Window { + resolution: (2560.0, 1440.0).into(), ..Default::default() - }, + }), ..Default::default() })) .add_plugin(CyberPlanetPlugin) diff --git a/src/planet.rs b/src/planet.rs index 0ea5cbf..34cc535 100644 --- a/src/planet.rs +++ b/src/planet.rs @@ -59,7 +59,7 @@ fn spawn_planet( pub struct CyberPlanetPlugin; impl Plugin for CyberPlanetPlugin { fn build(&self, app: &mut App) { - app.add_startup_system(spawn_planet.label(Label::Geometry)); + app.add_startup_system(spawn_planet); } }