diff --git a/.cargo/config.toml b/.cargo/config.toml index 6a6f0812..82d0b716 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,36 +1,32 @@ # NOTE: For maximum performance, build using a nightly compiler # If you are using rust stable, remove the `"-Z", "share-generics=y"` below. -# Uncomment the following lines for better link time performance. Requires lld on Windows, zld on macOS and clang on Linux. +# You can uncomment some lines for better link time performance. Requires lld on Windows, zld on macOS and clang on Linux. -# [target.x86_64-unknown-linux-gnu] -# Uncomment for better performance. Requires clang. -# linker = "clang" - -# Uncomment instead of default rustflags for better performance. Requires lld. +# Use first version for faster compile times. Requires lld. # rustflags = ["-C", "link-arg=-fuse-ld=lld", "-Z", "share-generics=y"] rustflags = ["-Z", "share-generics=y"] +# [target.x86_64-unknown-linux-gnu] +# Uncomment for faster compile times. Requires clang. +# linker = "clang" + [target.x86_64-apple-darwin] -# Uncomment instead of default rustflags for better performance. Requires zld via `brew install michaeleisel/zld/zld` -# rustflags = ["-C", "link-arg=-fuse-ld=/usr/local/bin/zld", "-Z", "share-generics=y"] -rustflags = ["-Z", "share-generics=y"] +# Uncomment for faster compile times. Requires zld via `brew install michaeleisel/zld/zld` +# rustflags = ["-C", "link-arg=-fuse-ld=/usr/local/bin/zld"] [target.aarch64-apple-darwin] -# Uncomment instead of default rustflags for better performance. Requires zld via `brew install michaeleisel/zld/zld` -# rustflags = ["-C", "link-arg=-fuse-ld=/opt/homebrew/bin/zld", "-Z", "share-generics=y"] -rustflags = ["-Z", "share-generics=y"] +# Uncomment for faster compile times. Requires zld via `brew install michaeleisel/zld/zld` +# rustflags = ["-C", "link-arg=-fuse-ld=/opt/homebrew/bin/zld"] [target.x86_64-pc-windows-msvc] -# Uncommentfor better performance. Requires lld via `cargo install -f cargo-binutils` and `rustup component add llvm-tools-preview` +# Uncomment for faster compile times. Requires lld via `cargo install -f cargo-binutils` and `rustup component add llvm-tools-preview` # linker = "rust-lld.exe" rustflags = ["-Z", "share-generics=n"] -# Enable no optimization in debug mode. You should probably bump this up for Wasm builds. [profile.dev] -opt-level = 0 # Optional: Uncommenting the following improves compile times, but reduces the amount of debug info to 'line number tables only' -# In most cases the gains are negligible, but if you are on macos and have slow compile times you should see significant gains. +# In most cases the gains are negligible, but if you are on macOS and have slow compile times you should see significant gains. # debug = 1 # Enable some optimizations for dependencies (incl. Bevy), but not for our code. diff --git a/Cargo.lock b/Cargo.lock index fc10ef81..d4ff92f0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -18,46 +18,19 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" -[[package]] -name = "accesskit" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eb1adf08c5bcaa8490b9851fd53cca27fa9880076f178ea9d29f05196728a8" - [[package]] name = "accesskit" version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6cb10ed32c63247e4e39a8f42e8e30fb9442fbf7878c8e4a9849e7e381619bea" -[[package]] -name = "accesskit_consumer" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04bb4d9e4772fe0d47df57d0d5dbe5d85dd05e2f37ae1ddb6b105e76be58fb00" -dependencies = [ - "accesskit 0.11.2", -] - [[package]] name = "accesskit_consumer" version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c17cca53c09fbd7288667b22a201274b9becaa27f0b91bf52a526db95de45e6" dependencies = [ - "accesskit 0.12.2", -] - -[[package]] -name = "accesskit_macos" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134d0acf6acb667c89d3332999b1a5df4edbc8d6113910f392ebb73f2b03bb56" -dependencies = [ - "accesskit 0.11.2", - "accesskit_consumer 0.15.2", - "objc2", - "once_cell", + "accesskit", ] [[package]] @@ -66,61 +39,35 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd3b6ae1eabbfbced10e840fd3fce8a93ae84f174b3e4ba892ab7bcb42e477a7" dependencies = [ - "accesskit 0.12.2", - "accesskit_consumer 0.16.1", + "accesskit", + "accesskit_consumer", "objc2", "once_cell", ] -[[package]] -name = "accesskit_windows" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eac0a7f2d7cd7a93b938af401d3d8e8b7094217989a7c25c55a953023436e31" -dependencies = [ - "accesskit 0.11.2", - "accesskit_consumer 0.15.2", - "arrayvec", - "once_cell", - "paste", - "windows 0.48.0", -] - [[package]] name = "accesskit_windows" version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afcae27ec0974fc7c3b0b318783be89fd1b2e66dd702179fe600166a38ff4a0b" dependencies = [ - "accesskit 0.12.2", - "accesskit_consumer 0.16.1", + "accesskit", + "accesskit_consumer", "once_cell", "paste", "static_assertions", "windows 0.48.0", ] -[[package]] -name = "accesskit_winit" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "825d23acee1bd6d25cbaa3ca6ed6e73faf24122a774ec33d52c5c86c6ab423c0" -dependencies = [ - "accesskit 0.11.2", - "accesskit_macos 0.9.0", - "accesskit_windows 0.14.3", - "winit", -] - [[package]] name = "accesskit_winit" version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88e39fcec2e10971e188730b7a76bab60647dacc973d4591855ebebcadfaa738" dependencies = [ - "accesskit 0.12.2", - "accesskit_macos 0.10.1", - "accesskit_windows 0.15.1", + "accesskit", + "accesskit_macos", + "accesskit_windows", "winit", ] @@ -234,6 +181,39 @@ dependencies = [ "libc", ] +[[package]] +name = "annotate-snippets" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a433302f833baa830c0092100c481c7ea768c5981a3c36f549517a502f246dd" +dependencies = [ + "anstyle", + "unicode-width", +] + +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "antlr-rust" +version = "0.3.0-beta" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfc6ab5594c6b2b7aa8719f4ecb785a268b2e0c2529042046035d5cebe9fa7d7" +dependencies = [ + "better_any", + "bit-set", + "byteorder", + "lazy_static", + "murmur3", + "once_cell", + "parking_lot 0.11.2", + "typed-arena", + "uuid 0.8.2", +] + [[package]] name = "anyhow" version = "1.0.79" @@ -262,7 +242,7 @@ dependencies = [ "objc", "objc-foundation", "objc_id", - "parking_lot", + "parking_lot 0.12.1", "thiserror", "winapi", "x11rb", @@ -421,13 +401,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] -name = "bevy" -version = "0.11.3" +name = "better_any" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91c6d3ec4f89e85294dc97334c5b271ddc301fdf67ac9bb994fe44d9273e6ed7" -dependencies = [ - "bevy_internal 0.11.3", -] +checksum = "1795ebc740ea791ffbe6685e0688ab1effec16c2864e0476db40bfdf0c02cb3d" [[package]] name = "bevy" @@ -435,8 +412,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4bc7e09282a82a48d70ade0c4c1154b0fd7882a735a39c66766a5d0f4718ea9" dependencies = [ - "bevy_dylib", - "bevy_internal 0.12.1", + "bevy_internal", ] [[package]] @@ -446,21 +422,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c3efee9165f9be9c6a180c6a9bbb4bd39ee0a98a594f4cb7127704e15415cdd" dependencies = [ "bevy-inspector-egui-derive", - "bevy_app 0.12.1", - "bevy_asset 0.12.1", - "bevy_core 0.12.1", - "bevy_core_pipeline 0.12.1", - "bevy_ecs 0.12.1", + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_core_pipeline", + "bevy_ecs", "bevy_egui", - "bevy_hierarchy 0.12.1", - "bevy_log 0.12.1", - "bevy_math 0.12.1", - "bevy_pbr 0.12.1", - "bevy_reflect 0.12.1", - "bevy_render 0.12.1", - "bevy_time 0.12.1", - "bevy_utils 0.12.1", - "bevy_window 0.12.1", + "bevy_hierarchy", + "bevy_log", + "bevy_math", + "bevy_pbr", + "bevy_reflect", + "bevy_render", + "bevy_time", + "bevy_utils", + "bevy_window", "egui", "image", "once_cell", @@ -479,28 +455,16 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "bevy_a11y" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "132c9e35a77c5395951f6d25fa2c52ee92296353426df4f961e60f3ff47e2e42" -dependencies = [ - "accesskit 0.11.2", - "bevy_app 0.11.3", - "bevy_derive 0.11.3", - "bevy_ecs 0.11.3", -] - [[package]] name = "bevy_a11y" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68080288c932634f6563d3a8299efe0ddc9ea6787539c4c771ba250d089a94f0" dependencies = [ - "accesskit 0.12.2", - "bevy_app 0.12.1", - "bevy_derive 0.12.1", - "bevy_ecs 0.12.1", + "accesskit", + "bevy_app", + "bevy_derive", + "bevy_ecs", ] [[package]] @@ -509,33 +473,17 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7aa37683b1281e1ba8cf285644e6e3f0704f14b3901c5ee282067ff7ff6f4a56" dependencies = [ - "bevy_app 0.12.1", - "bevy_asset 0.12.1", - "bevy_core 0.12.1", - "bevy_ecs 0.12.1", - "bevy_hierarchy 0.12.1", - "bevy_math 0.12.1", - "bevy_reflect 0.12.1", - "bevy_render 0.12.1", - "bevy_time 0.12.1", - "bevy_transform 0.12.1", - "bevy_utils 0.12.1", -] - -[[package]] -name = "bevy_app" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f557a7d59e1e16892d7544fc37316506ee598cb5310ef0365125a30783c11531" -dependencies = [ - "bevy_derive 0.11.3", - "bevy_ecs 0.11.3", - "bevy_reflect 0.11.3", - "bevy_tasks 0.11.3", - "bevy_utils 0.11.3", - "downcast-rs", - "wasm-bindgen", - "web-sys", + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_ecs", + "bevy_hierarchy", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_time", + "bevy_transform", + "bevy_utils", ] [[package]] @@ -544,41 +492,13 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d41731817993f92e4363dd3335558e779e290bc71eefc0b5547052b85810907e" dependencies = [ - "bevy_derive 0.12.1", - "bevy_ecs 0.12.1", - "bevy_reflect 0.12.1", - "bevy_tasks 0.12.1", - "bevy_utils 0.12.1", - "downcast-rs", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "bevy_asset" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9714af523da4cdf58c42a317e5ed40349708ad954a18533991fd64c8ae0a6f68" -dependencies = [ - "anyhow", - "async-channel 1.9.0", - "bevy_app 0.11.3", - "bevy_diagnostic 0.11.3", - "bevy_ecs 0.11.3", - "bevy_log 0.11.3", - "bevy_reflect 0.11.3", - "bevy_tasks 0.11.3", - "bevy_utils 0.11.3", - "bevy_winit 0.11.3", - "crossbeam-channel", + "bevy_derive", + "bevy_ecs", + "bevy_reflect", + "bevy_tasks", + "bevy_utils", "downcast-rs", - "fastrand 1.9.0", - "js-sys", - "parking_lot", - "serde", - "thiserror", "wasm-bindgen", - "wasm-bindgen-futures", "web-sys", ] @@ -591,14 +511,14 @@ dependencies = [ "async-broadcast", "async-fs", "async-lock 2.8.0", - "bevy_app 0.12.1", + "bevy_app", "bevy_asset_macros", - "bevy_ecs 0.12.1", - "bevy_log 0.12.1", - "bevy_reflect 0.12.1", - "bevy_tasks 0.12.1", - "bevy_utils 0.12.1", - "bevy_winit 0.12.1", + "bevy_ecs", + "bevy_log", + "bevy_reflect", + "bevy_tasks", + "bevy_utils", + "bevy_winit", "blake3", "crossbeam-channel", "downcast-rs", @@ -606,7 +526,7 @@ dependencies = [ "futures-lite 1.13.0", "js-sys", "notify-debouncer-full", - "parking_lot", + "parking_lot 0.12.1", "ron", "serde", "thiserror", @@ -622,7 +542,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16930d3c6b4eee079843ce2bc6c5d845f0258c731417c46b86137b0532b7a297" dependencies = [ "anyhow", - "bevy 0.12.1", + "bevy", "bevy_asset_loader_derive", "iyes_progress", "path-slash", @@ -645,7 +565,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f48b9bbe4ec605e4910b5cd1e1a0acbfbe0b80af5f3bcc4489a9fdd1e80058c" dependencies = [ - "bevy_macro_utils 0.12.1", + "bevy_macro_utils", "proc-macro2", "quote", "syn 2.0.48", @@ -657,14 +577,14 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18a69889e1bfa4dbac4e641536b94f91c441da55796ad9832e77836b8264688b" dependencies = [ - "bevy_app 0.12.1", - "bevy_asset 0.12.1", - "bevy_derive 0.12.1", - "bevy_ecs 0.12.1", - "bevy_math 0.12.1", - "bevy_reflect 0.12.1", - "bevy_transform 0.12.1", - "bevy_utils 0.12.1", + "bevy_app", + "bevy_asset", + "bevy_derive", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_transform", + "bevy_utils", "oboe", "rodio", ] @@ -676,136 +596,74 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "966fc90b0126ee62bb7b93e4273da38a4fce7d1c48a1f6e94a8f558798be2543" dependencies = [ "anyhow", - "bevy 0.12.1", + "bevy", "ron", "serde", "thiserror", "toml", ] -[[package]] -name = "bevy_core" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d5272321be5fcf5ce2fb16023bc825bb10dfcb71611117296537181ce950f48" -dependencies = [ - "bevy_app 0.11.3", - "bevy_ecs 0.11.3", - "bevy_math 0.11.3", - "bevy_reflect 0.11.3", - "bevy_tasks 0.11.3", - "bevy_utils 0.11.3", - "bytemuck", -] - [[package]] name = "bevy_core" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3daa24502a14839509f02407bc7e48299fe84d260877de23b60662de0f4f4b6c" dependencies = [ - "bevy_app 0.12.1", - "bevy_ecs 0.12.1", - "bevy_math 0.12.1", - "bevy_reflect 0.12.1", - "bevy_tasks 0.12.1", - "bevy_utils 0.12.1", + "bevy_app", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_tasks", + "bevy_utils", "bytemuck", "serde", ] -[[package]] -name = "bevy_core_pipeline" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67382fa9c96ce4f4e5833ed7cedd9886844a8f3284b4a717bd4ac738dcdea0c3" -dependencies = [ - "bevy_app 0.11.3", - "bevy_asset 0.11.3", - "bevy_core 0.11.3", - "bevy_derive 0.11.3", - "bevy_ecs 0.11.3", - "bevy_math 0.11.3", - "bevy_reflect 0.11.3", - "bevy_render 0.11.3", - "bevy_transform 0.11.3", - "bevy_utils 0.11.3", - "bitflags 2.4.2", - "radsort", - "serde", -] - [[package]] name = "bevy_core_pipeline" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4b77c4fca6e90edbe2e72da7bc9aa7aed7dfdfded0920ae0a0c845f5e11084a" dependencies = [ - "bevy_app 0.12.1", - "bevy_asset 0.12.1", - "bevy_core 0.12.1", - "bevy_derive 0.12.1", - "bevy_ecs 0.12.1", - "bevy_log 0.12.1", - "bevy_math 0.12.1", - "bevy_reflect 0.12.1", - "bevy_render 0.12.1", - "bevy_transform 0.12.1", - "bevy_utils 0.12.1", + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_derive", + "bevy_ecs", + "bevy_log", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", "bitflags 2.4.2", "radsort", "serde", ] -[[package]] -name = "bevy_derive" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44e4e2784a81430199e4157e02903a987a32127c773985506f020e7d501b62e" -dependencies = [ - "bevy_macro_utils 0.11.3", - "quote", - "syn 2.0.48", -] - [[package]] name = "bevy_derive" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f484318350462c58ba3942a45a656c1fd6b6e484a6b6b7abc3a787ad1a51e500" dependencies = [ - "bevy_macro_utils 0.12.1", + "bevy_macro_utils", "quote", "syn 2.0.48", ] -[[package]] -name = "bevy_diagnostic" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6babb230dc383c98fdfc9603e3a7a2a49e1e2879dbe8291059ef37dca897932e" -dependencies = [ - "bevy_app 0.11.3", - "bevy_core 0.11.3", - "bevy_ecs 0.11.3", - "bevy_log 0.11.3", - "bevy_time 0.11.3", - "bevy_utils 0.11.3", - "sysinfo", -] - [[package]] name = "bevy_diagnostic" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa38ca5967d335cc1006a0e0f1a86c350e2f15fd1878449f61d04cd57a7c4060" dependencies = [ - "bevy_app 0.12.1", - "bevy_core 0.12.1", - "bevy_ecs 0.12.1", - "bevy_log 0.12.1", - "bevy_time 0.12.1", - "bevy_utils 0.12.1", + "bevy_app", + "bevy_core", + "bevy_ecs", + "bevy_log", + "bevy_time", + "bevy_utils", "sysinfo", ] @@ -815,42 +673,12 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64d6bfabdd6a55eac0fe32d6ffd6533c1a62d41ecaec7ffe1acad039f596dd10" dependencies = [ - "bevy 0.12.1", - "bevy_math 0.12.1", - "bevy_transform 0.12.1", + "bevy", + "bevy_math", + "bevy_transform", "leafwing-input-manager", ] -[[package]] -name = "bevy_dylib" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45b99001eb4837c78d9c63cc8b32fda61ea96b194a2cda54b569aeee69a9853c" -dependencies = [ - "bevy_internal 0.12.1", -] - -[[package]] -name = "bevy_ecs" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266144b36df7e834d5198049e037ecdf2a2310a76ce39ed937d1b0a6a2c4e8c6" -dependencies = [ - "async-channel 1.9.0", - "bevy_ecs_macros 0.11.3", - "bevy_ptr 0.11.3", - "bevy_reflect 0.11.3", - "bevy_tasks 0.11.3", - "bevy_utils 0.11.3", - "downcast-rs", - "event-listener 2.5.3", - "fixedbitset", - "rustc-hash", - "serde", - "thiserror", - "thread_local", -] - [[package]] name = "bevy_ecs" version = "0.12.1" @@ -858,11 +686,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7709fbd22f81fb681534cd913c41e1cd18b17143368743281195d7f024b61aea" dependencies = [ "async-channel 1.9.0", - "bevy_ecs_macros 0.12.1", - "bevy_ptr 0.12.1", - "bevy_reflect 0.12.1", - "bevy_tasks 0.12.1", - "bevy_utils 0.12.1", + "bevy_ecs_macros", + "bevy_ptr", + "bevy_reflect", + "bevy_tasks", + "bevy_utils", "downcast-rs", "event-listener 2.5.3", "fixedbitset", @@ -872,25 +700,13 @@ dependencies = [ "thread_local", ] -[[package]] -name = "bevy_ecs_macros" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7157a9c3be038d5008ee3f114feb6cf6b39c1d3d32ee21a7cacb8f81fccdfa80" -dependencies = [ - "bevy_macro_utils 0.11.3", - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "bevy_ecs_macros" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8843aa489f159f25cdcd9fee75cd7d221a7098a71eaa72cb2d6b40ac4e3f1ba" dependencies = [ - "bevy_macro_utils 0.12.1", + "bevy_macro_utils", "proc-macro2", "quote", "syn 2.0.48", @@ -902,7 +718,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1695be7e2e152a59f3e11a91c156328cd267466ffe6af6a7cbc1a0fb18679" dependencies = [ - "bevy 0.12.1", + "bevy", "bevy_editor_pls_core", "bevy_editor_pls_default_windows", "egui", @@ -915,10 +731,10 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a1fb9b98365e4bc1bde2e322ed2fa9d5093ed2f25d6d29e5f8d8ce1c606ab5c" dependencies = [ - "bevy 0.12.1", + "bevy", "bevy-inspector-egui", "egui_dock", - "indexmap 2.2.0", + "indexmap 2.2.1", ] [[package]] @@ -927,12 +743,12 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87f927b2f498ff6866be74734cef60e2139b3d0744f372077aa07377fe33ae5c" dependencies = [ - "bevy 0.12.1", + "bevy", "bevy-inspector-egui", "bevy_editor_pls_core", "bevy_mod_debugdump", "egui-gizmo", - "indexmap 2.2.0", + "indexmap 2.2.1", "opener", "pretty-type-name", ] @@ -944,29 +760,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c90c01202dbcebc03315a01ea71553b35e1f20b0da6b1cc8c2605344032a3d96" dependencies = [ "arboard", - "bevy 0.12.1", + "bevy", "egui", "thread_local", "webbrowser", ] -[[package]] -name = "bevy_encase_derive" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ac0f55ad6bca1be7b0f35bbd5fc95ed3d31e4e9db158fee8e5327f59006001" -dependencies = [ - "bevy_macro_utils 0.11.3", - "encase_derive_impl", -] - [[package]] name = "bevy_encase_derive" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5328a3715e933ebbff07d0e99528dc423c4f7a53590ed1ac19a120348b028990" dependencies = [ - "bevy_macro_utils 0.12.1", + "bevy_macro_utils", "encase_derive_impl", ] @@ -976,53 +782,34 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b81ca2ebf66cbc7f998f1f142b15038ffe3c4ae1d51f70adda26dcf51b0c4ca" dependencies = [ - "bevy_app 0.12.1", - "bevy_ecs 0.12.1", - "bevy_input 0.12.1", - "bevy_log 0.12.1", - "bevy_time 0.12.1", - "bevy_utils 0.12.1", + "bevy_app", + "bevy_ecs", + "bevy_input", + "bevy_log", + "bevy_time", + "bevy_utils", "gilrs", "thiserror", ] -[[package]] -name = "bevy_gizmos" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e286a3e7276431963f4aa29165ea5429fa7dbbc6d5c5ba0c531e7dd44ecc88a2" -dependencies = [ - "bevy_app 0.11.3", - "bevy_asset 0.11.3", - "bevy_core 0.11.3", - "bevy_core_pipeline 0.11.3", - "bevy_ecs 0.11.3", - "bevy_math 0.11.3", - "bevy_pbr 0.11.3", - "bevy_reflect 0.11.3", - "bevy_render 0.11.3", - "bevy_transform 0.11.3", - "bevy_utils 0.11.3", -] - [[package]] name = "bevy_gizmos" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db232274ddca2ae452eb2731b98267b795d133ddd14013121bc7daddde1c7491" dependencies = [ - "bevy_app 0.12.1", - "bevy_asset 0.12.1", - "bevy_core 0.12.1", - "bevy_core_pipeline 0.12.1", - "bevy_ecs 0.12.1", - "bevy_math 0.12.1", - "bevy_pbr 0.12.1", - "bevy_reflect 0.12.1", - "bevy_render 0.12.1", + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_core_pipeline", + "bevy_ecs", + "bevy_math", + "bevy_pbr", + "bevy_reflect", + "bevy_render", "bevy_sprite", - "bevy_transform 0.12.1", - "bevy_utils 0.12.1", + "bevy_transform", + "bevy_utils", ] [[package]] @@ -1033,21 +820,21 @@ checksum = "85adc6b1fc86687bf67149e0bafaa4d6da432232fa956472d1b37f19121d3ace" dependencies = [ "base64 0.13.1", "bevy_animation", - "bevy_app 0.12.1", - "bevy_asset 0.12.1", - "bevy_core 0.12.1", - "bevy_core_pipeline 0.12.1", - "bevy_ecs 0.12.1", - "bevy_hierarchy 0.12.1", - "bevy_log 0.12.1", - "bevy_math 0.12.1", - "bevy_pbr 0.12.1", - "bevy_reflect 0.12.1", - "bevy_render 0.12.1", - "bevy_scene 0.12.1", - "bevy_tasks 0.12.1", - "bevy_transform 0.12.1", - "bevy_utils 0.12.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", "serde", @@ -1062,7 +849,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "127702dc9ccba4eb286c54b3307c0ff18d59b35e4de4e361d8e49fee3abe0b59" dependencies = [ "anyhow", - "bevy 0.12.1", + "bevy", "bitflags 2.4.2", "bytemuck", "copyless", @@ -1074,133 +861,73 @@ dependencies = [ "typetag", ] -[[package]] -name = "bevy_hierarchy" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "103f8f58416ac6799b8c7f0b418f1fac9eba44fa924df3b0e16b09256b897e3d" -dependencies = [ - "bevy_app 0.11.3", - "bevy_core 0.11.3", - "bevy_ecs 0.11.3", - "bevy_log 0.11.3", - "bevy_reflect 0.11.3", - "bevy_utils 0.11.3", - "smallvec", -] - [[package]] name = "bevy_hierarchy" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06bd477152ce2ae1430f5e0a4f19216e5785c22fee1ab23788b5982dc59d1a55" dependencies = [ - "bevy_app 0.12.1", - "bevy_core 0.12.1", - "bevy_ecs 0.12.1", - "bevy_log 0.12.1", - "bevy_reflect 0.12.1", - "bevy_utils 0.12.1", + "bevy_app", + "bevy_core", + "bevy_ecs", + "bevy_log", + "bevy_reflect", + "bevy_utils", "smallvec", ] -[[package]] -name = "bevy_input" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbd935401101ac8003f3c3aea70788c65ad03f7a32716a10608bedda7a648bc" -dependencies = [ - "bevy_app 0.11.3", - "bevy_ecs 0.11.3", - "bevy_math 0.11.3", - "bevy_reflect 0.11.3", - "bevy_utils 0.11.3", - "thiserror", -] - [[package]] name = "bevy_input" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cab9a599189b2a694c182d60cd52219dd9364f9892ff542d87799b8e45d9e6dc" dependencies = [ - "bevy_app 0.12.1", - "bevy_ecs 0.12.1", - "bevy_math 0.12.1", - "bevy_reflect 0.12.1", - "bevy_utils 0.12.1", + "bevy_app", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_utils", "serde", "thiserror", ] -[[package]] -name = "bevy_internal" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0e35a9b2bd29aa784b3cc416bcbf2a298f69f00ca51fd042ea39d9af7fad37e" -dependencies = [ - "bevy_a11y 0.11.3", - "bevy_app 0.11.3", - "bevy_asset 0.11.3", - "bevy_core 0.11.3", - "bevy_core_pipeline 0.11.3", - "bevy_derive 0.11.3", - "bevy_diagnostic 0.11.3", - "bevy_ecs 0.11.3", - "bevy_gizmos 0.11.3", - "bevy_hierarchy 0.11.3", - "bevy_input 0.11.3", - "bevy_log 0.11.3", - "bevy_math 0.11.3", - "bevy_pbr 0.11.3", - "bevy_ptr 0.11.3", - "bevy_reflect 0.11.3", - "bevy_render 0.11.3", - "bevy_scene 0.11.3", - "bevy_tasks 0.11.3", - "bevy_time 0.11.3", - "bevy_transform 0.11.3", - "bevy_utils 0.11.3", - "bevy_window 0.11.3", -] - [[package]] name = "bevy_internal" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f124bece9831afd80897815231072d51bfe3ac58c6bb58eca8880963b6d0487c" dependencies = [ - "bevy_a11y 0.12.1", + "bevy_a11y", "bevy_animation", - "bevy_app 0.12.1", - "bevy_asset 0.12.1", + "bevy_app", + "bevy_asset", "bevy_audio", - "bevy_core 0.12.1", - "bevy_core_pipeline 0.12.1", - "bevy_derive 0.12.1", - "bevy_diagnostic 0.12.1", - "bevy_ecs 0.12.1", + "bevy_core", + "bevy_core_pipeline", + "bevy_derive", + "bevy_diagnostic", + "bevy_ecs", "bevy_gilrs", - "bevy_gizmos 0.12.1", + "bevy_gizmos", "bevy_gltf", - "bevy_hierarchy 0.12.1", - "bevy_input 0.12.1", - "bevy_log 0.12.1", - "bevy_math 0.12.1", - "bevy_pbr 0.12.1", - "bevy_ptr 0.12.1", - "bevy_reflect 0.12.1", - "bevy_render 0.12.1", - "bevy_scene 0.12.1", + "bevy_hierarchy", + "bevy_input", + "bevy_log", + "bevy_math", + "bevy_pbr", + "bevy_ptr", + "bevy_reflect", + "bevy_render", + "bevy_scene", "bevy_sprite", - "bevy_tasks 0.12.1", + "bevy_tasks", "bevy_text", - "bevy_time 0.12.1", - "bevy_transform 0.12.1", + "bevy_time", + "bevy_transform", "bevy_ui", - "bevy_utils 0.12.1", - "bevy_window 0.12.1", - "bevy_winit 0.12.1", + "bevy_utils", + "bevy_window", + "bevy_winit", ] [[package]] @@ -1210,27 +937,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a9678086759e54871faab0829592423492e19f8de5076127315cf892ae56f33" dependencies = [ "anyhow", - "bevy 0.12.1", + "bevy", "kira", - "parking_lot", + "parking_lot 0.12.1", "thiserror", - "uuid", -] - -[[package]] -name = "bevy_log" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07dcc615ff4f617b06c3f9522fca3c55d56f9644db293318f8ab68fcdea5d4fe" -dependencies = [ - "android_log-sys", - "bevy_app 0.11.3", - "bevy_ecs 0.11.3", - "bevy_utils 0.11.3", - "console_error_panic_hook", - "tracing-log 0.1.4", - "tracing-subscriber", - "tracing-wasm", + "uuid 1.7.0", ] [[package]] @@ -1240,9 +951,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dc10ba1d225a8477b9e80a1bf797d8a8b8274e83c9b24fb4d9351aec9229755" dependencies = [ "android_log-sys", - "bevy_app 0.12.1", - "bevy_ecs 0.12.1", - "bevy_utils 0.12.1", + "bevy_app", + "bevy_ecs", + "bevy_utils", "console_error_panic_hook", "tracing-chrome", "tracing-error", @@ -1251,18 +962,6 @@ dependencies = [ "tracing-wasm", ] -[[package]] -name = "bevy_macro_utils" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ddc18d489b4e57832d4958cde7cd2f349f0ad91e5892ac9e2f2ee16546b981" -dependencies = [ - "quote", - "rustc-hash", - "syn 2.0.48", - "toml_edit 0.19.15", -] - [[package]] name = "bevy_macro_utils" version = "0.12.1" @@ -1276,16 +975,6 @@ dependencies = [ "toml_edit 0.20.2", ] -[[package]] -name = "bevy_math" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78286a81fead796dc4b45ab14f4f02fe29a94423d3587bcfef872b2a8e0a474b" -dependencies = [ - "glam 0.24.2", - "serde", -] - [[package]] name = "bevy_math" version = "0.12.1" @@ -1296,15 +985,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bevy_mikktspace" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cfc2a21ea47970a9b1f0f4735af3256a8f204815bd756110051d10f9d909497" -dependencies = [ - "glam 0.24.2", -] - [[package]] name = "bevy_mikktspace" version = "0.12.1" @@ -1320,10 +1000,10 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4db8601f41ea570b7d32f3177292a608196c59bdf3298001a9e202d5e7439438" dependencies = [ - "bevy_app 0.12.1", - "bevy_ecs 0.12.1", - "bevy_render 0.12.1", - "bevy_utils 0.12.1", + "bevy_app", + "bevy_ecs", + "bevy_render", + "bevy_utils", "once_cell", "petgraph", "pretty-type-name", @@ -1336,11 +1016,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e12a8eb3047d9a84506ce630d44c9774a122259e79cd7f5e8d40837a7a82591" dependencies = [ "anyhow", - "bevy_ecs 0.12.1", - "bevy_log 0.12.1", + "bevy_ecs", + "bevy_log", "bevy_mod_sysfail_macros", - "bevy_time 0.12.1", - "bevy_utils 0.12.1", + "bevy_time", + "bevy_utils", ] [[package]] @@ -1354,61 +1034,32 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "bevy_pbr" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63ca796a619e61cd43a0a3b11fde54644f7f0732a1fba1eef5d406248c6eba85" -dependencies = [ - "bevy_app 0.11.3", - "bevy_asset 0.11.3", - "bevy_core_pipeline 0.11.3", - "bevy_derive 0.11.3", - "bevy_ecs 0.11.3", - "bevy_math 0.11.3", - "bevy_reflect 0.11.3", - "bevy_render 0.11.3", - "bevy_transform 0.11.3", - "bevy_utils 0.11.3", - "bevy_window 0.11.3", - "bitflags 2.4.2", - "bytemuck", - "naga_oil 0.8.2", - "radsort", -] - [[package]] name = "bevy_pbr" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "520bfd2a898c74f84ea52cfb8eb061f37373ad15e623489d5f75d27ebd6138fe" dependencies = [ - "bevy_app 0.12.1", - "bevy_asset 0.12.1", - "bevy_core_pipeline 0.12.1", - "bevy_derive 0.12.1", - "bevy_ecs 0.12.1", - "bevy_math 0.12.1", - "bevy_reflect 0.12.1", - "bevy_render 0.12.1", - "bevy_transform 0.12.1", - "bevy_utils 0.12.1", - "bevy_window 0.12.1", + "bevy_app", + "bevy_asset", + "bevy_core_pipeline", + "bevy_derive", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", + "bevy_window", "bitflags 2.4.2", "bytemuck", "fixedbitset", - "naga_oil 0.10.1", + "naga_oil", "radsort", "smallvec", "thread_local", ] -[[package]] -name = "bevy_ptr" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72c7586401a46f7d8e436028225c1df5288f2e0082d066b247a82466fea155c6" - [[package]] name = "bevy_ptr" version = "0.12.1" @@ -1421,7 +1072,7 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3f0a2641af76c9eb17da0dcb0fb20cd9d615b93b67be0b85f1867487e956b5a" dependencies = [ - "bevy 0.12.1", + "bevy", "bitflags 2.4.2", "log", "nalgebra", @@ -1429,37 +1080,16 @@ dependencies = [ "serde", ] -[[package]] -name = "bevy_reflect" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0778197a1eb3e095a71417c74b7152ede02975cdc95b5ea4ddc5251ed00a2eb5" -dependencies = [ - "bevy_math 0.11.3", - "bevy_ptr 0.11.3", - "bevy_reflect_derive 0.11.3", - "bevy_utils 0.11.3", - "downcast-rs", - "erased-serde 0.3.31", - "glam 0.24.2", - "once_cell", - "parking_lot", - "serde", - "smallvec", - "smol_str", - "thiserror", -] - [[package]] name = "bevy_reflect" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7921f15fc944c9c8ad01d7dbcea6505b8909c6655cd9382bab1407181556038" dependencies = [ - "bevy_math 0.12.1", - "bevy_ptr 0.12.1", - "bevy_reflect_derive 0.12.1", - "bevy_utils 0.12.1", + "bevy_math", + "bevy_ptr", + "bevy_reflect_derive", + "bevy_utils", "downcast-rs", "erased-serde 0.3.31", "glam 0.24.2", @@ -1469,79 +1099,17 @@ dependencies = [ "thiserror", ] -[[package]] -name = "bevy_reflect_derive" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342a4b2d09db22c48607d23ad59a056aff1ee004549050a51d490d375ba29528" -dependencies = [ - "bevy_macro_utils 0.11.3", - "bit-set", - "proc-macro2", - "quote", - "syn 2.0.48", - "uuid", -] - [[package]] name = "bevy_reflect_derive" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4a8c5475f216e751ef4452a1306b00711f33d2d04d9f149e4c845dfeb6753a0" dependencies = [ - "bevy_macro_utils 0.12.1", + "bevy_macro_utils", "proc-macro2", "quote", "syn 2.0.48", - "uuid", -] - -[[package]] -name = "bevy_render" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39df4824b760928c27afc7b00fb649c7a63c9d76661ab014ff5c86537ee906cb" -dependencies = [ - "anyhow", - "async-channel 1.9.0", - "bevy_app 0.11.3", - "bevy_asset 0.11.3", - "bevy_core 0.11.3", - "bevy_derive 0.11.3", - "bevy_ecs 0.11.3", - "bevy_encase_derive 0.11.3", - "bevy_hierarchy 0.11.3", - "bevy_log 0.11.3", - "bevy_math 0.11.3", - "bevy_mikktspace 0.11.3", - "bevy_reflect 0.11.3", - "bevy_render_macros 0.11.3", - "bevy_tasks 0.11.3", - "bevy_time 0.11.3", - "bevy_transform 0.11.3", - "bevy_utils 0.11.3", - "bevy_window 0.11.3", - "bitflags 2.4.2", - "bytemuck", - "codespan-reporting", - "downcast-rs", - "encase", - "futures-lite 1.13.0", - "hexasphere", - "image", - "js-sys", - "naga 0.12.3", - "naga_oil 0.8.2", - "parking_lot", - "regex", - "serde", - "smallvec", - "thiserror", - "thread_local", - "wasm-bindgen", - "web-sys", - "wgpu 0.16.3", - "wgpu-hal 0.16.2", + "uuid 1.7.0", ] [[package]] @@ -1551,23 +1119,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdefdd3737125b0d94a6ff20bb70fa8cfe9d7d5dcd72ba4dfe6c5f1d30d9f6e4" dependencies = [ "async-channel 1.9.0", - "bevy_app 0.12.1", - "bevy_asset 0.12.1", - "bevy_core 0.12.1", - "bevy_derive 0.12.1", - "bevy_ecs 0.12.1", - "bevy_encase_derive 0.12.1", - "bevy_hierarchy 0.12.1", - "bevy_log 0.12.1", - "bevy_math 0.12.1", - "bevy_mikktspace 0.12.1", - "bevy_reflect 0.12.1", - "bevy_render_macros 0.12.1", - "bevy_tasks 0.12.1", - "bevy_time 0.12.1", - "bevy_transform 0.12.1", - "bevy_utils 0.12.1", - "bevy_window 0.12.1", + "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 2.4.2", "bytemuck", "codespan-reporting", @@ -1578,8 +1146,8 @@ dependencies = [ "image", "js-sys", "ktx2", - "naga 0.13.0", - "naga_oil 0.10.1", + "naga", + "naga_oil", "profiling", "ruzstd", "serde", @@ -1588,19 +1156,7 @@ dependencies = [ "thread_local", "wasm-bindgen", "web-sys", - "wgpu 0.17.2", -] - -[[package]] -name = "bevy_render_macros" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd08c740aac73363e32fb45af869b10cec65bcb76fe3e6cd0f8f7eebf4c36c9" -dependencies = [ - "bevy_macro_utils 0.11.3", - "proc-macro2", - "quote", - "syn 2.0.48", + "wgpu", ] [[package]] @@ -1609,53 +1165,31 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64d86bfc5a1e7fbeeaec0c4ceab18155530f5506624670965db3415f75826bea" dependencies = [ - "bevy_macro_utils 0.12.1", + "bevy_macro_utils", "proc-macro2", "quote", "syn 2.0.48", ] -[[package]] -name = "bevy_scene" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd47e1263506153bef3a8be97fe2d856f206d315668c4f97510ca6cc181d9681" -dependencies = [ - "anyhow", - "bevy_app 0.11.3", - "bevy_asset 0.11.3", - "bevy_derive 0.11.3", - "bevy_ecs 0.11.3", - "bevy_hierarchy 0.11.3", - "bevy_reflect 0.11.3", - "bevy_render 0.11.3", - "bevy_transform 0.11.3", - "bevy_utils 0.11.3", - "ron", - "serde", - "thiserror", - "uuid", -] - [[package]] name = "bevy_scene" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7df078b5e406e37c8a1c6ba0d652bf105fde713ce3c3efda7263fe27467eee5" dependencies = [ - "bevy_app 0.12.1", - "bevy_asset 0.12.1", - "bevy_derive 0.12.1", - "bevy_ecs 0.12.1", - "bevy_hierarchy 0.12.1", - "bevy_reflect 0.12.1", - "bevy_render 0.12.1", - "bevy_transform 0.12.1", - "bevy_utils 0.12.1", + "bevy_app", + "bevy_asset", + "bevy_derive", + "bevy_ecs", + "bevy_hierarchy", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", "ron", "serde", "thiserror", - "uuid", + "uuid 1.7.0", ] [[package]] @@ -1664,17 +1198,17 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7cc0c9d946e17e3e0aaa202f182837bc796c4f862b2e5a805134f873f21cf7f" dependencies = [ - "bevy_app 0.12.1", - "bevy_asset 0.12.1", - "bevy_core_pipeline 0.12.1", - "bevy_derive 0.12.1", - "bevy_ecs 0.12.1", - "bevy_log 0.12.1", - "bevy_math 0.12.1", - "bevy_reflect 0.12.1", - "bevy_render 0.12.1", - "bevy_transform 0.12.1", - "bevy_utils 0.12.1", + "bevy_app", + "bevy_asset", + "bevy_core_pipeline", + "bevy_derive", + "bevy_ecs", + "bevy_log", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", "bitflags 2.4.2", "bytemuck", "fixedbitset", @@ -1684,20 +1218,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "bevy_tasks" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c73bbb847c83990d3927005090df52f8ac49332e1643d2ad9aac3cd2974e66bf" -dependencies = [ - "async-channel 1.9.0", - "async-executor", - "async-task", - "concurrent-queue", - "futures-lite 1.13.0", - "wasm-bindgen-futures", -] - [[package]] name = "bevy_tasks" version = "0.12.1" @@ -1719,74 +1239,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a9a79d49ca06170d69149949b134c14e8b99ace1444c1ca2cd4743b19d5b055" dependencies = [ "ab_glyph", - "bevy_app 0.12.1", - "bevy_asset 0.12.1", - "bevy_ecs 0.12.1", - "bevy_math 0.12.1", - "bevy_reflect 0.12.1", - "bevy_render 0.12.1", + "bevy_app", + "bevy_asset", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_render", "bevy_sprite", - "bevy_transform 0.12.1", - "bevy_utils 0.12.1", - "bevy_window 0.12.1", + "bevy_transform", + "bevy_utils", + "bevy_window", "glyph_brush_layout", "serde", "thiserror", ] -[[package]] -name = "bevy_time" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d58d6dbae9c8225d8c0e0f04d2c5dbb71d22adc01ecd5ab3cebc364139e4a6d" -dependencies = [ - "bevy_app 0.11.3", - "bevy_ecs 0.11.3", - "bevy_reflect 0.11.3", - "bevy_utils 0.11.3", - "crossbeam-channel", - "thiserror", -] - [[package]] name = "bevy_time" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6250d76eed3077128b6a3d004f9f198b01107800b9824051e32bb658054e837" dependencies = [ - "bevy_app 0.12.1", - "bevy_ecs 0.12.1", - "bevy_reflect 0.12.1", - "bevy_utils 0.12.1", + "bevy_app", + "bevy_ecs", + "bevy_reflect", + "bevy_utils", "crossbeam-channel", "serde", "thiserror", ] -[[package]] -name = "bevy_transform" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9b0ac0149a57cd846cb357a35fc99286f9848e53d4481954608ac9552ed2d4" -dependencies = [ - "bevy_app 0.11.3", - "bevy_ecs 0.11.3", - "bevy_hierarchy 0.11.3", - "bevy_math 0.11.3", - "bevy_reflect 0.11.3", -] - [[package]] name = "bevy_transform" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d541e0c292edbd96afae816ee680e02247422423ccd5dc635c1e211a20ed64be" dependencies = [ - "bevy_app 0.12.1", - "bevy_ecs 0.12.1", - "bevy_hierarchy 0.12.1", - "bevy_math 0.12.1", - "bevy_reflect 0.12.1", + "bevy_app", + "bevy_ecs", + "bevy_hierarchy", + "bevy_math", + "bevy_reflect", "serde", "thiserror", ] @@ -1796,46 +1289,29 @@ name = "bevy_ui" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d785e3b75dabcb2a8ad0d50933f8f3446d59e512cabc2d2a145e28c2bb8792ba" -dependencies = [ - "bevy_a11y 0.12.1", - "bevy_app 0.12.1", - "bevy_asset 0.12.1", - "bevy_core_pipeline 0.12.1", - "bevy_derive 0.12.1", - "bevy_ecs 0.12.1", - "bevy_hierarchy 0.12.1", - "bevy_input 0.12.1", - "bevy_log 0.12.1", - "bevy_math 0.12.1", - "bevy_reflect 0.12.1", - "bevy_render 0.12.1", - "bevy_sprite", - "bevy_text", - "bevy_transform 0.12.1", - "bevy_utils 0.12.1", - "bevy_window 0.12.1", - "bytemuck", - "serde", - "smallvec", - "taffy", - "thiserror", -] - -[[package]] -name = "bevy_utils" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d9484e32434ea84dc548cff246ce0c6f756c1336f5ea03f24ac120a48595c7" -dependencies = [ - "ahash", - "bevy_utils_proc_macros 0.11.3", - "getrandom", - "hashbrown 0.14.3", - "instant", - "petgraph", +dependencies = [ + "bevy_a11y", + "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", "thiserror", - "tracing", - "uuid", ] [[package]] @@ -1845,7 +1321,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7915222f4a08ccc782e08d10b751b42e5f9d786e697d0cb3fd09333cb7e8b6ea" dependencies = [ "ahash", - "bevy_utils_proc_macros 0.12.1", + "bevy_utils_proc_macros", "getrandom", "hashbrown 0.14.3", "instant", @@ -1853,18 +1329,7 @@ dependencies = [ "petgraph", "thiserror", "tracing", - "uuid", -] - -[[package]] -name = "bevy_utils_proc_macros" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5391b242c36f556db01d5891444730c83aa9dd648b6a8fd2b755d22cb3bddb57" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", + "uuid 1.7.0", ] [[package]] @@ -1878,56 +1343,41 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "bevy_window" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd584c0da7c4ada6557b09f57f30fb7cff21ccedc641473fc391574b4c9b7944" -dependencies = [ - "bevy_app 0.11.3", - "bevy_ecs 0.11.3", - "bevy_input 0.11.3", - "bevy_math 0.11.3", - "bevy_reflect 0.11.3", - "bevy_utils 0.11.3", - "raw-window-handle", -] - [[package]] name = "bevy_window" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41ee72bf7f974000e9b31bb971a89387f1432ba9413f35c4fef59fef49767260" dependencies = [ - "bevy_a11y 0.12.1", - "bevy_app 0.12.1", - "bevy_ecs 0.12.1", - "bevy_input 0.12.1", - "bevy_math 0.12.1", - "bevy_reflect 0.12.1", - "bevy_utils 0.12.1", + "bevy_a11y", + "bevy_app", + "bevy_ecs", + "bevy_input", + "bevy_math", + "bevy_reflect", + "bevy_utils", "raw-window-handle", "serde", ] [[package]] name = "bevy_winit" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdc044abdb95790c20053e6326760f0a2985f0dcd78613d397bf35f16039d53" +checksum = "1eb71f287eca9006dda998784c7b931e400ae2cc4c505da315882a8b082f21ad" dependencies = [ - "accesskit_winit 0.14.4", + "accesskit_winit", "approx", - "bevy_a11y 0.11.3", - "bevy_app 0.11.3", - "bevy_derive 0.11.3", - "bevy_ecs 0.11.3", - "bevy_hierarchy 0.11.3", - "bevy_input 0.11.3", - "bevy_math 0.11.3", - "bevy_tasks 0.11.3", - "bevy_utils 0.11.3", - "bevy_window 0.11.3", + "bevy_a11y", + "bevy_app", + "bevy_derive", + "bevy_ecs", + "bevy_hierarchy", + "bevy_input", + "bevy_math", + "bevy_tasks", + "bevy_utils", + "bevy_window", "crossbeam-channel", "raw-window-handle", "wasm-bindgen", @@ -1936,28 +1386,30 @@ dependencies = [ ] [[package]] -name = "bevy_winit" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eb71f287eca9006dda998784c7b931e400ae2cc4c505da315882a8b082f21ad" +name = "bevy_yarn_slinger" +version = "0.1.0" +source = "git+https://github.com/yarn-slinger/yarn-slinger?rev=b6fb6d5f7f5982a165758fa4da61ea6ebf1ef6b1#b6fb6d5f7f5982a165758fa4da61ea6ebf1ef6b1" dependencies = [ - "accesskit_winit 0.15.0", - "approx", - "bevy_a11y 0.12.1", - "bevy_app 0.12.1", - "bevy_derive 0.12.1", - "bevy_ecs 0.12.1", - "bevy_hierarchy 0.12.1", - "bevy_input 0.12.1", - "bevy_math 0.12.1", - "bevy_tasks 0.12.1", - "bevy_utils 0.12.1", - "bevy_window 0.12.1", - "crossbeam-channel", - "raw-window-handle", - "wasm-bindgen", - "web-sys", - "winit", + "anyhow", + "bevy", + "csv", + "glob", + "rand", + "seldom_fn_plugin", + "serde", + "sha2", + "yarn_slinger", +] + +[[package]] +name = "bevy_yarn_slinger_example_dialogue_view" +version = "0.1.0" +source = "git+https://github.com/yarn-slinger/yarn-slinger?rev=b6fb6d5f7f5982a165758fa4da61ea6ebf1ef6b1#b6fb6d5f7f5982a165758fa4da61ea6ebf1ef6b1" +dependencies = [ + "bevy", + "bevy_yarn_slinger", + "seldom_fn_plugin", + "unicode-segmentation", ] [[package]] @@ -2032,6 +1484,15 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + [[package]] name = "block-sys" version = "0.1.0-beta.1" @@ -2351,13 +1812,22 @@ dependencies = [ "ndk-context", "oboe", "once_cell", - "parking_lot", + "parking_lot 0.12.1", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", "windows 0.46.0", ] +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + [[package]] name = "crc32fast" version = "1.3.2" @@ -2424,14 +1894,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] -name = "d3d12" -version = "0.6.0" +name = "crypto-common" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "bitflags 1.3.2", - "libloading 0.7.4", - "winapi", + "generic-array", + "typenum", +] + +[[package]] +name = "csv" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", ] [[package]] @@ -2468,12 +1958,33 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + [[package]] name = "dispatch" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "downcast-rs" version = "1.2.0" @@ -2614,7 +2125,7 @@ dependencies = [ "ecolor", "emath", "nohash-hasher", - "parking_lot", + "parking_lot 0.12.1", ] [[package]] @@ -2732,6 +2243,18 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "fixed_decimal" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbc7fdec9d7f6671a3ebb3282c969962aba67c49f6abac5311959b65cafabc10" +dependencies = [ + "displaydoc", + "ryu", + "smallvec", + "writeable", +] + [[package]] name = "fixedbitset" version = "0.4.2" @@ -2810,7 +2333,7 @@ name = "foxtrot" version = "0.3.0" dependencies = [ "anyhow", - "bevy 0.12.1", + "bevy", "bevy_asset_loader", "bevy_common_assets", "bevy_dolly", @@ -2820,12 +2343,14 @@ dependencies = [ "bevy_kira_audio", "bevy_mod_sysfail", "bevy_rapier3d", + "bevy_yarn_slinger", + "bevy_yarn_slinger_example_dialogue_view", "bitflags 2.4.2", "chrono", "embed-resource", "glob", "image", - "indexmap 2.2.0", + "indexmap 2.2.1", "iyes_progress", "leafwing-input-manager", "oxidized_navigation", @@ -2835,10 +2360,9 @@ dependencies = [ "seldom_fn_plugin", "serde", "spew", - "strum", - "strum_macros", + "strum 0.26.1", + "strum_macros 0.26.1", "unicode-segmentation", - "warbler_grass", "winit", ] @@ -2891,6 +2415,16 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + [[package]] name = "gethostname" version = "0.3.0" @@ -2923,7 +2457,7 @@ dependencies = [ "fnv", "gilrs-core", "log", - "uuid", + "uuid 1.7.0", "vec_map", ] @@ -2941,7 +2475,7 @@ dependencies = [ "libudev-sys", "log", "nix 0.27.1", - "uuid", + "uuid 1.7.0", "vec_map", "wasm-bindgen", "web-sys", @@ -3039,16 +2573,6 @@ dependencies = [ "xi-unicode", ] -[[package]] -name = "gpu-alloc" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62" -dependencies = [ - "bitflags 1.3.2", - "gpu-alloc-types 0.2.0", -] - [[package]] name = "gpu-alloc" version = "0.6.0" @@ -3056,16 +2580,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ "bitflags 2.4.2", - "gpu-alloc-types 0.3.0", -] - -[[package]] -name = "gpu-alloc-types" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" -dependencies = [ - "bitflags 1.3.2", + "gpu-alloc-types", ] [[package]] @@ -3212,6 +2727,89 @@ dependencies = [ "cc", ] +[[package]] +name = "icu_locid" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c0aa2536adc14c07e2a521e95512b75ed8ef832f0fdf9299d4a0a45d2be2a9d" +dependencies = [ + "displaydoc", + "litemap", + "serde", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c17d8f6524fdca4471101dd71f0a132eb6382b5d6d7f2970441cb25f6f435a" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "545c6c3e8bf9580e2dafee8de6f9ec14826aaf359787789c7724f1f85f47d3dc" + +[[package]] +name = "icu_plurals" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37d807b123eb2a9ae8f12080fb8cce479f5c8a761fba0bb5ab52da6dd5e31a03" +dependencies = [ + "displaydoc", + "fixed_decimal", + "icu_locid", + "icu_locid_transform", + "icu_plurals_data", + "icu_provider", + "zerovec", +] + +[[package]] +name = "icu_plurals_data" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3acd5f1f2f988ed2dae9316c3d3560dfe4e03a7516d142b4b89b92252ada41a" + +[[package]] +name = "icu_provider" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba58e782287eb6950247abbf11719f83f5d4e4a5c1f2cd490d30a334bc47c2f4" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2abdd3a62551e8337af119c5899e600ca0c88ec8f23a46c60ba216c803dcf1a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "idna" version = "0.5.0" @@ -3249,9 +2847,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2a4f498956c7723dc280afc6a37d0dec50b39a29e232c6187ce4503703e8c2" +checksum = "433de089bd45971eecf4668ee0ee8f4cec17db4f8bd8f7bc3197a6ce37aa7d9b" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -3323,6 +2921,15 @@ dependencies = [ "mach2", ] +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + [[package]] name = "itertools" version = "0.12.0" @@ -3344,9 +2951,9 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ed260fda0df8ed859329f221a5eb24175d38fd7d10f586cf6468574e6385b79" dependencies = [ - "bevy_app 0.12.1", - "bevy_ecs 0.12.1", - "bevy_utils 0.12.1", + "bevy_app", + "bevy_ecs", + "bevy_utils", ] [[package]] @@ -3496,10 +3103,10 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61e0ad1622a1664b055990aac9efd90a9012b82737847e6a85d36ce38d2bf7c4" dependencies = [ - "bevy 0.12.1", + "bevy", "derive_more", "fixedbitset", - "itertools", + "itertools 0.12.0", "leafwing_input_manager_macros", "multimap", "once_cell", @@ -3512,7 +3119,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cde8ae98d45607e4015d0b772d4a234788ebd7a41f09879f408c7f772b81e5bf" dependencies = [ - "proc-macro-crate 2.0.1", + "proc-macro-crate 2.0.2", "proc-macro2", "quote", "syn 2.0.48", @@ -3582,6 +3189,12 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "litemap" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d642685b028806386b2b6e75685faadd3eb65a85fff7df711ce18446a422da" + [[package]] name = "lock_api" version = "0.4.11" @@ -3650,20 +3263,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "metal" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-graphics-types", - "foreign-types 0.3.2", - "log", - "objc", -] - [[package]] name = "metal" version = "0.26.0" @@ -3723,24 +3322,12 @@ dependencies = [ ] [[package]] -name = "naga" -version = "0.12.3" +name = "murmur3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb" +checksum = "a198f9589efc03f544388dfc4a19fe8af4323662b62f598b8dcfdac62c14771c" dependencies = [ - "bit-set", - "bitflags 1.3.2", - "codespan-reporting", - "hexf-parse", - "indexmap 1.9.3", - "log", - "num-traits", - "pp-rs", - "rustc-hash", - "spirv", - "termcolor", - "thiserror", - "unicode-xid", + "byteorder", ] [[package]] @@ -3764,26 +3351,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "naga_oil" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8be942a5c21c58b9b0bf4d9b99db3634ddb7a916f8e1d1d0b71820cc4150e56b" -dependencies = [ - "bit-set", - "codespan-reporting", - "data-encoding", - "indexmap 1.9.3", - "naga 0.12.3", - "once_cell", - "regex", - "regex-syntax 0.6.29", - "rustc-hash", - "thiserror", - "tracing", - "unicode-ident", -] - [[package]] name = "naga_oil" version = "0.10.1" @@ -3794,7 +3361,7 @@ dependencies = [ "codespan-reporting", "data-encoding", "indexmap 1.9.3", - "naga 0.13.0", + "naga", "once_cell", "regex", "regex-syntax 0.7.5", @@ -3956,7 +3523,7 @@ dependencies = [ "file-id", "log", "notify", - "parking_lot", + "parking_lot 0.12.1", "walkdir", ] @@ -4237,7 +3804,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb4ab0ab1cad97fbd83f85969f3ece1bba243e164444c459fd28aa302785c80c" dependencies = [ - "bevy 0.12.1", + "bevy", "bevy_rapier3d", "nalgebra", "parry3d", @@ -4250,6 +3817,17 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + [[package]] name = "parking_lot" version = "0.12.1" @@ -4257,7 +3835,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core", + "parking_lot_core 0.9.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", ] [[package]] @@ -4326,7 +3918,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.2.0", + "indexmap 2.2.1", ] [[package]] @@ -4398,9 +3990,9 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" +checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24" dependencies = [ "toml_datetime", "toml_edit 0.20.2", @@ -4459,6 +4051,29 @@ dependencies = [ "syn 2.0.48", ] +[[package]] +name = "prost" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-derive" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" +dependencies = [ + "anyhow", + "itertools 0.11.0", + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "quote" version = "1.0.35" @@ -4580,6 +4195,15 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0d463f2884048e7153449a55166f91028d5b0ea53c79377099ce4e8cf0cf9bb" +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "redox_syscall" version = "0.3.5" @@ -4765,7 +4389,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9243595906f96e24fad2c31aea29a560aaf82e86c051836e5708bf9d300048e" dependencies = [ - "bevy 0.12.1", + "bevy", ] [[package]] @@ -4802,9 +4426,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.112" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d1bd37ce2324cf3bf85e5a25f96eb4baf0d5aa6eba43e7ae8958870c4ec48ed" +checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" dependencies = [ "itoa", "ryu", @@ -4820,6 +4444,17 @@ dependencies = [ "serde", ] +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + [[package]] name = "sharded-slab" version = "0.1.7" @@ -4908,7 +4543,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c270bc754211a492fd8179f3e561e8280e08c6263f5e13990819cb37bae3186b" dependencies = [ - "bevy 0.12.1", + "bevy", ] [[package]] @@ -4921,6 +4556,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "static_assertions" version = "1.1.0" @@ -4933,12 +4574,31 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" + [[package]] name = "strum" version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" +[[package]] +name = "strum_macros" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.48", +] + [[package]] name = "strum_macros" version = "0.26.1" @@ -5051,6 +4711,18 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "synstructure" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", + "unicode-xid", +] + [[package]] name = "sysinfo" version = "0.29.11" @@ -5147,6 +4819,17 @@ dependencies = [ "weezl", ] +[[package]] +name = "tinystr" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece" +dependencies = [ + "displaydoc", + "serde", + "zerovec", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -5189,7 +4872,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.0", + "indexmap 2.2.1", "toml_datetime", "winnow", ] @@ -5200,7 +4883,7 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ - "indexmap 2.2.0", + "indexmap 2.2.1", "serde", "serde_spanned", "toml_datetime", @@ -5327,6 +5010,12 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "typed-arena" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" + [[package]] name = "typenum" version = "1.17.0" @@ -5407,6 +5096,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "uuid" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" + [[package]] name = "uuid" version = "1.7.0" @@ -5472,17 +5167,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "warbler_grass" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b14d9c4cf6bf33ce5a0f53128d10d31874802d54191897523523d756907465db" -dependencies = [ - "bevy 0.11.3", - "bitflags 2.4.2", - "bytemuck", -] - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -5599,30 +5283,6 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" -[[package]] -name = "wgpu" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd" -dependencies = [ - "arrayvec", - "cfg-if", - "js-sys", - "log", - "naga 0.12.3", - "parking_lot", - "profiling", - "raw-window-handle", - "smallvec", - "static_assertions", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "wgpu-core 0.16.1", - "wgpu-hal 0.16.2", - "wgpu-types 0.16.1", -] - [[package]] name = "wgpu" version = "0.17.2" @@ -5633,8 +5293,8 @@ dependencies = [ "cfg-if", "js-sys", "log", - "naga 0.13.0", - "parking_lot", + "naga", + "parking_lot 0.12.1", "profiling", "raw-window-handle", "smallvec", @@ -5642,32 +5302,9 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu-core 0.17.1", - "wgpu-hal 0.17.2", - "wgpu-types 0.17.0", -] - -[[package]] -name = "wgpu-core" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2" -dependencies = [ - "arrayvec", - "bit-vec", - "bitflags 2.4.2", - "codespan-reporting", - "log", - "naga 0.12.3", - "parking_lot", - "profiling", - "raw-window-handle", - "rustc-hash", - "smallvec", - "thiserror", - "web-sys", - "wgpu-hal 0.16.2", - "wgpu-types 0.16.1", + "wgpu-core", + "wgpu-hal", + "wgpu-types", ] [[package]] @@ -5681,58 +5318,16 @@ dependencies = [ "bitflags 2.4.2", "codespan-reporting", "log", - "naga 0.13.0", - "parking_lot", - "profiling", - "raw-window-handle", - "rustc-hash", - "smallvec", - "thiserror", - "web-sys", - "wgpu-hal 0.17.2", - "wgpu-types 0.17.0", -] - -[[package]] -name = "wgpu-hal" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448" -dependencies = [ - "android_system_properties", - "arrayvec", - "ash", - "bit-set", - "bitflags 2.4.2", - "block", - "core-graphics-types", - "d3d12 0.6.0", - "foreign-types 0.3.2", - "glow", - "gpu-alloc 0.5.4", - "gpu-allocator", - "gpu-descriptor", - "hassle-rs", - "js-sys", - "khronos-egl", - "libc", - "libloading 0.8.1", - "log", - "metal 0.24.0", - "naga 0.12.3", - "objc", - "parking_lot", + "naga", + "parking_lot 0.12.1", "profiling", - "range-alloc", "raw-window-handle", - "renderdoc-sys", "rustc-hash", "smallvec", "thiserror", - "wasm-bindgen", "web-sys", - "wgpu-types 0.16.1", - "winapi", + "wgpu-hal", + "wgpu-types", ] [[package]] @@ -5748,9 +5343,9 @@ dependencies = [ "bitflags 2.4.2", "block", "core-graphics-types", - "d3d12 0.7.0", + "d3d12", "glow", - "gpu-alloc 0.6.0", + "gpu-alloc", "gpu-allocator", "gpu-descriptor", "hassle-rs", @@ -5759,10 +5354,10 @@ dependencies = [ "libc", "libloading 0.8.1", "log", - "metal 0.26.0", - "naga 0.13.0", + "metal", + "naga", "objc", - "parking_lot", + "parking_lot 0.12.1", "profiling", "range-alloc", "raw-window-handle", @@ -5772,21 +5367,10 @@ dependencies = [ "thiserror", "wasm-bindgen", "web-sys", - "wgpu-types 0.17.0", + "wgpu-types", "winapi", ] -[[package]] -name = "wgpu-types" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a" -dependencies = [ - "bitflags 2.4.2", - "js-sys", - "web-sys", -] - [[package]] name = "wgpu-types" version = "0.17.0" @@ -6171,6 +5755,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "writeable" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dad7bb64b8ef9c0aa27b6da38b452b0ee9fd82beaf276a87dd796fb55cbae14e" + [[package]] name = "x11-dl" version = "2.21.0" @@ -6216,6 +5806,104 @@ version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +[[package]] +name = "yarn_slinger" +version = "0.1.0" +source = "git+https://github.com/yarn-slinger/yarn-slinger?rev=b6fb6d5f7f5982a165758fa4da61ea6ebf1ef6b1#b6fb6d5f7f5982a165758fa4da61ea6ebf1ef6b1" +dependencies = [ + "log", + "yarn_slinger_compiler", + "yarn_slinger_core", + "yarn_slinger_runtime", +] + +[[package]] +name = "yarn_slinger_compiler" +version = "0.1.0" +source = "git+https://github.com/yarn-slinger/yarn-slinger?rev=b6fb6d5f7f5982a165758fa4da61ea6ebf1ef6b1#b6fb6d5f7f5982a165758fa4da61ea6ebf1ef6b1" +dependencies = [ + "annotate-snippets", + "antlr-rust", + "better_any", + "bevy", + "rand", + "regex", + "serde", + "strum 0.25.0", + "strum_macros 0.25.3", + "thiserror", + "yarn_slinger_core", +] + +[[package]] +name = "yarn_slinger_core" +version = "0.1.0" +source = "git+https://github.com/yarn-slinger/yarn-slinger?rev=b6fb6d5f7f5982a165758fa4da61ea6ebf1ef6b1#b6fb6d5f7f5982a165758fa4da61ea6ebf1ef6b1" +dependencies = [ + "bevy", + "bytes", + "paste", + "prost", + "serde", + "strum 0.25.0", + "strum_macros 0.25.3", + "thiserror", + "yarn_slinger_macros", +] + +[[package]] +name = "yarn_slinger_macros" +version = "0.1.0" +source = "git+https://github.com/yarn-slinger/yarn-slinger?rev=b6fb6d5f7f5982a165758fa4da61ea6ebf1ef6b1#b6fb6d5f7f5982a165758fa4da61ea6ebf1ef6b1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "yarn_slinger_runtime" +version = "0.1.0" +source = "git+https://github.com/yarn-slinger/yarn-slinger?rev=b6fb6d5f7f5982a165758fa4da61ea6ebf1ef6b1#b6fb6d5f7f5982a165758fa4da61ea6ebf1ef6b1" +dependencies = [ + "bevy", + "fixed_decimal", + "icu_locid", + "icu_plurals", + "log", + "once_cell", + "regex", + "serde", + "thiserror", + "unicode-normalization", + "unicode-segmentation", + "yarn_slinger_core", +] + +[[package]] +name = "yoke" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65e71b2e4f287f467794c671e2b8f8a5f3716b3c829079a1c44740148eff07e4" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", + "synstructure", +] + [[package]] name = "zerocopy" version = "0.7.32" @@ -6235,3 +5923,46 @@ dependencies = [ "quote", "syn 2.0.48", ] + +[[package]] +name = "zerofrom" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", + "synstructure", +] + +[[package]] +name = "zerovec" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff4439ae91fb5c72b8abc12f3f2dbf51bd27e6eadb9f8a5bc8898dddb0e27ea" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4e5997cbf58990550ef1f0e5124a05e47e1ebd33a84af25739be6031a62c20" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] diff --git a/Cargo.toml b/Cargo.toml index db7a7a75..f3f2aef6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,17 +41,20 @@ unicode-segmentation = "1" anyhow = "1" # Activate the egui feature when https://github.com/Leafwing-Studios/leafwing-input-manager/pull/442 lands leafwing-input-manager = { version = "0.11", features = [] } -warbler_grass = "0.4" rand = { version = "0.8", features = ["small_rng"] } bevy_dolly = "0.0.2" spew = "0.4" bevy_mod_sysfail = "5" seldom_fn_plugin = "0.5" -# https://github.com/TheGrimsey/oxidized_navigation/pull/21 +# Using outdated version until oxidized_navigation updates: https://github.com/TheGrimsey/oxidized_navigation/pull/21 bevy_rapier3d = { version = "0.23", features = [ "serde-serialize", "simd-stable", "parallel" ] } bevy_editor_pls = { version = "0.7", optional = true } bevy_hanabi = "0.9" +# Using git dep until release: https://github.com/yarn-slinger/yarn-slinger/issues/172 +bevy_yarn_slinger = { git = "https://github.com/yarn-slinger/yarn-slinger", rev = "b6fb6d5f7f5982a165758fa4da61ea6ebf1ef6b1" } +bevy_yarn_slinger_example_dialogue_view = { git = "https://github.com/yarn-slinger/yarn-slinger", rev = "b6fb6d5f7f5982a165758fa4da61ea6ebf1ef6b1" } + # keep the following in sync with Bevy's dependencies ## https://github.com/bevyengine/bevy/blob/v0.12.1/crates/bevy_winit/Cargo.toml#L31 winit = { version = "0.28.7", default-features = false } @@ -59,11 +62,11 @@ winit = { version = "0.28.7", default-features = false } image = { version = "0.24", default-features = false } [dependencies.bevy] -version = "0.12" +version = "0.12.1" features = [ "jpeg", "serialize", - "dynamic_linking", + # "dynamic_linking", makes the builds MUCH faster, but causes issues on Windows "file_watcher", ] diff --git a/assets/dialogs/follower.dlg.ron b/assets/dialogs/follower.dlg.ron deleted file mode 100644 index 9c31bd4f..00000000 --- a/assets/dialogs/follower.dlg.ron +++ /dev/null @@ -1,134 +0,0 @@ -( - initial_page: [ - ( - id: "page:again", - positive_requirements: [ - "choice:bye", - ], - ), - ( - id: "page:greet", - ), - ], - pages: { - "page:main-choice": ( - text: "A giant fox stands before you. The light shimmers on its fur.\n\"What is your will?\"", - next_page: Choice({ - "choice:who": ( - text: "\"Who are you?\"", - next_page_id: "page:me", - ), - "choice:possibilities": ( - text: "\"Tell me about the possibilities this world offers.\"", - next_page_id: "page:possibilities", - ), - "choice:commands": ( - text: "\"I command you to do something for me.\"", - next_page_id: "page:commands", - ), - "choice:exhaust": ( - text: "\"Did we talk about everything?\"", - next_page_id: "page:exhaust", - positive_requirements: [ - "choice:who", - "choice:possibilities", - "choice:commands", - ], - ), - "choice:bye": ( - text: "\"You may go now.\"", - next_page_id: "page:exit", - ), - }), - ), - "page:again": ( - text: "\"Greetings, master. Do you wish some further testing?\"", - next_page: SameAs("page:greet"), - ), - "page:me": ( - text: "\"I am a testing character.\nMy sole purpose is to fill the air with diverse, but ultimately meaningless conversation.\nYou are my master; I am your servant\"", - next_page: SameAs("page:main-choice"), - ), - "page:exhaust": ( - text: "\"I have exhausted my repertoire. We can only treat old ground now.\"", - next_page: SameAs("page:main-choice"), - ), - "page:greet": ( - text: "\"Greetings, master.\"", - next_page: Continue("page:main-choice"), - ), - "page:exit": ( - text: "\"Goodbye.\"\nThe fox's gaze shifts ever so slightly. It now looks just past you into the void.", - talking_speed: 2., - next_page: Exit, - ), - "page:main-choice-unnest": ( - text: "\"May you use this knowledge to live more\"", - next_page: SameAs("page:main-choice"), - ), - "page:possibilities": ( - text: "The fox perches its ears. \"Certainly, master. What do you wish to learn about?\"", - next_page: Choice({ - "choice:movement": ( - text: "\"What can my body do?\"", - next_page_id: "page:movement", - ), - "choice:camera": ( - text: "\"Can I change the way I view the world?\"", - next_page_id: "page:camera", - ), - "choice:editor": ( - text: "\"Can I change the structure of this world?\"", - next_page_id: "page:editor", - ), - "choice:unnest": ( - text: "\"Enough. Let us talk about different things.\"", - next_page_id: "page:main-choice-unnest", - ), - }), - ), - "page:movement": ( - text: "\"You can move your limbs with WASD. Holding shift will shiften your pace. Pressing space will free you from gravity's shackles, if only for a moment.\"", - next_page: SameAs("page:possibilities") - ), - "page:camera": ( - text: "\"Scrolling moves your mind's eye across vast distances. Go far, and you shall see the world as a bird does. Go near and the bonds between your body and vision will vanish.\"", - next_page: SameAs("page:possibilities") - ), - "page:editor": ( - text: "\"That depends. If you entered this world as a developer, press Q to gaze into the beating heart of the world. In any case, Esc will pause the flow of time and free your mouse.\"", - next_page: SameAs("page:possibilities") - ), - "page:commands": ( - text: "The fox stiffs its back. \"Yes, master. Where your will goes I shall follow.\"", - next_page: Choice({ - "choice:slow": ( - text: "\"Talk slowly to me\"", - next_page_id: "page:slow", - ), - "choice:fast": ( - text: "\"Talk fast to me\"", - next_page_id: "page:fast", - ), - "choice:commands-back": ( - text: "\"You may relax again. Let us talk about different things.\"", - next_page_id: "page:commands-back", - ), - }), - ), - "page:slow": ( - text: "\"My... mind... as... slow... as... ...\"", - talking_speed: 0.1, - next_page: SameAs("page:commands") - ), - "page:fast": ( - text: "\"Yes, master! My thoughts race as though I was running from death itself. I shall serve you as you want, master. I am nothing the moment you are done with me, master. My existence ceases upon the push of a button, master.\"", - talking_speed: 3., - next_page: SameAs("page:commands") - ), - "page:commands-back": ( - text: "The fox looks visibly more calm, although there is still a shadow of exhaustion in its face. \"Thank you, master.\"", - next_page: SameAs("page:main-choice"), - ), - }, -) \ No newline at end of file diff --git a/assets/dialogue/follower.yarn b/assets/dialogue/follower.yarn new file mode 100644 index 00000000..5fceebeb --- /dev/null +++ b/assets/dialogue/follower.yarn @@ -0,0 +1,51 @@ +title: Follower +--- +The Follower: Well well well, look who it is. I've been waiting for you. +-> Who, me? + The Follower: Well, not you in particular, but someone like you. +-> Who are you? +-> I mistyped. Leave me be. + <> +The Follower: I'm the Follower. I follow people. I go places. I show folks like you how to use Foxtrot. +-> What's Foxtrot? + The Follower: Foxtrot is here. It it the very fabric of this tiny space. It simply *is*. + -> What do you mean? + The Follower: It's a *template*, kid. You use it as a primordial singularity to create your own worlds. + -> Alright, how do I use it? +-> And how would I do that? +-> I heard enough. Leave me be. + <> +The Follower: There's a big ol' button on GitHub. Says "Use this template". Rest is history. +-> What do I do then? + The Follower: You make a world. You make a story. You make a game. You make a piece of yourself. + -> How does Foxtrot help me with that? +-> What does Foxtrot offer? +The Follower: It smashes together a bunch of crates that you need for many games. 3D character driven games, that is. Game development is hard enough as it is, so Foxtrot tries to make it easier for you. +<> +=== + +title: Features +--- +The Follower: What feature do you care about? +-> Movement + The Follower: You can move around with WASD. You can jump with space. You can look around with the mouse. You can interact with the world with E. Shift makes you sprint past all your problems. + The Follower: The character controller is a custom thing on top of Rapier. Ideally, we should switch to tnua, but you know how it is. +-> Camera + The Follower: Zoom in and out to fling the camera around. You'll notice that this changed the view from third to first person or top down. + The Follower: It's pretty smooth, thanks to bevy_dolly. +-> Dialogue + The Follower: You can talk to people. You can make them say things. You can make them say different things depending on what you've done. + The Follower: It's all based on yarn_slinger, which is a port of Yarn Spinner. Google that combination of words and you'll sure find all you need. +-> Dev Editor + The Follower: See the little stop button in the upper left corner? That opens bevy_editor_pls. In its list of windows, you'll find Foxtrot Dev. + The Follower: It's a little editor that lets you edit the world. You can add and remove entities and so on. Extend it with whatever you need for debugging. +-> I've heard enough + <> +<> +=== + +title: Quit +--- +The Follower: As you wish. I'll be following you. +<> +=== diff --git a/readme.md b/readme.md index 8601ca40..8ded29fd 100644 --- a/readme.md +++ b/readme.md @@ -15,11 +15,9 @@ https://user-images.githubusercontent.com/9047632/226387411-70f662de-0681-47ff-b - Saving / loading levels - Saving / loading the game state - Animations -- A custom dialog system +- Dialogs via [`yarn_slinger`](https://github.com/yarn-slinger/yarn-slinger) - Shaders - GLTF imports, including auto-detection of colliders -- Dynamic builds when developing -- Grass blades using [`warbler_grass`](https://crates.io/crates/warbler_grass) - Smooth cameras via [`bevy_dolly`](https://github.com/BlackPhlox/bevy_dolly) - A skydome that follows the camera - Simple error handling via [`bevy_mod_sysfail`](https://crates.io/crates/bevy_mod_sysfail) diff --git a/src/file_system_interaction/asset_loading.rs b/src/file_system_interaction/asset_loading.rs index 07acb625..57cb4697 100644 --- a/src/file_system_interaction/asset_loading.rs +++ b/src/file_system_interaction/asset_loading.rs @@ -1,6 +1,5 @@ use crate::file_system_interaction::config::GameConfig; use crate::file_system_interaction::level_serialization::SerializedLevel; -use crate::world_interaction::dialog::Dialog; use crate::GameState; use anyhow::Result; use bevy::prelude::*; @@ -16,7 +15,6 @@ use iyes_progress::{ProgressCounter, ProgressPlugin}; pub(crate) fn loading_plugin(app: &mut App) { app.add_plugins(RonAssetPlugin::::new(&["lvl.ron"])) - .add_plugins(RonAssetPlugin::::new(&["dlg.ron"])) .add_plugins(TomlAssetPlugin::::new(&["game.toml"])) .add_plugins(ProgressPlugin::new(GameState::Loading).continue_to(GameState::Menu)) .add_loading_state( @@ -26,7 +24,6 @@ pub(crate) fn loading_plugin(app: &mut App) { .load_collection::() .load_collection::() .load_collection::() - .load_collection::() .load_collection::() .load_collection::(), ) @@ -67,12 +64,6 @@ pub(crate) struct LevelAssets { pub(crate) levels: HashMap>, } -#[derive(AssetCollection, Resource, Clone)] -pub(crate) struct DialogAssets { - #[asset(path = "dialogs", collection(typed, mapped))] - pub(crate) dialogs: HashMap>, -} - #[derive(AssetCollection, Resource, Clone)] pub(crate) struct TextureAssets { #[asset(path = "textures/stone_alley_2.jpg")] @@ -96,7 +87,6 @@ fn show_progress( scene_assets: Option>, animation_assets: Option>, level_assets: Option>, - dialog_assets: Option>, texture_assets: Option>, config_assets: Option>, ) { @@ -119,7 +109,6 @@ fn show_progress( ui.checkbox(&mut scene_assets.is_some(), "Scenes"); ui.checkbox(&mut animation_assets.is_some(), "Animations"); ui.checkbox(&mut level_assets.is_some(), "Levels"); - ui.checkbox(&mut dialog_assets.is_some(), "Dialogs"); ui.checkbox(&mut texture_assets.is_some(), "Textures"); ui.checkbox(&mut config_assets.is_some(), "Config"); }); diff --git a/src/file_system_interaction/config.rs b/src/file_system_interaction/config.rs index aa842af1..933d77f1 100644 --- a/src/file_system_interaction/config.rs +++ b/src/file_system_interaction/config.rs @@ -8,7 +8,6 @@ pub(crate) struct GameConfig { pub(crate) camera: Camera, pub(crate) characters: Characters, pub(crate) player: Player, - pub(crate) dialog: Dialog, } #[derive(Debug, Clone, PartialEq, Reflect, Serialize, Deserialize, Default)] @@ -76,9 +75,3 @@ pub(crate) struct Player { pub(crate) min_fov: f32, pub(crate) max_fov: f32, } - -#[derive(Debug, Clone, PartialEq, Reflect, Serialize, Deserialize, Default)] -#[reflect(Serialize, Deserialize)] -pub(crate) struct Dialog { - pub(crate) base_letters_per_second: f32, -} diff --git a/src/file_system_interaction/game_state_serialization.rs b/src/file_system_interaction/game_state_serialization.rs index 7b996030..cd9045b7 100644 --- a/src/file_system_interaction/game_state_serialization.rs +++ b/src/file_system_interaction/game_state_serialization.rs @@ -2,7 +2,6 @@ use crate::file_system_interaction::level_serialization::{CurrentLevel, WorldLoa use crate::level_instantiation::spawning::GameObject; use crate::player_control::player_embodiment::Player; use crate::world_interaction::condition::ActiveConditions; -use crate::world_interaction::dialog::{CurrentDialog, DialogEvent}; use crate::GameState; use anyhow::{Context, Error, Result}; use bevy::prelude::*; @@ -45,8 +44,6 @@ struct SaveModel { #[serde(default, skip_serializing_if = "ActiveConditions::is_empty")] conditions: ActiveConditions, player_transform: Transform, - #[serde(default, skip_serializing_if = "Option::is_none")] - dialog_event: Option, } #[sysfail(log(level = "error"))] @@ -55,7 +52,6 @@ fn handle_load_requests( mut load_events: EventReader, mut loader: EventWriter, mut spawner: EventWriter>, - mut dialog_event_writer: EventWriter, ) -> Result<()> { for load in load_events.read() { let path = match load @@ -96,9 +92,6 @@ fn handle_load_requests( loader.send(WorldLoadRequest { filename: save_model.scene, }); - if let Some(dialog_event) = save_model.dialog_event { - dialog_event_writer.send(dialog_event); - } commands.insert_resource(save_model.conditions); spawner.send( @@ -128,22 +121,14 @@ fn read_last_save() -> Result, Error> { fn handle_save_requests( mut save_events: EventReader, conditions: Res, - dialog: Option>, player_query: Query<&GlobalTransform, With>, current_level: Res, ) -> Result<()> { - let dialog = dialog.map(|dialog| dialog.clone()); for save in save_events.read() { for player in &player_query { - let dialog_event = dialog.clone().map(|dialog| DialogEvent { - dialog: dialog.id, - source: dialog.source, - page: Some(dialog.current_page), - }); let save_model = SaveModel { scene: current_level.scene.clone(), conditions: conditions.clone(), - dialog_event, player_transform: player.compute_transform(), }; let serialized = match ron::to_string(&save_model) { diff --git a/src/file_system_interaction/level_serialization.rs b/src/file_system_interaction/level_serialization.rs index fd25c24a..1fdb4248 100644 --- a/src/file_system_interaction/level_serialization.rs +++ b/src/file_system_interaction/level_serialization.rs @@ -1,7 +1,6 @@ use crate::file_system_interaction::asset_loading::LevelAssets; use crate::level_instantiation::spawning::GameObject; use crate::world_interaction::condition::ActiveConditions; -use crate::world_interaction::dialog::CurrentDialog; use crate::world_interaction::interactions_ui::InteractionOpportunities; use anyhow::{Context, Result}; use bevy::prelude::*; @@ -132,7 +131,6 @@ fn load_world( }); commands.insert_resource(InteractionOpportunities::default()); commands.insert_resource(ActiveConditions::default()); - commands.remove_resource::(); info!("Successfully loaded scene \"{}\"", load.filename,) } diff --git a/src/level_instantiation/spawning/objects/npc.rs b/src/level_instantiation/spawning/objects/npc.rs index a124f749..0c3f149b 100644 --- a/src/level_instantiation/spawning/objects/npc.rs +++ b/src/level_instantiation/spawning/objects/npc.rs @@ -3,7 +3,7 @@ use crate::level_instantiation::spawning::objects::GameCollisionGroup; use crate::level_instantiation::spawning::GameObject; use crate::movement::general_movement::{CharacterAnimations, CharacterControllerBundle, Model}; use crate::movement::navigation::Follower; -use crate::world_interaction::dialog::{DialogId, DialogTarget}; +use crate::world_interaction::dialog::DialogTarget; use bevy::prelude::*; use bevy_rapier3d::prelude::*; use std::f32::consts::TAU; @@ -32,7 +32,8 @@ pub(crate) fn spawn( aerial: animations.character_running.clone(), }, DialogTarget { - dialog_id: DialogId::new("follower"), + speaker: "The Follower".to_string(), + node: "Follower".to_string(), }, GameObject::Npc, )) diff --git a/src/player_control/actions.rs b/src/player_control/actions.rs index b42547e3..f350aa42 100644 --- a/src/player_control/actions.rs +++ b/src/player_control/actions.rs @@ -62,27 +62,6 @@ pub(crate) enum PlayerAction { NumberedChoice0, } -impl PlayerAction { - pub(crate) fn numbered_choice(index: u8) -> Self { - match index { - 0 => PlayerAction::NumberedChoice0, - 1 => PlayerAction::NumberedChoice1, - 2 => PlayerAction::NumberedChoice2, - 3 => PlayerAction::NumberedChoice3, - 4 => PlayerAction::NumberedChoice4, - 5 => PlayerAction::NumberedChoice5, - 6 => PlayerAction::NumberedChoice6, - 7 => PlayerAction::NumberedChoice7, - 8 => PlayerAction::NumberedChoice8, - 9 => PlayerAction::NumberedChoice9, - _ => panic!( - "Numbered choice index out of range: got {}, expected 0-9", - index - ), - } - } -} - #[derive(Debug, Clone, Eq, PartialEq, Hash, Actionlike, Reflect, Default)] pub(crate) enum CameraAction { #[default] diff --git a/src/player_control/camera.rs b/src/player_control/camera.rs index af4df8da..2341e569 100644 --- a/src/player_control/camera.rs +++ b/src/player_control/camera.rs @@ -6,6 +6,7 @@ use crate::player_control::camera::{ use crate::GameState; use bevy::prelude::*; use bevy_dolly::prelude::*; +use bevy_yarn_slinger_example_dialogue_view::ExampleYarnSlingerDialogueViewSystemSet; pub(crate) use cursor::ForceCursorGrabMode; use serde::{Deserialize, Serialize}; use ui::*; @@ -63,7 +64,7 @@ pub(crate) fn camera_plugin(app: &mut App) { ( update_kind, update_drivers, - set_camera_focus, + set_camera_focus.after(ExampleYarnSlingerDialogueViewSystemSet), update_rig, move_skydome, ) diff --git a/src/player_control/camera/focus.rs b/src/player_control/camera/focus.rs index 8875085a..e8047368 100644 --- a/src/player_control/camera/focus.rs +++ b/src/player_control/camera/focus.rs @@ -1,29 +1,38 @@ use crate::player_control::camera::IngameCamera; use crate::player_control::player_embodiment::Player; -use crate::world_interaction::dialog::CurrentDialog; +use crate::world_interaction::dialog::DialogTarget; use anyhow::Result; use bevy::prelude::*; use bevy_mod_sysfail::*; +use bevy_yarn_slinger::events::DialogueCompleteEvent; +use bevy_yarn_slinger_example_dialogue_view::SpeakerChangeEvent; #[sysfail(log(level = "error"))] pub(crate) fn set_camera_focus( mut camera_query: Query<&mut IngameCamera>, - current_dialog: Option>, + mut speaker_change_events: EventReader, player_query: Query<&Transform, With>, - non_player_query: Query<&GlobalTransform, Without>, + dialog_targets: Query<(&Transform, &DialogTarget), Without>, + mut dialogue_complete_event: EventReader, ) -> Result<()> { for mut camera in camera_query.iter_mut() { for player_transform in player_query.iter() { - if let Some(ref active_dialogue) = current_dialog { - let dialog_target_transform = non_player_query - .get(active_dialogue.source)? - .compute_transform(); - camera.secondary_target = Some(dialog_target_transform); - } else { - camera.secondary_target = None; + for event in speaker_change_events.read() { + if event.speaking { + for (dialog_target_transform, dialog_target) in dialog_targets.iter() { + if dialog_target.speaker == event.character_name { + camera.secondary_target = Some(*dialog_target_transform); + } + } + } } camera.target = *player_transform; } } + for _event in dialogue_complete_event.read() { + for mut camera in camera_query.iter_mut() { + camera.secondary_target = None; + } + } Ok(()) } diff --git a/src/player_control/player_embodiment.rs b/src/player_control/player_embodiment.rs index 147e5cc8..90314671 100644 --- a/src/player_control/player_embodiment.rs +++ b/src/player_control/player_embodiment.rs @@ -5,13 +5,14 @@ use crate::player_control::actions::{DualAxisDataExt, PlayerAction}; use crate::player_control::camera::{CameraUpdateSystemSet, IngameCamera, IngameCameraKind}; use crate::util::smoothness_to_lerp_factor; use crate::util::trait_extension::{F32Ext, TransformExt, Vec3Ext}; -use crate::world_interaction::dialog::CurrentDialog; +use crate::world_interaction::dialog::DialogTarget; use crate::GameState; use anyhow::{Context, Result}; use bevy::prelude::*; use bevy_kira_audio::AudioInstance; use bevy_mod_sysfail::*; use bevy_rapier3d::prelude::*; +use bevy_yarn_slinger_example_dialogue_view::SpeakerChangeEvent; use leafwing_input_manager::prelude::ActionState; use serde::{Deserialize, Serialize}; use std::ops::DerefMut; @@ -27,7 +28,7 @@ pub(crate) fn player_embodiment_plugin(app: &mut App) { handle_jump, handle_horizontal_movement, handle_speed_effects, - rotate_to_speaker.run_if(resource_exists::()), + rotate_to_speaker, control_walking_sound, handle_camera_kind, ) @@ -147,28 +148,35 @@ fn handle_speed_effects( fn rotate_to_speaker( time: Res