diff --git a/.cargo/config.toml b/.cargo/config.toml deleted file mode 100644 index 82d0b716..00000000 --- a/.cargo/config.toml +++ /dev/null @@ -1,38 +0,0 @@ -# NOTE: For maximum performance, build using a nightly compiler -# If you are using rust stable, remove the `"-Z", "share-generics=y"` below. - -# You can uncomment some lines for better link time performance. Requires lld on Windows, zld on macOS and clang on Linux. - -# 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 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 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] -# 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"] - -[profile.dev] -# 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. -# debug = 1 - -# Enable some optimizations for dependencies (incl. Bevy), but not for our code. -[profile.dev.package."*"] -opt-level = 3 - -[profile.release] -lto = "thin" -codegen-units = 1 diff --git a/.cargo/config_fast_builds.toml b/.cargo/config_fast_builds.toml new file mode 100644 index 00000000..175d99d2 --- /dev/null +++ b/.cargo/config_fast_builds.toml @@ -0,0 +1,40 @@ +# Rename this file to `config.toml` to enable "fast build" configuration. Please read the notes below. + +# NOTE: For maximum performance, build using a nightly compiler +# If you are using rust stable, remove the "-Zshare-generics=y" below. + +[target.x86_64-unknown-linux-gnu] +linker = "clang" +rustflags = [ + "-Clink-arg=-fuse-ld=lld", # Use LLD Linker + "-Zshare-generics=y", # (Nightly) Make the current crate share its generic instantiations + "-Zthreads=0", # (Nightly) Use improved multithreading with the recommended amount of threads. +] + +# NOTE: you must install [Mach-O LLD Port](https://lld.llvm.org/MachO/index.html) on mac. you can easily do this by installing llvm which includes lld with the "brew" package manager: +# `brew install llvm` +[target.x86_64-apple-darwin] +rustflags = [ + "-Clink-arg=-fuse-ld=/usr/local/opt/llvm/bin/ld64.lld", # Use LLD Linker + "-Zshare-generics=y", # (Nightly) Make the current crate share its generic instantiations + "-Zthreads=0", # (Nightly) Use improved multithreading with the recommended amount of threads. +] + +[target.aarch64-apple-darwin] +rustflags = [ + "-Clink-arg=-fuse-ld=/opt/homebrew/opt/llvm/bin/ld64.lld", # Use LLD Linker + "-Zshare-generics=y", # (Nightly) Make the current crate share its generic instantiations + "-Zthreads=0", # (Nightly) Use improved multithreading with the recommended amount of threads. +] + +[target.x86_64-pc-windows-msvc] +linker = "rust-lld.exe" # Use LLD Linker +rustflags = [ + "-Zshare-generics=n", + "-Zthreads=0", # (Nightly) Use improved multithreading with the recommended amount of threads. +] + +# 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. +#[profile.dev] +#debug = 1 diff --git a/.gitignore b/.gitignore index cc3748db..70dda01f 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ blender_assets.cats.txt* *.blend1 trace-*.json + +.cargo/config.toml diff --git a/Cargo.lock b/Cargo.lock index 2a7062ca..cc0270a5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -41,7 +41,7 @@ checksum = "cd3b6ae1eabbfbced10e840fd3fce8a93ae84f174b3e4ba892ab7bcb42e477a7" dependencies = [ "accesskit", "accesskit_consumer", - "objc2", + "objc2 0.3.0-beta.3.patch-leaks.3", "once_cell", ] @@ -61,25 +61,17 @@ dependencies = [ [[package]] name = "accesskit_winit" -version = "0.15.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88e39fcec2e10971e188730b7a76bab60647dacc973d4591855ebebcadfaa738" +checksum = "45f8f7c9f66d454d5fd8e344c8c8c7324b57194e1041b955519fc58a01e77a25" dependencies = [ "accesskit", "accesskit_macos", "accesskit_windows", + "raw-window-handle 0.6.0", "winit", ] -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - [[package]] name = "adler" version = "1.0.2" @@ -88,9 +80,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.7" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +checksum = "d713b3834d76b85304d4d525563c1276e2e30dc97cc67bfb4585a4a29fc2c89f" dependencies = [ "cfg-if", "getrandom", @@ -138,20 +130,23 @@ dependencies = [ [[package]] name = "android-activity" -version = "0.4.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0" +checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" dependencies = [ "android-properties", - "bitflags 1.3.2", + "bitflags 2.4.2", "cc", + "cesu8", + "jni 0.21.1", "jni-sys", "libc", "log", - "ndk", + "ndk 0.8.0", "ndk-context", - "ndk-sys", - "num_enum 0.6.1", + "ndk-sys 0.5.0+25.2.9519653", + "num_enum 0.7.2", + "thiserror", ] [[package]] @@ -187,9 +182,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2faccea4cc4ab4a667ce676a30e8ec13922a692c99bb8f5b11f1502c72e04220" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "antlr-rust" @@ -210,9 +205,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" [[package]] name = "approx" @@ -225,9 +220,9 @@ dependencies = [ [[package]] name = "arboard" -version = "3.3.0" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafb29b107435aa276664c1db8954ac27a6e105cdad3c88287a199eb0e313c08" +checksum = "1faa3c733d9a3dd6fbaf85da5d162a2e03b2e0033a90dceb0e2a90fdd1e5380a" dependencies = [ "clipboard-win", "core-graphics", @@ -238,7 +233,7 @@ dependencies = [ "objc_id", "parking_lot 0.12.1", "thiserror", - "winapi", + "windows-sys 0.48.0", "x11rb", ] @@ -254,6 +249,12 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +[[package]] +name = "as-raw-xcb-connection" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" + [[package]] name = "ash" version = "0.37.3+1.3.251" @@ -275,24 +276,13 @@ dependencies = [ [[package]] name = "async-channel" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -dependencies = [ - "concurrent-queue", - "event-listener 2.5.3", - "futures-core", -] - -[[package]] -name = "async-channel" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", - "event-listener 4.0.3", - "event-listener-strategy", + "event-listener 5.1.0", + "event-listener-strategy 0.5.0", "futures-core", "pin-project-lite", ] @@ -303,33 +293,23 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" dependencies = [ - "async-lock 3.3.0", + "async-lock", "async-task", "concurrent-queue", - "fastrand 2.0.1", - "futures-lite 2.2.0", + "fastrand", + "futures-lite", "slab", ] [[package]] name = "async-fs" -version = "1.6.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +checksum = "bc19683171f287921f2405677dd2ed2549c3b3bda697a563ebc3a121ace2aba1" dependencies = [ - "async-lock 2.8.0", - "autocfg", + "async-lock", "blocking", - "futures-lite 1.13.0", -] - -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", + "futures-lite", ] [[package]] @@ -339,7 +319,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" dependencies = [ "event-listener 4.0.3", - "event-listener-strategy", + "event-listener-strategy 0.4.0", "pin-project-lite", ] @@ -367,27 +347,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - [[package]] name = "base64" version = "0.21.7" @@ -402,18 +361,19 @@ checksum = "1795ebc740ea791ffbe6685e0688ab1effec16c2864e0476db40bfdf0c02cb3d" [[package]] name = "bevy" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4bc7e09282a82a48d70ade0c4c1154b0fd7882a735a39c66766a5d0f4718ea9" +checksum = "611dd99f412e862610adb43e2243b16436c6d8009f6d9dbe8ce3d6d840b34029" dependencies = [ + "bevy_dylib", "bevy_internal", ] [[package]] name = "bevy-inspector-egui" -version = "0.22.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c3efee9165f9be9c6a180c6a9bbb4bd39ee0a98a594f4cb7127704e15415cdd" +checksum = "9cf0713a3456f6533d274a4ff6a124fc7ec5de89b9dac25c7eca73c9799badcc" dependencies = [ "bevy-inspector-egui-derive", "bevy_app", @@ -440,20 +400,20 @@ dependencies = [ [[package]] name = "bevy-inspector-egui-derive" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ec77479f56958ed1b2802c3129ebc704d12245627b2d4dae61f11e6ed5c21b1" +checksum = "b3c488161a04a123e10273e16d4533945943fcfcf345f066242790e8977aee2d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] name = "bevy-tnua" -version = "0.14.2" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3400bbf77456b9503736a64abbbf1a2f5f316d73e8ab66c5221d6f4f84f7fb33" +checksum = "e79dea24f40fa0a93c82a1f5a9a08e3cdfb64488ca28e5faafbe365c8c19e836" dependencies = [ "bevy", "bevy-tnua-physics-integration-layer", @@ -462,18 +422,18 @@ dependencies = [ [[package]] name = "bevy-tnua-physics-integration-layer" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30383c8f91c93c6d1dc75b5a31ef1f2965979bf970b56d335dc1836ba2db0726" +checksum = "2116c25ee9f769b3c5f82951634dfca780f919e03ff85fdbd43384e13d7df469" dependencies = [ "bevy", ] [[package]] name = "bevy-tnua-xpbd3d" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af8ba6f59da45a4ee00e73bb952d73dd47d84d61f66ae526a13c2e9cdea40e7b" +checksum = "a3cb35478ca0d02bf043ed6f198e5081664d7a9138da4d9ef29c73f7e9824946" dependencies = [ "bevy", "bevy-tnua-physics-integration-layer", @@ -482,9 +442,9 @@ dependencies = [ [[package]] name = "bevy_a11y" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68080288c932634f6563d3a8299efe0ddc9ea6787539c4c771ba250d089a94f0" +checksum = "5bf80cd6d0dca4073f9b34b16f1d187a4caa035fd841892519431783bbc9e287" dependencies = [ "accesskit", "bevy_app", @@ -494,9 +454,9 @@ dependencies = [ [[package]] name = "bevy_animation" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aa37683b1281e1ba8cf285644e6e3f0704f14b3901c5ee282067ff7ff6f4a56" +checksum = "aa4ef4c35533df3f0c4e938cf6a831456ea563775bab799336f74331140c7665" dependencies = [ "bevy_app", "bevy_asset", @@ -513,9 +473,9 @@ dependencies = [ [[package]] name = "bevy_app" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d41731817993f92e4363dd3335558e779e290bc71eefc0b5547052b85810907e" +checksum = "8bce3544afc010ffed39c136f6d5a9322d20d38df1394d468ba9106caa0434cb" dependencies = [ "bevy_derive", "bevy_ecs", @@ -529,13 +489,13 @@ dependencies = [ [[package]] name = "bevy_asset" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "935984568f75867dd7357133b06f4b1502cd2be55e4642d483ce597e46e63bff" +checksum = "ac185d8e29c7eb0194f8aae7af3f7234f7ca7a448293be1d3d0d8fef435f65ec" dependencies = [ "async-broadcast", "async-fs", - "async-lock 2.8.0", + "async-lock", "bevy_app", "bevy_asset_macros", "bevy_ecs", @@ -548,7 +508,7 @@ dependencies = [ "crossbeam-channel", "downcast-rs", "futures-io", - "futures-lite 1.13.0", + "futures-lite", "js-sys", "notify-debouncer-full", "parking_lot 0.12.1", @@ -562,14 +522,14 @@ dependencies = [ [[package]] name = "bevy_asset_loader" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16930d3c6b4eee079843ce2bc6c5d845f0258c731417c46b86137b0532b7a297" +checksum = "504cac33f47bee039c0706c9c5baf72208e5bd515db3840dc0cf57fd857914f4" dependencies = [ "anyhow", "bevy", "bevy_asset_loader_derive", - "bevy_common_assets 0.8.0", + "bevy_common_assets", "iyes_progress", "path-slash", "serde", @@ -577,32 +537,32 @@ dependencies = [ [[package]] name = "bevy_asset_loader_derive" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a84e9bd698da11c39d933c61e5fcc098afb64508e07e77635be3a05de623b1d" +checksum = "adda0f1b91d2e34b132ea29a14dbe2adf273073c168950603ebddaf53a23947f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] name = "bevy_asset_macros" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f48b9bbe4ec605e4910b5cd1e1a0acbfbe0b80af5f3bcc4489a9fdd1e80058c" +checksum = "cb82d1aac8251378c45a8d0ad788d1bf75f54db28c1750f84f1fd7c00127927a" dependencies = [ "bevy_macro_utils", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] name = "bevy_atmosphere" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c533ea34c98b330f46235e6f3b522a9446cc5c379a41e6d2e574d8d1f97a65" +checksum = "c4cc7c8b7c8502d6e735944c177938a67a7fb0c8e069ab5f04a01bd1beb499b5" dependencies = [ "bevy", "bevy_atmosphere_macros", @@ -611,22 +571,22 @@ dependencies = [ [[package]] name = "bevy_atmosphere_macros" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f68c0aa6b4b15865131b6948ceee51ca86ab02a675ce26f908dbcaf4d012efbb" +checksum = "861782a376284786e25ccf67d0bcd39b540a9936da958e68da2e5cfec94e912c" dependencies = [ "bevy_macro_utils", - "proc-macro-crate 2.0.0", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] name = "bevy_audio" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a69889e1bfa4dbac4e641536b94f91c441da55796ad9832e77836b8264688b" +checksum = "f4fe7f952e5e0a343fbde43180db7b8e719ad78594480c91b26876623944a3a1" dependencies = [ "bevy_app", "bevy_asset", @@ -642,22 +602,9 @@ dependencies = [ [[package]] name = "bevy_common_assets" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9397adf1558aa3f08e20aa567538a7238b451362fc8c6b678d409c040c221799" -dependencies = [ - "anyhow", - "bevy", - "ron", - "serde", - "thiserror", -] - -[[package]] -name = "bevy_common_assets" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "966fc90b0126ee62bb7b93e4273da38a4fce7d1c48a1f6e94a8f558798be2543" +checksum = "17516cc66d8c00ea3fdba144d518c20f1a8d8c5a7d14af3642dc2488e4bdb3a6" dependencies = [ "anyhow", "bevy", @@ -669,9 +616,9 @@ dependencies = [ [[package]] name = "bevy_core" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3daa24502a14839509f02407bc7e48299fe84d260877de23b60662de0f4f4b6c" +checksum = "f7b1b340b8d08f48ecd51b97589d261f5023a7b073d25e300382c49146524103" dependencies = [ "bevy_app", "bevy_ecs", @@ -685,9 +632,9 @@ dependencies = [ [[package]] name = "bevy_core_pipeline" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b77c4fca6e90edbe2e72da7bc9aa7aed7dfdfded0920ae0a0c845f5e11084a" +checksum = "626a5aaadbdd69eae020c5856575d2d0113423ae1ae1351377e20956d940052c" dependencies = [ "bevy_app", "bevy_asset", @@ -707,20 +654,20 @@ dependencies = [ [[package]] name = "bevy_derive" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f484318350462c58ba3942a45a656c1fd6b6e484a6b6b7abc3a787ad1a51e500" +checksum = "028ae2a34678055185d7f1beebb1ebe6a8dcf3733e139e4ee1383a7f29ae8ba6" dependencies = [ "bevy_macro_utils", "quote", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] name = "bevy_diagnostic" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa38ca5967d335cc1006a0e0f1a86c350e2f15fd1878449f61d04cd57a7c4060" +checksum = "01a104acfdc5280accd01a3524810daf3bda72924e3da0c8a9ec816a57eef4e3" dependencies = [ "bevy_app", "bevy_core", @@ -728,35 +675,42 @@ dependencies = [ "bevy_log", "bevy_time", "bevy_utils", + "const-fnv1a-hash", "sysinfo", ] [[package]] name = "bevy_dolly" version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d6bfabdd6a55eac0fe32d6ffd6533c1a62d41ecaec7ffe1acad039f596dd10" +source = "git+https://github.com/rparrett/bevy_dolly/?branch=bevy-0.13#5b49c824946d83c249f9456a9a75a90044868863" dependencies = [ "bevy", - "bevy_math", - "bevy_transform", + "dolly", "leafwing-input-manager", ] +[[package]] +name = "bevy_dylib" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3b3b76f0d7a4da8f944e5316f2d2d2af3bbb40d87508355993ea69afbc9411c" +dependencies = [ + "bevy_internal", +] + [[package]] name = "bevy_ecs" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7709fbd22f81fb681534cd913c41e1cd18b17143368743281195d7f024b61aea" +checksum = "b85406d5febbbdbcac4444ef61cd9a816f2f025ed692a3fc5439a32153070304" dependencies = [ - "async-channel 1.9.0", + "async-channel", "bevy_ecs_macros", "bevy_ptr", "bevy_reflect", "bevy_tasks", "bevy_utils", "downcast-rs", - "event-listener 2.5.3", "fixedbitset", "rustc-hash", "serde", @@ -766,21 +720,21 @@ dependencies = [ [[package]] name = "bevy_ecs_macros" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8843aa489f159f25cdcd9fee75cd7d221a7098a71eaa72cb2d6b40ac4e3f1ba" +checksum = "9a3ce4b65d7c5f1990e729df75cec2ea6e2241b4a0c37b31c281a04c59c11b7b" dependencies = [ "bevy_macro_utils", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] name = "bevy_editor_pls" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1695be7e2e152a59f3e11a91c156328cd267466ffe6af6a7cbc1a0fb18679" +checksum = "2afbbc82539725daf424abafebdd8b0fcda4176711acff083730e6713f280f6e" dependencies = [ "bevy", "bevy_editor_pls_core", @@ -791,50 +745,51 @@ dependencies = [ [[package]] name = "bevy_editor_pls_core" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1fb9b98365e4bc1bde2e322ed2fa9d5093ed2f25d6d29e5f8d8ce1c606ab5c" +checksum = "6551ad00eb28c009463465958c3a01e890f89ccb74567d85e574e37eec56822e" dependencies = [ "bevy", "bevy-inspector-egui", "egui_dock", - "indexmap 2.2.2", + "indexmap", ] [[package]] name = "bevy_editor_pls_default_windows" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f927b2f498ff6866be74734cef60e2139b3d0744f372077aa07377fe33ae5c" +checksum = "22b46eb2c726264f328804d2435b5e49995509914e23e3eeb49846677977e9fa" dependencies = [ "bevy", "bevy-inspector-egui", "bevy_editor_pls_core", "bevy_mod_debugdump", "egui-gizmo", - "indexmap 2.2.2", + "indexmap", "opener", "pretty-type-name", ] [[package]] name = "bevy_egui" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c90c01202dbcebc03315a01ea71553b35e1f20b0da6b1cc8c2605344032a3d96" +checksum = "b84bfb8d4104a1467910cf2090bc6a6d394ebde39c0dbc02397b45aa9ef88e80" dependencies = [ "arboard", "bevy", "egui", "thread_local", + "web-sys", "webbrowser", ] [[package]] name = "bevy_encase_derive" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5328a3715e933ebbff07d0e99528dc423c4f7a53590ed1ac19a120348b028990" +checksum = "6c3d301922e76b16819e17c8cc43b34e92c13ccd06ad19dfa3e52a91a0e13e5c" dependencies = [ "bevy_macro_utils", "encase_derive_impl", @@ -842,9 +797,9 @@ dependencies = [ [[package]] name = "bevy_gilrs" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b81ca2ebf66cbc7f998f1f142b15038ffe3c4ae1d51f70adda26dcf51b0c4ca" +checksum = "96364a1875ee4545fcf825c78dc065ddb9a3b2a509083ef11142f9de0eb8aa17" dependencies = [ "bevy_app", "bevy_ecs", @@ -858,15 +813,17 @@ dependencies = [ [[package]] name = "bevy_gizmos" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db232274ddca2ae452eb2731b98267b795d133ddd14013121bc7daddde1c7491" +checksum = "bdca80b7b4db340eb666d69374a0195b3935759120d0b990fcef8b27d0fb3680" dependencies = [ "bevy_app", "bevy_asset", "bevy_core", "bevy_core_pipeline", "bevy_ecs", + "bevy_gizmos_macros", + "bevy_log", "bevy_math", "bevy_pbr", "bevy_reflect", @@ -876,13 +833,25 @@ dependencies = [ "bevy_utils", ] +[[package]] +name = "bevy_gizmos_macros" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a949eb8b4538a6e4d875321cda2b63dc0fb0317cf18c8245ca5a32f24f6d26d" +dependencies = [ + "bevy_macro_utils", + "proc-macro2", + "quote", + "syn 2.0.51", +] + [[package]] name = "bevy_gltf" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85adc6b1fc86687bf67149e0bafaa4d6da432232fa956472d1b37f19121d3ace" +checksum = "031d0c2a7c0353bb9ac08a5130e58b9a2de3cdaa3c31b5da00b22a9e4732a155" dependencies = [ - "base64 0.13.1", + "base64", "bevy_animation", "bevy_app", "bevy_asset", @@ -908,9 +877,8 @@ dependencies = [ [[package]] name = "bevy_gltf_blueprints" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f77935716f0bef8fd720587d0b7063526445a25bfdb21ffa861706a8493f5d4" +version = "0.8.0" +source = "git+https://github.com/kaosat-dev/Blender_bevy_components_workflow/?branch=bevy_main#453b0b5d5590cc152b751f6c48a411ec822afb5c" dependencies = [ "bevy", "bevy_gltf_components", @@ -918,8 +886,8 @@ dependencies = [ [[package]] name = "bevy_gltf_components" -version = "0.3.2" -source = "git+https://github.com/janhohenheim/Blender_bevy_components_workflow?rev=6313c2f695e9e64dbd797c45ef7d6402062094ca#6313c2f695e9e64dbd797c45ef7d6402062094ca" +version = "0.4.0" +source = "git+https://github.com/kaosat-dev/Blender_bevy_components_workflow/?branch=bevy_main#453b0b5d5590cc152b751f6c48a411ec822afb5c" dependencies = [ "bevy", "ron", @@ -928,15 +896,17 @@ dependencies = [ [[package]] name = "bevy_hanabi" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "127702dc9ccba4eb286c54b3307c0ff18d59b35e4de4e361d8e49fee3abe0b59" +checksum = "6f63879a7274ed0d629f7240b0acc4c262aca0276503bdc182552b0f69cba163" dependencies = [ "anyhow", "bevy", "bitflags 2.4.2", "bytemuck", "copyless", + "naga", + "naga_oil", "rand", "rand_pcg", "ron", @@ -947,9 +917,9 @@ dependencies = [ [[package]] name = "bevy_hierarchy" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06bd477152ce2ae1430f5e0a4f19216e5785c22fee1ab23788b5982dc59d1a55" +checksum = "a9f9f843e43d921f07658c24eae74285efc7a335c87998596f3f365155320c69" dependencies = [ "bevy_app", "bevy_core", @@ -957,14 +927,13 @@ dependencies = [ "bevy_log", "bevy_reflect", "bevy_utils", - "smallvec", ] [[package]] name = "bevy_input" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab9a599189b2a694c182d60cd52219dd9364f9892ff542d87799b8e45d9e6dc" +checksum = "a9cb5b2f3747ffb00cf7e3d6b52f7384476921cd31f0cfd3d1ddff31f83d9252" dependencies = [ "bevy_app", "bevy_ecs", @@ -972,14 +941,15 @@ dependencies = [ "bevy_reflect", "bevy_utils", "serde", + "smol_str", "thiserror", ] [[package]] name = "bevy_internal" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f124bece9831afd80897815231072d51bfe3ac58c6bb58eca8880963b6d0487c" +checksum = "7af89c7083830b1d65fcf0260c3d2537c397fe8ce871471b6e97198a4704f23e" dependencies = [ "bevy_a11y", "bevy_animation", @@ -1016,9 +986,9 @@ dependencies = [ [[package]] name = "bevy_kira_audio" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9678086759e54871faab0829592423492e19f8de5076127315cf892ae56f33" +checksum = "1bf58fed4b6fd13df35e77002821cf459948131de4ac262c3b6a175d8fe28fd3" dependencies = [ "anyhow", "bevy", @@ -1030,9 +1000,9 @@ dependencies = [ [[package]] name = "bevy_log" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc10ba1d225a8477b9e80a1bf797d8a8b8274e83c9b24fb4d9351aec9229755" +checksum = "cfd5bcc3531f8008897fb03cc8751b86d0d29ef94f8fd38b422f9603b7ae80d0" dependencies = [ "android_log-sys", "bevy_app", @@ -1048,41 +1018,41 @@ dependencies = [ [[package]] name = "bevy_macro_utils" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e566640c6b6dced73d2006c764c2cffebe1a82be4809486c4a5d7b4b50efed4d" +checksum = "ac4401c25b197e7c1455a4875a90b61bba047a9e8d290ce029082c818ab1a21c" dependencies = [ "proc-macro2", "quote", "rustc-hash", - "syn 2.0.48", - "toml_edit 0.20.2", + "syn 2.0.51", + "toml_edit 0.21.1", ] [[package]] name = "bevy_math" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ddc2b76783939c530178f88e5711a1b01044d7b02db4033e2eb8b43b6cf4ec" +checksum = "6f312b1b8aa6d3965b65040b08e33efac030db3071f20b44f9da9c4c3dfcaf76" dependencies = [ - "glam 0.24.2", + "glam", "serde", ] [[package]] name = "bevy_mikktspace" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ec4962977a746d870170532fc92759e04d3dbcae8b7b82e7ca3bb83b1d75277" +checksum = "3075c01f2b1799945892d5310fc1836e47c045dfe6af5878a304a475931a0c5f" dependencies = [ - "glam 0.24.2", + "glam", ] [[package]] name = "bevy_mod_debugdump" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4db8601f41ea570b7d32f3177292a608196c59bdf3298001a9e202d5e7439438" +checksum = "d39eb6372d6af22b209d68c10e3b742938b450117281387c94ce3f9f51902b76" dependencies = [ "bevy_app", "bevy_ecs", @@ -1095,34 +1065,33 @@ dependencies = [ [[package]] name = "bevy_mod_sysfail" -version = "5.0.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e12a8eb3047d9a84506ce630d44c9774a122259e79cd7f5e8d40837a7a82591" +checksum = "f1a58f0be698c10aab373413556a89e193a783a7241ed3ed5971330a284a7c3b" dependencies = [ "anyhow", + "bevy", "bevy_ecs", - "bevy_log", "bevy_mod_sysfail_macros", - "bevy_time", "bevy_utils", ] [[package]] name = "bevy_mod_sysfail_macros" -version = "4.2.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73fae27cbc3735ce397be4e089112c411b5cead6d0778b31b69e47df4ebffd37" +checksum = "595deba61fcc75116469575cec8abfa9ea2b74b905501daa6e34f0fa588f34d8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] name = "bevy_pbr" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520bfd2a898c74f84ea52cfb8eb061f37373ad15e623489d5f75d27ebd6138fe" +checksum = "c31c72bf12e50ff76c9ed9a7c51ceb88bfea9865d00f24d95b12344fffe1e270" dependencies = [ "bevy_app", "bevy_asset", @@ -1138,7 +1107,6 @@ dependencies = [ "bitflags 2.4.2", "bytemuck", "fixedbitset", - "naga_oil", "radsort", "smallvec", "thread_local", @@ -1146,47 +1114,45 @@ dependencies = [ [[package]] name = "bevy_ptr" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ec20c8fafcdc196508ef5ccb4f0400a8d193cb61f7b14a36ed9a25ad423cf" +checksum = "86afa4a88ee06b10fe1e6f28a796ba2eedd16804717cbbb911df0cbb0cd6677b" [[package]] name = "bevy_reflect" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7921f15fc944c9c8ad01d7dbcea6505b8909c6655cd9382bab1407181556038" +checksum = "133dfab8d403d0575eeed9084e85780bbb449dcf75dd687448439117789b40a2" dependencies = [ "bevy_math", "bevy_ptr", "bevy_reflect_derive", "bevy_utils", "downcast-rs", - "erased-serde 0.3.31", - "glam 0.24.2", + "erased-serde", + "glam", "serde", - "smallvec", "smol_str", "thiserror", ] [[package]] name = "bevy_reflect_derive" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a8c5475f216e751ef4452a1306b00711f33d2d04d9f149e4c845dfeb6753a0" +checksum = "ce1679a4dfdb2c9ff24ca590914c3cec119d7c9e1b56fa637776913acc030386" dependencies = [ "bevy_macro_utils", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", "uuid 1.7.0", ] [[package]] name = "bevy_registry_export" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f94f17b5f98e27decb819e1ebcdf0853338abd06a08a1f3b3d7797d3270c1434" +version = "0.2.0" +source = "git+https://github.com/kaosat-dev/Blender_bevy_components_workflow/?branch=bevy_main#453b0b5d5590cc152b751f6c48a411ec822afb5c" dependencies = [ "bevy", "bevy_app", @@ -1197,11 +1163,11 @@ dependencies = [ [[package]] name = "bevy_render" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdefdd3737125b0d94a6ff20bb70fa8cfe9d7d5dcd72ba4dfe6c5f1d30d9f6e4" +checksum = "d3b194b7029b7541ef9206ac3cb696d3cb37f70bd3260d293fc00d378547e892" dependencies = [ - "async-channel 1.9.0", + "async-channel", "bevy_app", "bevy_asset", "bevy_core", @@ -1224,7 +1190,7 @@ dependencies = [ "codespan-reporting", "downcast-rs", "encase", - "futures-lite 1.13.0", + "futures-lite", "hexasphere", "image", "js-sys", @@ -1234,7 +1200,6 @@ dependencies = [ "profiling", "ruzstd", "serde", - "smallvec", "thiserror", "thread_local", "wasm-bindgen", @@ -1244,21 +1209,21 @@ dependencies = [ [[package]] name = "bevy_render_macros" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d86bfc5a1e7fbeeaec0c4ceab18155530f5506624670965db3415f75826bea" +checksum = "4aa6d99b50375bb7f63be2c3055dfe2f926f7b3c4db108bb0b1181b4f02766aa" dependencies = [ "bevy_macro_utils", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] name = "bevy_scene" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7df078b5e406e37c8a1c6ba0d652bf105fde713ce3c3efda7263fe27467eee5" +checksum = "2c3c82eaff0b22949183a75a7e2d7fc4ece808235918b34c5b282aab52c3563a" dependencies = [ "bevy_app", "bevy_asset", @@ -1269,7 +1234,6 @@ dependencies = [ "bevy_render", "bevy_transform", "bevy_utils", - "ron", "serde", "thiserror", "uuid 1.7.0", @@ -1277,9 +1241,9 @@ dependencies = [ [[package]] name = "bevy_sprite" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7cc0c9d946e17e3e0aaa202f182837bc796c4f862b2e5a805134f873f21cf7f" +checksum = "5ea977d7d7c48fc4ba283d449f09528c4e70db17c9048e32e99ecd9890d72223" dependencies = [ "bevy_app", "bevy_asset", @@ -1303,23 +1267,23 @@ dependencies = [ [[package]] name = "bevy_tasks" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fefa7fe0da8923525f7500e274f1bd60dbd79918a25cf7d0dfa0a6ba15c1cf" +checksum = "b20f243f6fc4c4ba10c2dbff891e947ddae947bb20b263f43e023558b35294bd" dependencies = [ - "async-channel 1.9.0", + "async-channel", "async-executor", "async-task", "concurrent-queue", - "futures-lite 1.13.0", + "futures-lite", "wasm-bindgen-futures", ] [[package]] name = "bevy_text" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a9a79d49ca06170d69149949b134c14e8b99ace1444c1ca2cd4743b19d5b055" +checksum = "006990d27551dbc339774178e833290952511621662fd5ca23a4e6e922ab2d9f" dependencies = [ "ab_glyph", "bevy_app", @@ -1339,9 +1303,9 @@ dependencies = [ [[package]] name = "bevy_time" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6250d76eed3077128b6a3d004f9f198b01107800b9824051e32bb658054e837" +checksum = "9738901b6b251d2c9250542af7002d6f671401fc3b74504682697c5ec822f210" dependencies = [ "bevy_app", "bevy_ecs", @@ -1354,9 +1318,9 @@ dependencies = [ [[package]] name = "bevy_transform" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d541e0c292edbd96afae816ee680e02247422423ccd5dc635c1e211a20ed64be" +checksum = "ba73744a95bc4b8683e91cea3e79b1ad0844c1d677f31fbbc1814c79a5b4f8f0" dependencies = [ "bevy_app", "bevy_ecs", @@ -1369,9 +1333,9 @@ dependencies = [ [[package]] name = "bevy_ui" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d785e3b75dabcb2a8ad0d50933f8f3446d59e512cabc2d2a145e28c2bb8792ba" +checksum = "fafe872906bac6d7fc8ecff166f56b4253465b2895ed88801499aa113548ccc6" dependencies = [ "bevy_a11y", "bevy_app", @@ -1392,45 +1356,45 @@ dependencies = [ "bevy_window", "bytemuck", "serde", - "smallvec", "taffy", "thiserror", ] [[package]] name = "bevy_utils" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7915222f4a08ccc782e08d10b751b42e5f9d786e697d0cb3fd09333cb7e8b6ea" +checksum = "94a06aca1c1863606416b892f4c79e300dbc6211b6690953269051a431c2cca0" dependencies = [ "ahash", "bevy_utils_proc_macros", "getrandom", - "hashbrown 0.14.3", - "instant", + "hashbrown", "nonmax", "petgraph", + "smallvec", "thiserror", "tracing", "uuid 1.7.0", + "web-time", ] [[package]] name = "bevy_utils_proc_macros" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aafecc952b6b8eb1a93c12590bd867d25df2f4ae1033a01dfdfc3c35ebccfff" +checksum = "31ae98e9c0c08b0f5c90e22cd713201f759b98d4fd570b99867a695f8641859a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] name = "bevy_window" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ee72bf7f974000e9b31bb971a89387f1432ba9413f35c4fef59fef49767260" +checksum = "cb627efd7622a61398ac0d3674f93c997cffe16f13c59fb8ae8a05c9e28de961" dependencies = [ "bevy_a11y", "bevy_app", @@ -1439,15 +1403,16 @@ dependencies = [ "bevy_math", "bevy_reflect", "bevy_utils", - "raw-window-handle", + "raw-window-handle 0.6.0", "serde", + "smol_str", ] [[package]] name = "bevy_winit" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eb71f287eca9006dda998784c7b931e400ae2cc4c505da315882a8b082f21ad" +checksum = "55105324a201941ae587790f83f6d9caa327e0baa0205558ec41e5ee05a1f703" dependencies = [ "accesskit_winit", "approx", @@ -1462,7 +1427,7 @@ dependencies = [ "bevy_utils", "bevy_window", "crossbeam-channel", - "raw-window-handle", + "raw-window-handle 0.6.0", "wasm-bindgen", "web-sys", "winit", @@ -1470,17 +1435,17 @@ dependencies = [ [[package]] name = "bevy_xpbd_3d" -version = "0.3.3" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35590e6cb2860b6a548a37e776dd36ae1aee5c669169caa130f0038a0453ade2" +checksum = "0425ea7361b9b27c2a382e0663deb42f41147eee60fb2b3d5fa7e42d363ea848" dependencies = [ "bevy", + "bevy_math", "bevy_xpbd_derive", "derive_more", "fxhash", - "glam 0.24.2", - "indexmap 2.2.2", - "itertools 0.11.0", + "indexmap", + "itertools 0.12.1", "nalgebra", "parry3d", "parry3d-f64", @@ -1493,21 +1458,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e1ef1d5e328abe1b76df974245f78e17fd17867583883d5e77444c6a8223a64" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] name = "bevy_yarnspinner" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a117ba3dac0bef4cc8372163c70e5c3fcf247dde52cda570564d962779fdba6" +checksum = "b31a28cad3a545ebcac1347e107e06c6bc81228841fe1b60d94db82c6e6d31ad" dependencies = [ "anyhow", "bevy", "csv", "glob", "rand", - "seldom_fn_plugin", "serde", "sha2", "yarnspinner", @@ -1515,34 +1479,33 @@ dependencies = [ [[package]] name = "bevy_yarnspinner_example_dialogue_view" -version = "0.1.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f6d2aa6957df8157ce24cb44b1fe47c0e451b90f887fb13e013fbbd95fc309b" +checksum = "79ef048b716e03413534048f307310d39783659755bceb4b7f9f8360c1c67581" dependencies = [ "bevy", "bevy_yarnspinner", - "seldom_fn_plugin", "unicode-segmentation", ] [[package]] name = "bindgen" -version = "0.69.2" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c69fae65a523209d34240b60abe0c42d33d1045d445c0839d8a4894a736e2d" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ "bitflags 2.4.2", "cexpr", "clang-sys", + "itertools 0.12.1", "lazy_static", "lazycell", - "peeking_take_while", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] @@ -1609,7 +1572,16 @@ version = "0.1.0-beta.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146" dependencies = [ - "objc-sys", + "objc-sys 0.2.0-beta.2", +] + +[[package]] +name = "block-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" +dependencies = [ + "objc-sys 0.3.2", ] [[package]] @@ -1618,8 +1590,18 @@ version = "0.2.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42" dependencies = [ - "block-sys", - "objc2-encode", + "block-sys 0.1.0-beta.1", + "objc2-encode 2.0.0-pre.2", +] + +[[package]] +name = "block2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +dependencies = [ + "block-sys 0.2.1", + "objc2 0.4.1", ] [[package]] @@ -1628,21 +1610,21 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ - "async-channel 2.1.1", - "async-lock 3.3.0", + "async-channel", + "async-lock", "async-task", - "fastrand 2.0.1", + "fastrand", "futures-io", - "futures-lite 2.2.0", + "futures-lite", "piper", "tracing", ] [[package]] name = "bstr" -version = "1.9.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", "regex-automata 0.4.5", @@ -1651,15 +1633,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" [[package]] name = "bytemuck" -version = "1.14.1" +version = "1.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed2490600f404f2b94c167e31d3ed1d5f3c225a0f3b80230053b3e0b7b962bd9" +checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" dependencies = [ "bytemuck_derive", ] @@ -1672,7 +1654,7 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] @@ -1687,13 +1669,26 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +[[package]] +name = "calloop" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" +dependencies = [ + "bitflags 2.4.2", + "log", + "polling", + "rustix", + "slab", + "thiserror", +] + [[package]] name = "cc" -version = "1.0.83" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" dependencies = [ - "jobserver", "libc", ] @@ -1737,13 +1732,11 @@ dependencies = [ [[package]] name = "clipboard-win" -version = "4.5.0" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" +checksum = "12f9a0700e0127ba15d1d52dd742097f821cd9c65939303a44d970465040a297" dependencies = [ "error-code", - "str-buf", - "winapi", ] [[package]] @@ -1763,10 +1756,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] -name = "com-rs" -version = "0.2.1" +name = "com" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" +checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6" +dependencies = [ + "com_macros", +] + +[[package]] +name = "com_macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" +dependencies = [ + "com_macros_support", + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "com_macros_support" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] name = "combine" @@ -1797,6 +1815,12 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "const-fnv1a-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b13ea120a812beba79e34316b3942a857c86ec1593cb34f27bb28272ce2cca" + [[package]] name = "const_panic" version = "0.2.8" @@ -1854,14 +1878,14 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" -version = "0.22.3" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" dependencies = [ "bitflags 1.3.2", "core-foundation", "core-graphics-types", - "foreign-types 0.3.2", + "foreign-types", "libc", ] @@ -1910,7 +1934,7 @@ dependencies = [ "js-sys", "libc", "mach2", - "ndk", + "ndk 0.7.0", "ndk-context", "oboe", "once_cell", @@ -1932,9 +1956,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] @@ -2004,11 +2028,17 @@ dependencies = [ "memchr", ] +[[package]] +name = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + [[package]] name = "d3d12" -version = "0.7.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20" +checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307" dependencies = [ "bitflags 2.4.2", "libloading 0.8.1", @@ -2064,7 +2094,25 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", +] + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.1", +] + +[[package]] +name = "dolly" +version = "0.4.2" +source = "git+https://github.com/janhohenheim/dolly?branch=bevy-0.13#35292c650677456839fb616b84f7da544065e403" +dependencies = [ + "bevy_math", + "bevy_transform", ] [[package]] @@ -2085,18 +2133,18 @@ dependencies = [ [[package]] name = "ecolor" -version = "0.24.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b7637fc2e74d17e52931bac90ff4fc061ac776ada9c7fa272f24cdca5991972" +checksum = "03cfe80b1890e1a8cdbffc6044d6872e814aaf6011835a2a5e2db0e5c5c4ef4e" dependencies = [ "bytemuck", ] [[package]] name = "egui" -version = "0.24.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55bcb864b764eb889515a38b8924757657a250738ad15126637ee2df291ee6b" +checksum = "180f595432a5b615fc6b74afef3955249b86cfea72607b40740a4cd60d5297d0" dependencies = [ "ahash", "epaint", @@ -2105,20 +2153,20 @@ dependencies = [ [[package]] name = "egui-gizmo" -version = "0.13.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2880830f1b9a0ea618472c989e7ee758f9abc54352846e4feab1be278e69316b" +checksum = "2cdd96a8bc62d5a7dbc03fe08db7bb44b50ac4167c2620d482530d9af6e27634" dependencies = [ "egui", - "glam 0.24.2", + "glam", "mint", ] [[package]] name = "egui_dock" -version = "0.9.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246a6cbf38560cdcf75f955b1f2f39be6339a3f2958d06997ce70b7b4aa3f57d" +checksum = "d14beb118bc4d114bb875f14d1d437736be7010939cedf60c9ee002d7d02d09f" dependencies = [ "duplicate", "egui", @@ -2127,15 +2175,15 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "emath" -version = "0.24.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a045c6c0b44b35e98513fc1e9d183ab42881ac27caccb9fa345465601f56cce4" +checksum = "6916301ecf80448f786cdf3eb51d9dbdd831538732229d49119e2d4312eaaf09" dependencies = [ "bytemuck", ] @@ -2156,34 +2204,34 @@ dependencies = [ [[package]] name = "encase" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fce2eeef77fd4a293a54b62aa00ac9daebfbcda4bf8998c5a815635b004aa1c" +checksum = "95ed933078d2e659745df651f4c180511cd582e5b9414ff896e7d50d207e3103" dependencies = [ "const_panic", "encase_derive", - "glam 0.24.2", + "glam", "thiserror", ] [[package]] name = "encase_derive" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e520cde08cbf4f7cc097f61573ec06ce467019803de8ae82fb2823fa1554a0e" +checksum = "f4ce1449c7d19eba6cc0abd231150ad81620a8dce29601d7f8d236e5d431d72a" dependencies = [ "encase_derive_impl", ] [[package]] name = "encase_derive_impl" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fe2568f851fd6144a45fa91cfed8fe5ca8fc0b56ba6797bfc1ed2771b90e37c" +checksum = "92959a9e8d13eaa13b8ae8c7b583c3bf1669ca7a8e7708a088d12587ba86effc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] @@ -2197,9 +2245,9 @@ dependencies = [ [[package]] name = "epaint" -version = "0.24.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d1b9e000d21bab9b535ce78f9f7745be28b3f777f6c7223936561c5c7fefab8" +checksum = "77b9fdf617dd7f58b0c8e6e9e4a1281f730cde0831d40547da446b2bb76a47af" dependencies = [ "ab_glyph", "ahash", @@ -2218,31 +2266,28 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "erased-serde" -version = "0.3.31" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" +checksum = "388979d208a049ffdfb22fa33b9c81942215b940910bccfe258caeb25d125cb3" dependencies = [ "serde", ] [[package]] -name = "erased-serde" -version = "0.4.2" +name = "errno" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55d05712b2d8d88102bc9868020c9e5c7a1f5527c452b9b97450a1d006140ba7" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "serde", + "libc", + "windows-sys 0.52.0", ] [[package]] name = "error-code" -version = "2.3.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] +checksum = "26a147e1a6641a55d994b3e4e9fa4d9b180c8d652c09b363af8c9bf1b8e04139" [[package]] name = "euclid" @@ -2270,6 +2315,17 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "event-listener" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7ad6fd685ce13acd6d9541a30f6db6567a7a24c9ffd4ba2955d29e3f22c8b27" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + [[package]] name = "event-listener-strategy" version = "0.4.0" @@ -2281,12 +2337,13 @@ dependencies = [ ] [[package]] -name = "fastrand" -version = "1.9.0" +name = "event-listener-strategy" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" dependencies = [ - "instant", + "event-listener 5.1.0", + "pin-project-lite", ] [[package]] @@ -2359,15 +2416,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared 0.1.1", -] - [[package]] name = "foreign-types" version = "0.5.0" @@ -2375,7 +2423,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" dependencies = [ "foreign-types-macros", - "foreign-types-shared 0.3.1", + "foreign-types-shared", ] [[package]] @@ -2386,15 +2434,9 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", ] -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "foreign-types-shared" version = "0.3.1" @@ -2412,7 +2454,7 @@ dependencies = [ [[package]] name = "foxtrot" -version = "0.4.0" +version = "0.5.0" dependencies = [ "anyhow", "bevy", @@ -2420,7 +2462,7 @@ dependencies = [ "bevy-tnua-xpbd3d", "bevy_asset_loader", "bevy_atmosphere", - "bevy_common_assets 0.9.0", + "bevy_common_assets", "bevy_dolly", "bevy_editor_pls", "bevy_egui", @@ -2437,7 +2479,6 @@ dependencies = [ "iyes_progress", "leafwing-input-manager", "oxidized_navigation", - "seldom_fn_plugin", "serde", "warbler_grass", "winit", @@ -2464,28 +2505,13 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - [[package]] name = "futures-lite" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" dependencies = [ - "fastrand 2.0.1", + "fastrand", "futures-core", "futures-io", "parking", @@ -2513,12 +2539,12 @@ dependencies = [ [[package]] name = "gethostname" -version = "0.3.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" dependencies = [ "libc", - "winapi", + "windows-targets 0.48.5", ] [[package]] @@ -2569,21 +2595,14 @@ dependencies = [ ] [[package]] -name = "gimli" -version = "0.28.1" +name = "gl_generator" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "glam" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" dependencies = [ - "approx", - "bytemuck", - "mint", - "serde", + "khronos_api", + "log", + "xml-rs", ] [[package]] @@ -2592,7 +2611,9 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3" dependencies = [ + "bytemuck", "mint", + "serde", ] [[package]] @@ -2603,9 +2624,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "glow" -version = "0.12.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" dependencies = [ "js-sys", "slotmap", @@ -2634,7 +2655,7 @@ dependencies = [ "inflections", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] @@ -2649,6 +2670,15 @@ dependencies = [ "serde_json", ] +[[package]] +name = "glutin_wgl_sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +dependencies = [ + "gl_generator", +] + [[package]] name = "glyph_brush_layout" version = "0.2.3" @@ -2681,15 +2711,15 @@ dependencies = [ [[package]] name = "gpu-allocator" -version = "0.22.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8" +checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" dependencies = [ - "backtrace", "log", + "presser", "thiserror", "winapi", - "windows 0.44.0", + "windows 0.52.0", ] [[package]] @@ -2700,7 +2730,7 @@ checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" dependencies = [ "bitflags 2.4.2", "gpu-descriptor-types", - "hashbrown 0.14.3", + "hashbrown", ] [[package]] @@ -2728,12 +2758,6 @@ dependencies = [ "svg_fmt", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "hashbrown" version = "0.14.3" @@ -2747,14 +2771,14 @@ dependencies = [ [[package]] name = "hassle-rs" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" +checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" dependencies = [ - "bitflags 1.3.2", - "com-rs", + "bitflags 2.4.2", + "com", "libc", - "libloading 0.7.4", + "libloading 0.8.1", "thiserror", "widestring", "winapi", @@ -2768,12 +2792,12 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hexasphere" -version = "9.1.0" +version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cb3df16a7bcb1b5bc092abd55e14f77ca70aea14445026e264586fc62889a10" +checksum = "f33ddb7f7143d9e703c072e88b98cd8b9719f174137a671429351bd2ee43c02a" dependencies = [ "constgebra", - "glam 0.24.2", + "glam", ] [[package]] @@ -2791,6 +2815,17 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "icrate" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" +dependencies = [ + "block2 0.3.0", + "dispatch", + "objc2 0.4.1", +] + [[package]] name = "icu_locid" version = "1.4.0" @@ -2871,7 +2906,7 @@ checksum = "d2abdd3a62551e8337af119c5899e600ca0c88ec8f23a46c60ba216c803dcf1a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] @@ -2886,9 +2921,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.8" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" dependencies = [ "bytemuck", "byteorder", @@ -2901,22 +2936,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.3" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" +checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown", ] [[package]] @@ -3010,9 +3035,9 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "iyes_progress" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ed260fda0df8ed859329f221a5eb24175d38fd7d10f586cf6468574e6385b79" +checksum = "66f07a423129ef5aa4a0fb0c5b28ca64622df06ee580977d20ca408dfebdd89e" dependencies = [ "bevy_app", "bevy_ecs", @@ -3069,15 +3094,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" -[[package]] -name = "jobserver" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" -dependencies = [ - "libc", -] - [[package]] name = "jpeg-decoder" version = "0.3.1" @@ -3086,24 +3102,30 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.67" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" dependencies = [ "wasm-bindgen", ] [[package]] name = "khronos-egl" -version = "4.1.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.7.4", + "libloading 0.8.1", "pkg-config", ] +[[package]] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + [[package]] name = "kira" version = "0.8.7" @@ -3112,7 +3134,7 @@ checksum = "8968f1eda49cdf4f6406fd5ffe590c3ca2778a1b0e50b5684974b138a99dfb2f" dependencies = [ "atomic-arena", "cpal", - "glam 0.25.0", + "glam", "mint", "ringbuf", "send_wrapper", @@ -3162,30 +3184,28 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "leafwing-input-manager" -version = "0.11.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e0ad1622a1664b055990aac9efd90a9012b82737847e6a85d36ce38d2bf7c4" +checksum = "def515aa1461ed6ed5d55d53cea6c7149a3076c331cfea1d920682884bfaf839" dependencies = [ "bevy", + "bevy_egui", "derive_more", - "fixedbitset", "itertools 0.12.1", "leafwing_input_manager_macros", - "multimap", - "once_cell", "serde", ] [[package]] name = "leafwing_input_manager_macros" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde8ae98d45607e4015d0b772d4a234788ebd7a41f09879f408c7f772b81e5bf" +checksum = "5d065e4f0771d9cc597e76d648da18476ad01fd50cd60ee585ee500f9cd8d696" dependencies = [ - "proc-macro-crate 2.0.0", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] @@ -3252,6 +3272,12 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + [[package]] name = "litemap" version = "0.7.2" @@ -3317,25 +3343,16 @@ version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - [[package]] name = "metal" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "623b5e6cefd76e58f774bd3cc0c6f5c7615c58c03a97815245a25c3c9bdee318" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" dependencies = [ "bitflags 2.4.2", "block", "core-graphics-types", - "foreign-types 0.5.0", + "foreign-types", "log", "objc", "paste", @@ -3349,9 +3366,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", "simd-adler32", @@ -3375,15 +3392,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "multimap" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1a5d38b9b352dbd913288736af36af41c48d61b1a8cd34bcecd727561b7d511" -dependencies = [ - "serde", -] - [[package]] name = "murmur3" version = "0.4.1" @@ -3395,15 +3403,15 @@ dependencies = [ [[package]] name = "naga" -version = "0.13.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ceaaa4eedaece7e4ec08c55c640ba03dbb73fb812a6570a59bcf1930d0f70e" +checksum = "8878eb410fc90853da3908aebfe61d73d26d4437ef850b70050461f939509899" dependencies = [ "bit-set", "bitflags 2.4.2", "codespan-reporting", "hexf-parse", - "indexmap 1.9.3", + "indexmap", "log", "num-traits", "pp-rs", @@ -3416,18 +3424,18 @@ dependencies = [ [[package]] name = "naga_oil" -version = "0.10.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac54c77b3529887f9668d3dd81e955e58f252b31a333f836e3548c06460b958" +checksum = "c0ea62ae0f2787456afca7209ca180522b41f00cbe159ee369eba1e07d365cd1" dependencies = [ "bit-set", "codespan-reporting", "data-encoding", - "indexmap 1.9.3", + "indexmap", "naga", "once_cell", "regex", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", "rustc-hash", "thiserror", "tracing", @@ -3436,12 +3444,12 @@ dependencies = [ [[package]] name = "nalgebra" -version = "0.32.3" +version = "0.32.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa" +checksum = "4541eb06dce09c0241ebbaab7102f0a01a0c8994afed2e5d0d66775016e25ac2" dependencies = [ "approx", - "glam 0.24.2", + "glam", "matrixmultiply", "nalgebra-macros", "num-complex", @@ -3470,9 +3478,24 @@ checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" dependencies = [ "bitflags 1.3.2", "jni-sys", - "ndk-sys", + "ndk-sys 0.4.1+23.1.7779620", "num_enum 0.5.11", - "raw-window-handle", + "raw-window-handle 0.5.2", + "thiserror", +] + +[[package]] +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.4.2", + "jni-sys", + "log", + "ndk-sys 0.5.0+25.2.9519653", + "num_enum 0.7.2", + "raw-window-handle 0.6.0", "thiserror", ] @@ -3492,26 +3515,23 @@ dependencies = [ ] [[package]] -name = "nix" -version = "0.24.3" +name = "ndk-sys" +version = "0.5.0+25.2.9519653" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", + "jni-sys", ] [[package]] name = "nix" -version = "0.26.4" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "memoffset", ] [[package]] @@ -3549,11 +3569,11 @@ checksum = "610a5acd306ec67f907abe5567859a3c693fb9886eb1f012ab8f2a47bef3db51" [[package]] name = "normpath" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec60c60a693226186f5d6edf073232bfb6464ed97eb22cf3b01c1e8198fd97f5" +checksum = "5831952a9476f2fed74b77d74182fa5ddc4d21c72ec45a333b250e3ed0272804" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3610,9 +3630,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" dependencies = [ "num-traits", ] @@ -3630,22 +3650,21 @@ dependencies = [ [[package]] name = "num-derive" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] @@ -3662,9 +3681,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -3681,11 +3700,11 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.6.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ - "num_enum_derive 0.6.1", + "num_enum_derive 0.7.2", ] [[package]] @@ -3702,14 +3721,14 @@ dependencies = [ [[package]] name = "num_enum_derive" -version = "0.6.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] @@ -3739,15 +3758,31 @@ version = "0.2.0-beta.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" +[[package]] +name = "objc-sys" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c71324e4180d0899963fc83d9d241ac39e699609fc1025a850aadac8257459" + [[package]] name = "objc2" version = "0.3.0-beta.3.patch-leaks.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468" dependencies = [ - "block2", - "objc-sys", - "objc2-encode", + "block2 0.2.0-alpha.6", + "objc-sys 0.2.0-beta.2", + "objc2-encode 2.0.0-pre.2", +] + +[[package]] +name = "objc2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +dependencies = [ + "objc-sys 0.3.2", + "objc2-encode 3.0.0", ] [[package]] @@ -3756,9 +3791,15 @@ version = "2.0.0-pre.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" dependencies = [ - "objc-sys", + "objc-sys 0.2.0-beta.2", ] +[[package]] +name = "objc2-encode" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" + [[package]] name = "objc_exception" version = "0.1.2" @@ -3777,15 +3818,6 @@ dependencies = [ "objc", ] -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - [[package]] name = "oboe" version = "0.5.0" @@ -3793,7 +3825,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0" dependencies = [ "jni 0.20.0", - "ndk", + "ndk 0.7.0", "ndk-context", "num-derive 0.3.3", "num-traits", @@ -3861,9 +3893,9 @@ dependencies = [ [[package]] name = "oxidized_navigation" -version = "0.8.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb4ab0ab1cad97fbd83f85969f3ece1bba243e164444c459fd28aa302785c80c" +checksum = "fd569fb138ea821ad58311677ef27efcd9f10cb02bf46242111e912e20e2cddb" dependencies = [ "bevy", "bevy_xpbd_3d", @@ -3938,7 +3970,7 @@ dependencies = [ "downcast-rs", "either", "nalgebra", - "num-derive 0.4.1", + "num-derive 0.4.2", "num-traits", "rayon", "rustc-hash", @@ -3960,7 +3992,7 @@ dependencies = [ "downcast-rs", "either", "nalgebra", - "num-derive 0.4.1", + "num-derive 0.4.2", "num-traits", "rayon", "rustc-hash", @@ -3982,12 +4014,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42" -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "percent-encoding" version = "2.3.1" @@ -4001,7 +4027,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.2.2", + "indexmap", ] [[package]] @@ -4017,21 +4043,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand", "futures-io", ] [[package]] name = "pkg-config" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "png" -version = "0.17.11" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -4040,6 +4066,20 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "polling" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "pp-rs" version = "0.2.1" @@ -4055,6 +4095,12 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "presser" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" + [[package]] name = "pretty-type-name" version = "1.0.1" @@ -4073,11 +4119,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "2.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "toml_edit 0.20.2", + "toml_edit 0.21.1", ] [[package]] @@ -4115,9 +4161,9 @@ dependencies = [ [[package]] name = "profiling" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0f7f43585c34e4fdd7497d746bc32e14458cf11c69341cc0587b1d825dde42" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" dependencies = [ "profiling-procmacros", "tracing", @@ -4125,12 +4171,12 @@ dependencies = [ [[package]] name = "profiling-procmacros" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce97fecd27bc49296e5e20518b5a1bb54a14f7d5fe6228bc9686ee2a74915cc8" +checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] @@ -4153,7 +4199,7 @@ dependencies = [ "itertools 0.11.0", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] @@ -4222,6 +4268,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" +[[package]] +name = "raw-window-handle" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" + [[package]] name = "rawpointer" version = "0.2.1" @@ -4319,12 +4371,6 @@ version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" -[[package]] -name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - [[package]] name = "regex-syntax" version = "0.8.2" @@ -4368,18 +4414,12 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ - "base64 0.21.7", + "base64", "bitflags 2.4.2", "serde", "serde_derive", ] -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - [[package]] name = "rustc-hash" version = "1.1.0" @@ -4395,6 +4435,19 @@ dependencies = [ "semver", ] +[[package]] +name = "rustix" +version = "0.38.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +dependencies = [ + "bitflags 2.4.2", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + [[package]] name = "rustversion" version = "1.0.14" @@ -4403,20 +4456,20 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ruzstd" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc" +checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d" dependencies = [ "byteorder", - "thiserror-core", + "derive_more", "twox-hash", ] [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "safe_arch" @@ -4442,20 +4495,11 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "seldom_fn_plugin" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9243595906f96e24fad2c31aea29a560aaf82e86c051836e5708bf9d300048e" -dependencies = [ - "bevy", -] - [[package]] name = "semver" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "send_wrapper" @@ -4465,29 +4509,29 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] name = "serde_json" -version = "1.0.113" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -4590,7 +4634,7 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61addf9117b11d1f5b4bf6fe94242ba25f59d2d4b2080544b771bd647024fd00" dependencies = [ - "hashbrown 0.14.3", + "hashbrown", "num-traits", "robust", "smallvec", @@ -4598,12 +4642,11 @@ dependencies = [ [[package]] name = "spirv" -version = "0.2.0+1.5.4" +version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 1.3.2", - "num-traits", + "bitflags 2.4.2", ] [[package]] @@ -4618,12 +4661,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "str-buf" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - [[package]] name = "strum" version = "0.26.1" @@ -4640,7 +4677,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] @@ -4733,9 +4770,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "6ab617d94515e94ae53b8406c628598680aa0c9587474ecbe58188f7b345d66c" dependencies = [ "proc-macro2", "quote", @@ -4750,21 +4787,21 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] name = "sysinfo" -version = "0.29.11" +version = "0.30.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" +checksum = "1fb4f3438c8f6389c864e61221cbc97e9bca98b4daf39a5beb7bea660f528bb2" dependencies = [ "cfg-if", "core-foundation-sys", "libc", "ntapi", "once_cell", - "winapi", + "windows 0.52.0", ] [[package]] @@ -4790,49 +4827,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] -[[package]] -name = "thiserror-core" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c001ee18b7e5e3f62cbf58c7fe220119e68d902bb7443179c0c8aef30090e999" -dependencies = [ - "thiserror-core-impl", -] - -[[package]] -name = "thiserror-core-impl" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c60d69f36615a077cc7663b9cb8e42275722d23e58a7fa3d2c7f2915d09d04" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -4877,14 +4894,14 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.8.2" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.20.2", + "toml_edit 0.22.6", ] [[package]] @@ -4902,22 +4919,33 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.2", + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.20.2" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" dependencies = [ - "indexmap 2.2.2", + "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.2", ] [[package]] @@ -4939,7 +4967,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] @@ -5054,11 +5082,11 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typetag" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43148481c7b66502c48f35b8eef38b6ccdc7a9f04bd4cc294226d901ccc9bc7" +checksum = "661d18414ec032a49ece2d56eee03636e43c4e8d577047ab334c0ba892e29aaf" dependencies = [ - "erased-serde 0.4.2", + "erased-serde", "inventory", "once_cell", "serde", @@ -5067,13 +5095,13 @@ dependencies = [ [[package]] name = "typetag-impl" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291db8a81af4840c10d636e047cac67664e343be44e24dfdbd1492df9a5d3390" +checksum = "ac73887f47b9312552aa90ef477927ff014d63d1920ca8037c6c1951eab64bb1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] @@ -5090,18 +5118,18 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" @@ -5181,12 +5209,6 @@ dependencies = [ "libc", ] -[[package]] -name = "waker-fn" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" - [[package]] name = "walkdir" version = "2.4.0" @@ -5200,8 +5222,7 @@ dependencies = [ [[package]] name = "warbler_grass" version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "378327eb9556daf8ef9a81e610145508948842c63ce8dd032a209918a0c41765" +source = "git+https://github.com/EmiOnGit/warbler_grass?branch=75-update-to-bevy-013#ee9590092a99a2285d222296eb77ab60f5e43340" dependencies = [ "bevy", "bitflags 2.4.2", @@ -5216,9 +5237,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5226,24 +5247,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" +checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" dependencies = [ "cfg-if", "js-sys", @@ -5253,9 +5274,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5263,39 +5284,38 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] -name = "wayland-scanner" -version = "0.29.5" +name = "web-sys" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" +checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" dependencies = [ - "proc-macro2", - "quote", - "xml-rs", + "js-sys", + "wasm-bindgen", ] [[package]] -name = "web-sys" -version = "0.3.67" +name = "web-time" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" dependencies = [ "js-sys", "wasm-bindgen", @@ -5313,7 +5333,7 @@ dependencies = [ "log", "ndk-context", "objc", - "raw-window-handle", + "raw-window-handle 0.5.2", "url", "web-sys", ] @@ -5326,18 +5346,19 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu" -version = "0.17.2" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "752e44d3998ef35f71830dd1ad3da513e628e2e4d4aedb0ab580f850827a0b41" +checksum = "0bfe9a310dcf2e6b85f00c46059aaeaf4184caa8e29a1ecd4b7a704c3482332d" dependencies = [ "arrayvec", "cfg-if", + "cfg_aliases", "js-sys", "log", "naga", "parking_lot 0.12.1", "profiling", - "raw-window-handle", + "raw-window-handle 0.6.0", "smallvec", "static_assertions", "wasm-bindgen", @@ -5350,19 +5371,22 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.17.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f8a44dd301a30ceeed3c27d8c0090433d3da04d7b2a4042738095a424d12ae7" +checksum = "6b15e451d4060ada0d99a64df44e4d590213496da7c4f245572d51071e8e30ed" dependencies = [ "arrayvec", "bit-vec", "bitflags 2.4.2", + "cfg_aliases", "codespan-reporting", + "indexmap", "log", "naga", + "once_cell", "parking_lot 0.12.1", "profiling", - "raw-window-handle", + "raw-window-handle 0.6.0", "rustc-hash", "smallvec", "thiserror", @@ -5373,9 +5397,9 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.17.2" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a80bf0e3c77399bb52850cb0830af9bad073d5cfcb9dd8253bef8125c42db17" +checksum = "e3bb47856236bfafc0bc591a925eb036ac19cd987624a447ff353e7a7e7e6f72" dependencies = [ "android_system_properties", "arrayvec", @@ -5383,9 +5407,11 @@ dependencies = [ "bit-set", "bitflags 2.4.2", "block", + "cfg_aliases", "core-graphics-types", "d3d12", "glow", + "glutin_wgl_sys", "gpu-alloc", "gpu-allocator", "gpu-descriptor", @@ -5398,10 +5424,11 @@ dependencies = [ "metal", "naga", "objc", + "once_cell", "parking_lot 0.12.1", "profiling", "range-alloc", - "raw-window-handle", + "raw-window-handle 0.6.0", "renderdoc-sys", "rustc-hash", "smallvec", @@ -5414,9 +5441,9 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.17.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee64d7398d0c2f9ca48922c902ef69c42d000c759f3db41e355f4a570b052b67" +checksum = "895fcbeb772bfb049eb80b2d6e47f6c9af235284e9703c96fc0218a42ffd5af2" dependencies = [ "bitflags 2.4.2", "js-sys", @@ -5464,30 +5491,12 @@ dependencies = [ "winapi", ] -[[package]] -name = "winapi-wsapoll" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" -dependencies = [ - "winapi", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.44.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" -dependencies = [ - "windows-targets 0.42.2", -] - [[package]] name = "windows" version = "0.46.0" @@ -5515,7 +5524,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core", - "windows-targets 0.52.0", + "windows-targets 0.52.3", ] [[package]] @@ -5524,7 +5533,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.3", ] [[package]] @@ -5573,7 +5582,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.3", ] [[package]] @@ -5608,17 +5617,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "d380ba1dc7187569a8a9e91ed34b8ccfc33123bbacb8c0aed2d1ad7f3ef2dc5f" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.3", + "windows_aarch64_msvc 0.52.3", + "windows_i686_gnu 0.52.3", + "windows_i686_msvc 0.52.3", + "windows_x86_64_gnu 0.52.3", + "windows_x86_64_gnullvm 0.52.3", + "windows_x86_64_msvc 0.52.3", ] [[package]] @@ -5635,9 +5644,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "68e5dcfb9413f53afd9c8f86e56a7b4d86d9a2fa26090ea2dc9e40fba56c6ec6" [[package]] name = "windows_aarch64_msvc" @@ -5653,9 +5662,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "8dab469ebbc45798319e69eebf92308e541ce46760b49b18c6b3fe5e8965b30f" [[package]] name = "windows_i686_gnu" @@ -5671,9 +5680,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "2a4e9b6a7cac734a8b4138a4e1044eac3404d8326b6c0f939276560687a033fb" [[package]] name = "windows_i686_msvc" @@ -5689,9 +5698,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "28b0ec9c422ca95ff34a78755cfa6ad4a51371da2a5ace67500cf7ca5f232c58" [[package]] name = "windows_x86_64_gnu" @@ -5707,9 +5716,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "704131571ba93e89d7cd43482277d6632589b18ecf4468f591fbae0a8b101614" [[package]] name = "windows_x86_64_gnullvm" @@ -5725,9 +5734,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "42079295511643151e98d61c38c0acc444e52dd42ab456f7ccfd5152e8ecf21c" [[package]] name = "windows_x86_64_msvc" @@ -5743,45 +5752,64 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "0770833d60a970638e989b3fa9fd2bb1aaadcf88963d1659fd7d9990196ed2d6" [[package]] name = "winit" -version = "0.28.7" +version = "0.29.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94" +checksum = "272be407f804517512fdf408f0fe6c067bf24659a913c61af97af176bfd5aa92" dependencies = [ "android-activity", - "bitflags 1.3.2", + "atomic-waker", + "bitflags 2.4.2", + "bytemuck", + "calloop", "cfg_aliases", "core-foundation", "core-graphics", - "dispatch", - "instant", + "cursor-icon", + "icrate", + "js-sys", "libc", "log", - "mio", - "ndk", - "objc2", + "ndk 0.8.0", + "ndk-sys 0.5.0+25.2.9519653", + "objc2 0.4.1", "once_cell", "orbclient", "percent-encoding", - "raw-window-handle", + "raw-window-handle 0.6.0", "redox_syscall 0.3.5", + "rustix", + "smol_str", + "unicode-segmentation", "wasm-bindgen", - "wayland-scanner", + "wasm-bindgen-futures", "web-sys", - "windows-sys 0.45.0", + "web-time", + "windows-sys 0.48.0", "x11-dl", + "x11rb", + "xkbcommon-dl", +] + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", ] [[package]] name = "winnow" -version = "0.5.37" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cad8365489051ae9f054164e459304af2e7e9bb407c958076c8bf4aef52da5" +checksum = "7a4191c47f15cc3ec71fcb4913cb83d58def65dd3787610213c649283b5ce178" dependencies = [ "memchr", ] @@ -5815,25 +5843,24 @@ dependencies = [ [[package]] name = "x11rb" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" +checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" dependencies = [ + "as-raw-xcb-connection", "gethostname", - "nix 0.26.4", - "winapi", - "winapi-wsapoll", + "libc", + "libloading 0.8.1", + "once_cell", + "rustix", "x11rb-protocol", ] [[package]] name = "x11rb-protocol" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc" -dependencies = [ - "nix 0.26.4", -] +checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" [[package]] name = "xi-unicode" @@ -5841,6 +5868,25 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" +[[package]] +name = "xkbcommon-dl" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" +dependencies = [ + "bitflags 2.4.2", + "dlib", + "log", + "once_cell", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" + [[package]] name = "xml-rs" version = "0.8.19" @@ -5849,9 +5895,9 @@ checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" [[package]] name = "yarnspinner" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9cd9db1b2ed4f36bd2ae6c8fa715a768213fff39dc3aaaaa771e6e9669fd25b" +checksum = "d39473a37f93e84dadb0be4c3df88d7a614e90df98bb852b847c7624e6794e38" dependencies = [ "log", "yarnspinner_compiler", @@ -5861,14 +5907,15 @@ dependencies = [ [[package]] name = "yarnspinner_compiler" -version = "0.1.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc21827724cc512910d4001ac14f67cf17a8ff62c115cb0345af926eebd6564e" +checksum = "6d9f57c0f8d0754b98c83dbd25b69c0015755486428d9726aefe84324a5d235a" dependencies = [ "annotate-snippets", "antlr-rust", "better_any", "bevy", + "instant", "rand", "regex", "serde", @@ -5880,9 +5927,9 @@ dependencies = [ [[package]] name = "yarnspinner_core" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ee6a78a9dd5098f7d94deddb0c2f88a1e90c71adc7acb9c9c629391b9c8d97" +checksum = "3fe49910e13e0254e50201a80fb450e5d6382feee3b09c44bb3914d32e356600" dependencies = [ "bevy", "bytes", @@ -5903,14 +5950,14 @@ checksum = "c8ae8c98bd97e554fe9a4c593a1438492611d93a0b92075467984167cd896b30" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] name = "yarnspinner_runtime" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a665c1aa5e408a096bfab762c6a854ea79e103b0157fb0138d239b4bf6d20bf5" +checksum = "dcc42ff1081804df3e43f238076294223d77266dbe99adaf835b5907a3b1b6a4" dependencies = [ "bevy", "fixed_decimal", @@ -5946,7 +5993,7 @@ checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", "synstructure", ] @@ -5967,7 +6014,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", ] [[package]] @@ -5987,7 +6034,7 @@ checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", "synstructure", ] @@ -6010,5 +6057,5 @@ checksum = "7b4e5997cbf58990550ef1f0e5124a05e47e1ebd33a84af25739be6031a62c20" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.51", ] diff --git a/Cargo.toml b/Cargo.toml index cb01ae7c..d4d6509d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,14 +2,9 @@ authors = ["Jan Hohenheim "] edition = "2021" name = "foxtrot" -version = "0.4.0" +version = "0.5.0" license = "MIT OR Apache-2.0" -exclude = [ - "dist/", - "saves/", - "assets/", - "resources/", -] +exclude = ["assets/"] description = "The all-in-one Bevy 3D game template for desktop." repository = "https://github.com/janhohenheim/foxtrot" keywords = ["gamedev", "bevy", "template", "game"] @@ -21,11 +16,20 @@ default = ["dev"] dev = ["dep:bevy_editor_pls"] tracing = ["bevy/trace_chrome"] +[dependencies.bevy] +version = "0.13" +features = [ + "jpeg", + "serialize", + "file_watcher", + "dynamic_linking", # disable this for releases +] + [dependencies] # keep the following two 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 } -## https://github.com/bevyengine/bevy/blob/v0.12.1/crates/bevy_render/Cargo.toml#L57 +## https://github.com/bevyengine/bevy/blob/v0.13.0/crates/bevy_winit/Cargo.toml#L32 +winit = { version = "0.29", default-features = false } +## https://github.com/bevyengine/bevy/blob/v0.13.0/crates/bevy_render/Cargo.toml#L61 image = { version = "0.24", default-features = false } # generic dependencies @@ -33,41 +37,42 @@ serde = { version = "1", features = ["derive"] } anyhow = "1" # Bevy plugins -bevy_kira_audio = "0.18" -bevy_asset_loader = { version = "0.19", features = ["progress_tracking", "standard_dynamic_assets"] } -bevy_common_assets = { version = "0.9", features = ["ron", "toml"] } -bevy_egui = "0.24" -oxidized_navigation = { version = "0.8", features = ["xpbd", "debug_draw"] } -iyes_progress = "0.10" -# Activate the egui feature when https://github.com/Leafwing-Studios/leafwing-input-manager/pull/442 lands -leafwing-input-manager = { version = "0.11", features = [] } -bevy_dolly = "0.0.2" -bevy_mod_sysfail = "5" -seldom_fn_plugin = "0.5" -bevy_editor_pls = { version = "0.7", optional = true } -bevy_hanabi = "0.9" -bevy_yarnspinner = "0.1" -bevy_yarnspinner_example_dialogue_view = "0.1" -bevy-tnua-xpbd3d = "0.1" -bevy_xpbd_3d = { version = "0.3", features = ["simd"] } -bevy-tnua = "0.14" -bevy_atmosphere = "0.8" -warbler_grass = "0.5" -bevy_gltf_blueprints = "0.7" -bevy_registry_export = "0.1" +bevy_kira_audio = "0.19" +bevy_asset_loader = { version = "0.20", features = ["progress_tracking", "standard_dynamic_assets"] } +bevy_common_assets = { version = "0.10", features = ["ron", "toml"] } +bevy_egui = "0.25" +oxidized_navigation = { version = "0.10", features = ["xpbd", "debug_draw"] } +iyes_progress = "0.11" +leafwing-input-manager = { version = "0.13", features = ["egui"] } +## Waiting for https://github.com/BlackPhlox/bevy_dolly/pull/51 +bevy_dolly = { git = "https://github.com/rparrett/bevy_dolly/", branch = "bevy-0.13" } +bevy_mod_sysfail = "7" +bevy_editor_pls = { version = "0.8", optional = true } +bevy_hanabi = "0.10" +bevy_yarnspinner = "0.2" +bevy_yarnspinner_example_dialogue_view = "0.2.1" +bevy-tnua-xpbd3d = "0.2" +bevy_xpbd_3d = { version = "0.4", features = ["simd"] } +bevy-tnua = "0.15" +bevy_atmosphere = "0.9" +## Waiting for https://github.com/EmiOnGit/warbler_grass/pull/76 +warbler_grass = { git = "https://github.com/EmiOnGit/warbler_grass", branch = "75-update-to-bevy-013" } +## Waiting for https://github.com/kaosat-dev/Blender_bevy_components_workflow/pull/136 +bevy_gltf_blueprints = { git = "https://github.com/kaosat-dev/Blender_bevy_components_workflow/", branch = "bevy_main" } +## Waiting for https://github.com/kaosat-dev/Blender_bevy_components_workflow/pull/136 +bevy_registry_export = { git = "https://github.com/kaosat-dev/Blender_bevy_components_workflow/", branch = "bevy_main" } -[dependencies.bevy] -version = "0.12.1" -features = [ - "jpeg", - "serialize", - # "dynamic_linking", makes the builds MUCH faster, but causes issues on Windows - "file_watcher", -] +[patch."https://github.com/rparrett/bevy_dolly/"] +## Waiting for https://github.com/BlackPhlox/bevy_dolly/pull/51 +dolly = { git = "https://github.com/janhohenheim/dolly", branch = "bevy-0.13" } [build-dependencies] embed-resource = "2" -[patch.crates-io] -# Remove when https://github.com/kaosat-dev/Blender_bevy_components_workflow/pull/143 has been merged -bevy_gltf_components = { git = "https://github.com/janhohenheim/Blender_bevy_components_workflow", rev = "6313c2f695e9e64dbd797c45ef7d6402062094ca" } +# Enable a small amount of optimization in debug mode +[profile.dev] +opt-level = 1 + +# Enable high optimizations for dependencies (incl. Bevy), but not for our code: +[profile.dev.package."*"] +opt-level = 3 diff --git a/assets/dialogue/follower.yarn b/assets/dialogue/follower.yarn index 627544b6..c8ce4ff4 100644 --- a/assets/dialogue/follower.yarn +++ b/assets/dialogue/follower.yarn @@ -29,7 +29,7 @@ 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. + The Follower: The character controller's name is Tnua. Heard that's Hebrew for "motion" or something. Uses XPBD for physics. -> 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. diff --git a/assets/scenes/World.glb b/assets/scenes/World.glb index ccf62ccc..832fdcab 100644 Binary files a/assets/scenes/World.glb and b/assets/scenes/World.glb differ diff --git a/assets/scenes/level.blend b/assets/scenes/level.blend index e936d95e..5564afdf 100644 Binary files a/assets/scenes/level.blend and b/assets/scenes/level.blend differ diff --git a/assets/scenes/library/Fox.glb b/assets/scenes/library/Fox.glb index 4481cdc0..2206520f 100644 Binary files a/assets/scenes/library/Fox.glb and b/assets/scenes/library/Fox.glb differ diff --git a/assets/scenes/library/House.glb b/assets/scenes/library/House.glb index 6c9fbc97..236572da 100644 Binary files a/assets/scenes/library/House.glb and b/assets/scenes/library/House.glb differ diff --git a/assets/scenes/library/Orb.glb b/assets/scenes/library/Orb.glb index 630d1d49..30d6d2a5 100644 Binary files a/assets/scenes/library/Orb.glb and b/assets/scenes/library/Orb.glb differ diff --git a/assets/scenes/registry.json b/assets/scenes/registry.json index 9fb405cf..035c95eb 100644 --- a/assets/scenes/registry.json +++ b/assets/scenes/registry.json @@ -24,16 +24,29 @@ "type": "string", "typeInfo": "Value" }, - "alloc::vec::Vec": { + "alloc::vec::Vec": { "isComponent": false, "isResource": false, "items": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_animation::VariableCurve" + } + }, + "short_name": "Vec", + "title": "alloc::vec::Vec", + "type": "array", + "typeInfo": "List" + }, + "alloc::vec::Vec": { + "isComponent": false, + "isResource": false, + "items": { + "type": { + "$ref": "#/$defs/bevy_ecs::entity::Entity" } }, "short_name": "Vec", - "title": "alloc::vec::Vec", + "title": "alloc::vec::Vec", "type": "array", "typeInfo": "List" }, @@ -50,6 +63,45 @@ "type": "array", "typeInfo": "List" }, + "alloc::vec::Vec": { + "isComponent": false, + "isResource": false, + "items": { + "type": { + "$ref": "#/$defs/f32" + } + }, + "short_name": "Vec", + "title": "alloc::vec::Vec", + "type": "array", + "typeInfo": "List" + }, + "alloc::vec::Vec": { + "isComponent": false, + "isResource": false, + "items": { + "type": { + "$ref": "#/$defs/glam::Quat" + } + }, + "short_name": "Vec", + "title": "alloc::vec::Vec", + "type": "array", + "typeInfo": "List" + }, + "alloc::vec::Vec": { + "isComponent": false, + "isResource": false, + "items": { + "type": { + "$ref": "#/$defs/glam::Vec3" + } + }, + "short_name": "Vec", + "title": "alloc::vec::Vec", + "type": "array", + "typeInfo": "List" + }, "bevy_animation::AnimationClip": { "additionalProperties": false, "isComponent": false, @@ -106,6 +158,116 @@ "type": "object", "typeInfo": "Struct" }, + "bevy_animation::Interpolation": { + "isComponent": false, + "isResource": false, + "oneOf": [ + "Linear", + "Step", + "CubicSpline" + ], + "short_name": "Interpolation", + "title": "bevy_animation::Interpolation", + "type": "string", + "typeInfo": "Enum" + }, + "bevy_animation::Keyframes": { + "isComponent": false, + "isResource": false, + "oneOf": [ + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/alloc::vec::Vec" + } + } + ], + "short_name": "Rotation", + "title": "Rotation", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/alloc::vec::Vec" + } + } + ], + "short_name": "Translation", + "title": "Translation", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/alloc::vec::Vec" + } + } + ], + "short_name": "Scale", + "title": "Scale", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/alloc::vec::Vec" + } + } + ], + "short_name": "Weights", + "title": "Weights", + "type": "array", + "typeInfo": "Tuple" + } + ], + "short_name": "Keyframes", + "title": "bevy_animation::Keyframes", + "type": "object", + "typeInfo": "Enum" + }, + "bevy_animation::VariableCurve": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "interpolation": { + "type": { + "$ref": "#/$defs/bevy_animation::Interpolation" + } + }, + "keyframe_timestamps": { + "type": { + "$ref": "#/$defs/alloc::vec::Vec" + } + }, + "keyframes": { + "type": { + "$ref": "#/$defs/bevy_animation::Keyframes" + } + } + }, + "required": [ + "keyframe_timestamps", + "keyframes", + "interpolation" + ], + "short_name": "VariableCurve", + "title": "bevy_animation::VariableCurve", + "type": "object", + "typeInfo": "Struct" + }, "bevy_asset::handle::Handle<()>": { "isComponent": true, "isResource": false, @@ -1056,7 +1218,7 @@ "type": "object", "typeInfo": "Enum" }, - "bevy_asset::handle::Handle": { + "bevy_asset::handle::Handle": { "isComponent": true, "isResource": false, "oneOf": [ @@ -1079,7 +1241,7 @@ "prefixItems": [ { "type": { - "$ref": "#/$defs/bevy_asset::id::AssetId" + "$ref": "#/$defs/bevy_asset::id::AssetId" } } ], @@ -1089,8 +1251,8 @@ "typeInfo": "Tuple" } ], - "short_name": "Handle", - "title": "bevy_asset::handle::Handle", + "short_name": "Handle", + "title": "bevy_asset::handle::Handle", "type": "object", "typeInfo": "Enum" }, @@ -1284,44 +1446,6 @@ "type": "object", "typeInfo": "Enum" }, - "bevy_asset::handle::Handle": { - "isComponent": true, - "isResource": false, - "oneOf": [ - { - "items": false, - "prefixItems": [ - { - "type": { - "$ref": "#/$defs/std::sync::Arc" - } - } - ], - "short_name": "Strong", - "title": "Strong", - "type": "array", - "typeInfo": "Tuple" - }, - { - "items": false, - "prefixItems": [ - { - "type": { - "$ref": "#/$defs/bevy_asset::id::AssetId" - } - } - ], - "short_name": "Weak", - "title": "Weak", - "type": "array", - "typeInfo": "Tuple" - } - ], - "short_name": "Handle", - "title": "bevy_asset::handle::Handle", - "type": "object", - "typeInfo": "Enum" - }, "bevy_asset::id::AssetId<()>": { "isComponent": false, "isResource": false, @@ -2472,7 +2596,7 @@ "type": "object", "typeInfo": "Enum" }, - "bevy_asset::id::AssetId": { + "bevy_asset::id::AssetId": { "isComponent": false, "isResource": false, "oneOf": [ @@ -2513,8 +2637,8 @@ "typeInfo": "Struct" } ], - "short_name": "AssetId", - "title": "bevy_asset::id::AssetId", + "short_name": "AssetId", + "title": "bevy_asset::id::AssetId", "type": "object", "typeInfo": "Enum" }, @@ -2748,51 +2872,13 @@ "type": "object", "typeInfo": "Enum" }, - "bevy_asset::id::AssetId": { + "bevy_asset::path::AssetPath<'static>": { "isComponent": false, "isResource": false, - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "index": { - "title": "index", - "type": { - "$ref": "#/$defs/bevy_asset::assets::AssetIndex" - } - } - }, - "required": [ - "index" - ], - "short_name": "Index", - "title": "Index", - "type": "object", - "typeInfo": "Struct" - }, - { - "additionalProperties": false, - "properties": { - "uuid": { - "title": "uuid", - "type": { - "$ref": "#/$defs/bevy_utils::Uuid" - } - } - }, - "required": [ - "uuid" - ], - "short_name": "Uuid", - "title": "Uuid", - "type": "object", - "typeInfo": "Struct" - } - ], - "short_name": "AssetId", - "title": "bevy_asset::id::AssetId", + "short_name": "AssetPath<'static>", + "title": "bevy_asset::path::AssetPath<'static>", "type": "object", - "typeInfo": "Enum" + "typeInfo": "Value" }, "bevy_atmosphere::collection::gradient::Gradient": { "additionalProperties": false, @@ -2898,81 +2984,219 @@ "type": "object", "typeInfo": "Struct" }, - "bevy_core::name::Name": { - "additionalProperties": false, - "isComponent": true, - "isResource": false, - "properties": { - "hash": { + "bevy_audio::audio::DefaultSpatialScale": { + "isComponent": false, + "isResource": true, + "items": false, + "prefixItems": [ + { "type": { - "$ref": "#/$defs/u64" + "$ref": "#/$defs/bevy_audio::audio::SpatialScale" } - }, - "name": { + } + ], + "short_name": "DefaultSpatialScale", + "title": "bevy_audio::audio::DefaultSpatialScale", + "type": "array", + "typeInfo": "TupleStruct" + }, + "bevy_audio::audio::GlobalVolume": { + "additionalProperties": false, + "isComponent": false, + "isResource": true, + "properties": { + "volume": { "type": { - "$ref": "#/$defs/alloc::borrow::Cow" + "$ref": "#/$defs/bevy_audio::audio::Volume" } } }, "required": [ - "hash", - "name" + "volume" ], - "short_name": "Name", - "title": "bevy_core::name::Name", + "short_name": "GlobalVolume", + "title": "bevy_audio::audio::GlobalVolume", "type": "object", "typeInfo": "Struct" }, - "bevy_core_pipeline::bloom::settings::BloomCompositeMode": { + "bevy_audio::audio::PlaybackMode": { "isComponent": false, "isResource": false, "oneOf": [ - "EnergyConserving", - "Additive" + "Once", + "Loop", + "Despawn", + "Remove" ], - "short_name": "BloomCompositeMode", - "title": "bevy_core_pipeline::bloom::settings::BloomCompositeMode", + "short_name": "PlaybackMode", + "title": "bevy_audio::audio::PlaybackMode", "type": "string", "typeInfo": "Enum" }, - "bevy_core_pipeline::bloom::settings::BloomPrefilterSettings": { + "bevy_audio::audio::PlaybackSettings": { "additionalProperties": false, - "isComponent": false, + "isComponent": true, "isResource": false, "properties": { - "threshold": { + "mode": { "type": { - "$ref": "#/$defs/f32" + "$ref": "#/$defs/bevy_audio::audio::PlaybackMode" } }, - "threshold_softness": { + "paused": { + "type": { + "$ref": "#/$defs/bool" + } + }, + "spatial": { + "type": { + "$ref": "#/$defs/bool" + } + }, + "spatial_scale": { + "type": { + "$ref": "#/$defs/core::option::Option" + } + }, + "speed": { "type": { "$ref": "#/$defs/f32" } + }, + "volume": { + "type": { + "$ref": "#/$defs/bevy_audio::audio::Volume" + } } }, "required": [ - "threshold", - "threshold_softness" + "mode", + "volume", + "speed", + "paused", + "spatial" ], - "short_name": "BloomPrefilterSettings", - "title": "bevy_core_pipeline::bloom::settings::BloomPrefilterSettings", + "short_name": "PlaybackSettings", + "title": "bevy_audio::audio::PlaybackSettings", "type": "object", "typeInfo": "Struct" }, - "bevy_core_pipeline::bloom::settings::BloomSettings": { + "bevy_audio::audio::SpatialListener": { "additionalProperties": false, "isComponent": true, "isResource": false, "properties": { - "composite_mode": { + "left_ear_offset": { "type": { - "$ref": "#/$defs/bevy_core_pipeline::bloom::settings::BloomCompositeMode" + "$ref": "#/$defs/glam::Vec3" } }, - "high_pass_frequency": { + "right_ear_offset": { "type": { - "$ref": "#/$defs/f32" + "$ref": "#/$defs/glam::Vec3" + } + } + }, + "required": [ + "left_ear_offset", + "right_ear_offset" + ], + "short_name": "SpatialListener", + "title": "bevy_audio::audio::SpatialListener", + "type": "object", + "typeInfo": "Struct" + }, + "bevy_audio::audio::Volume": { + "isComponent": false, + "isResource": false, + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/f32" + } + } + ], + "short_name": "Volume", + "title": "bevy_audio::audio::Volume", + "type": "array", + "typeInfo": "TupleStruct" + }, + "bevy_core::name::Name": { + "additionalProperties": false, + "isComponent": true, + "isResource": false, + "properties": { + "hash": { + "type": { + "$ref": "#/$defs/u64" + } + }, + "name": { + "type": { + "$ref": "#/$defs/alloc::borrow::Cow" + } + } + }, + "required": [ + "hash", + "name" + ], + "short_name": "Name", + "title": "bevy_core::name::Name", + "type": "object", + "typeInfo": "Struct" + }, + "bevy_core_pipeline::bloom::settings::BloomCompositeMode": { + "isComponent": false, + "isResource": false, + "oneOf": [ + "EnergyConserving", + "Additive" + ], + "short_name": "BloomCompositeMode", + "title": "bevy_core_pipeline::bloom::settings::BloomCompositeMode", + "type": "string", + "typeInfo": "Enum" + }, + "bevy_core_pipeline::bloom::settings::BloomPrefilterSettings": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "threshold": { + "type": { + "$ref": "#/$defs/f32" + } + }, + "threshold_softness": { + "type": { + "$ref": "#/$defs/f32" + } + } + }, + "required": [ + "threshold", + "threshold_softness" + ], + "short_name": "BloomPrefilterSettings", + "title": "bevy_core_pipeline::bloom::settings::BloomPrefilterSettings", + "type": "object", + "typeInfo": "Struct" + }, + "bevy_core_pipeline::bloom::settings::BloomSettings": { + "additionalProperties": false, + "isComponent": true, + "isResource": false, + "properties": { + "composite_mode": { + "type": { + "$ref": "#/$defs/bevy_core_pipeline::bloom::settings::BloomCompositeMode" + } + }, + "high_pass_frequency": { + "type": { + "$ref": "#/$defs/f32" } }, "intensity": { @@ -3009,52 +3233,6 @@ "type": "object", "typeInfo": "Struct" }, - "bevy_core_pipeline::clear_color::ClearColor": { - "isComponent": false, - "isResource": true, - "items": false, - "prefixItems": [ - { - "type": { - "$ref": "#/$defs/bevy_render::color::Color" - } - } - ], - "short_name": "ClearColor", - "title": "bevy_core_pipeline::clear_color::ClearColor", - "type": "array", - "typeInfo": "TupleStruct" - }, - "bevy_core_pipeline::clear_color::ClearColorConfig": { - "isComponent": false, - "isResource": false, - "oneOf": [ - { - "title": "Default" - }, - { - "items": false, - "prefixItems": [ - { - "type": { - "$ref": "#/$defs/bevy_render::color::Color" - } - } - ], - "short_name": "Custom", - "title": "Custom", - "type": "array", - "typeInfo": "Tuple" - }, - { - "title": "None" - } - ], - "short_name": "ClearColorConfig", - "title": "bevy_core_pipeline::clear_color::ClearColorConfig", - "type": "object", - "typeInfo": "Enum" - }, "bevy_core_pipeline::contrast_adaptive_sharpening::ContrastAdaptiveSharpeningSettings": { "additionalProperties": false, "isComponent": true, @@ -3090,16 +3268,8 @@ "additionalProperties": false, "isComponent": true, "isResource": false, - "properties": { - "clear_color": { - "type": { - "$ref": "#/$defs/bevy_core_pipeline::clear_color::ClearColorConfig" - } - } - }, - "required": [ - "clear_color" - ], + "properties": {}, + "required": [], "short_name": "Camera2d", "title": "bevy_core_pipeline::core_2d::camera_2d::Camera2d", "type": "object", @@ -3110,11 +3280,6 @@ "isComponent": true, "isResource": false, "properties": { - "clear_color": { - "type": { - "$ref": "#/$defs/bevy_core_pipeline::clear_color::ClearColorConfig" - } - }, "depth_load_op": { "type": { "$ref": "#/$defs/bevy_core_pipeline::core_3d::camera_3d::Camera3dDepthLoadOp" @@ -3137,7 +3302,6 @@ } }, "required": [ - "clear_color", "depth_load_op", "depth_texture_usages", "screen_space_specular_transmission_steps", @@ -3175,6 +3339,36 @@ "type": "object", "typeInfo": "Enum" }, + "bevy_core_pipeline::core_3d::camera_3d::Camera3dDepthTextureUsage": { + "isComponent": false, + "isResource": false, + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/u32" + } + } + ], + "short_name": "Camera3dDepthTextureUsage", + "title": "bevy_core_pipeline::core_3d::camera_3d::Camera3dDepthTextureUsage", + "type": "array", + "typeInfo": "TupleStruct" + }, + "bevy_core_pipeline::core_3d::camera_3d::ScreenSpaceTransmissionQuality": { + "isComponent": false, + "isResource": true, + "oneOf": [ + "Low", + "Medium", + "High", + "Ultra" + ], + "short_name": "ScreenSpaceTransmissionQuality", + "title": "bevy_core_pipeline::core_3d::camera_3d::ScreenSpaceTransmissionQuality", + "type": "string", + "typeInfo": "Enum" + }, "bevy_core_pipeline::fxaa::Fxaa": { "additionalProperties": false, "isComponent": true, @@ -3206,6 +3400,17 @@ "type": "object", "typeInfo": "Struct" }, + "bevy_core_pipeline::prepass::DeferredPrepass": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": {}, + "required": [], + "short_name": "DeferredPrepass", + "title": "bevy_core_pipeline::prepass::DeferredPrepass", + "type": "object", + "typeInfo": "Struct" + }, "bevy_core_pipeline::prepass::DepthPrepass": { "additionalProperties": false, "isComponent": false, @@ -3217,6 +3422,17 @@ "type": "object", "typeInfo": "Struct" }, + "bevy_core_pipeline::prepass::MotionVectorPrepass": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": {}, + "required": [], + "short_name": "MotionVectorPrepass", + "title": "bevy_core_pipeline::prepass::MotionVectorPrepass", + "type": "object", + "typeInfo": "Struct" + }, "bevy_core_pipeline::prepass::NormalPrepass": { "additionalProperties": false, "isComponent": false, @@ -3258,94 +3474,221 @@ "type": "string", "typeInfo": "Enum" }, - "bevy_ecs::Entity": { + "bevy_ecs::component::ComponentId": { "isComponent": false, "isResource": false, - "short_name": "Entity", - "title": "bevy_ecs::Entity", - "type": "object", - "typeInfo": "Value" + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/usize" + } + } + ], + "short_name": "ComponentId", + "title": "bevy_ecs::component::ComponentId", + "type": "array", + "typeInfo": "TupleStruct" }, - "bevy_egui::EguiSettings": { + "bevy_ecs::component::ComponentTicks": { "additionalProperties": false, "isComponent": false, "isResource": false, "properties": { - "default_open_url_target": { + "added": { "type": { - "$ref": "#/$defs/core::option::Option" + "$ref": "#/$defs/bevy_ecs::component::Tick" } }, - "scale_factor": { + "changed": { "type": { - "$ref": "#/$defs/f64" + "$ref": "#/$defs/bevy_ecs::component::Tick" } } }, "required": [ - "scale_factor" + "added", + "changed" ], - "short_name": "EguiSettings", - "title": "bevy_egui::EguiSettings", + "short_name": "ComponentTicks", + "title": "bevy_ecs::component::ComponentTicks", "type": "object", "typeInfo": "Struct" }, - "bevy_gltf::GltfExtras": { + "bevy_ecs::component::Tick": { "additionalProperties": false, - "isComponent": true, + "isComponent": false, "isResource": false, "properties": { - "value": { + "tick": { "type": { - "$ref": "#/$defs/alloc::string::String" + "$ref": "#/$defs/u32" } } }, "required": [ - "value" + "tick" ], - "short_name": "GltfExtras", - "title": "bevy_gltf::GltfExtras", + "short_name": "Tick", + "title": "bevy_ecs::component::Tick", "type": "object", "typeInfo": "Struct" }, - "bevy_gltf_blueprints::animation::Animations": { + "bevy_ecs::entity::Entity": { + "isComponent": false, + "isResource": false, + "short_name": "Entity", + "title": "bevy_ecs::entity::Entity", + "type": "object", + "typeInfo": "Value" + }, + "bevy_egui::EguiSettings": { "additionalProperties": false, - "isComponent": true, + "isComponent": false, "isResource": false, "properties": { - "named_animations": { + "default_open_url_target": { "type": { - "$ref": "#/$defs/bevy_utils::hashbrown::HashMap, bevy_utils::hashbrown::hash_map::DefaultHashBuilder>" + "$ref": "#/$defs/core::option::Option" + } + }, + "scale_factor": { + "type": { + "$ref": "#/$defs/f32" } } }, "required": [ - "named_animations" + "scale_factor" ], - "short_name": "Animations", - "title": "bevy_gltf_blueprints::animation::Animations", + "short_name": "EguiSettings", + "title": "bevy_egui::EguiSettings", "type": "object", "typeInfo": "Struct" }, - "bevy_gltf_blueprints::materials::MaterialInfo": { + "bevy_gizmos::aabb::AabbGizmoConfigGroup": { "additionalProperties": false, - "isComponent": true, + "isComponent": false, "isResource": false, "properties": { - "name": { + "default_color": { "type": { - "$ref": "#/$defs/alloc::string::String" + "$ref": "#/$defs/core::option::Option" } }, - "source": { + "draw_all": { "type": { - "$ref": "#/$defs/alloc::string::String" + "$ref": "#/$defs/bool" } } }, "required": [ - "name", + "draw_all" + ], + "short_name": "AabbGizmoConfigGroup", + "title": "bevy_gizmos::aabb::AabbGizmoConfigGroup", + "type": "object", + "typeInfo": "Struct" + }, + "bevy_gizmos::config::GizmoConfig": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "depth_bias": { + "type": { + "$ref": "#/$defs/f32" + } + }, + "enabled": { + "type": { + "$ref": "#/$defs/bool" + } + }, + "line_perspective": { + "type": { + "$ref": "#/$defs/bool" + } + }, + "line_width": { + "type": { + "$ref": "#/$defs/f32" + } + }, + "render_layers": { + "type": { + "$ref": "#/$defs/bevy_render::view::visibility::render_layers::RenderLayers" + } + } + }, + "required": [ + "enabled", + "line_width", + "line_perspective", + "depth_bias", + "render_layers" + ], + "short_name": "GizmoConfig", + "title": "bevy_gizmos::config::GizmoConfig", + "type": "object", + "typeInfo": "Struct" + }, + "bevy_gltf::GltfExtras": { + "additionalProperties": false, + "isComponent": true, + "isResource": false, + "properties": { + "value": { + "type": { + "$ref": "#/$defs/alloc::string::String" + } + } + }, + "required": [ + "value" + ], + "short_name": "GltfExtras", + "title": "bevy_gltf::GltfExtras", + "type": "object", + "typeInfo": "Struct" + }, + "bevy_gltf_blueprints::animation::Animations": { + "additionalProperties": false, + "isComponent": true, + "isResource": false, + "properties": { + "named_animations": { + "type": { + "$ref": "#/$defs/bevy_utils::hashbrown::HashMap, bevy_utils::hashbrown::hash_map::DefaultHashBuilder>" + } + } + }, + "required": [ + "named_animations" + ], + "short_name": "Animations", + "title": "bevy_gltf_blueprints::animation::Animations", + "type": "object", + "typeInfo": "Struct" + }, + "bevy_gltf_blueprints::materials::MaterialInfo": { + "additionalProperties": false, + "isComponent": true, + "isResource": false, + "properties": { + "name": { + "type": { + "$ref": "#/$defs/alloc::string::String" + } + }, + "source": { + "type": { + "$ref": "#/$defs/alloc::string::String" + } + } + }, + "required": [ + "name", "source" ], "short_name": "MaterialInfo", @@ -3551,7 +3894,7 @@ "prefixItems": [ { "type": { - "$ref": "#/$defs/smallvec::SmallVec<[bevy_ecs::Entity; 8]>" + "$ref": "#/$defs/bevy_utils::smallvec::SmallVec<[bevy_ecs::entity::Entity; 8]>" } } ], @@ -3567,7 +3910,7 @@ "prefixItems": [ { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } ], @@ -3980,339 +4323,1885 @@ "type": "object", "typeInfo": "Struct" }, - "bevy_input::keyboard::KeyCode": { - "isComponent": false, - "isResource": false, - "oneOf": [ - "Key1", - "Key2", - "Key3", - "Key4", - "Key5", - "Key6", - "Key7", - "Key8", - "Key9", - "Key0", - "A", - "B", - "C", - "D", - "E", - "F", - "G", - "H", - "I", - "J", - "K", - "L", - "M", - "N", - "O", - "P", - "Q", - "R", - "S", - "T", - "U", - "V", - "W", - "X", - "Y", - "Z", - "Escape", - "F1", - "F2", - "F3", - "F4", - "F5", - "F6", - "F7", - "F8", - "F9", - "F10", - "F11", - "F12", - "F13", - "F14", - "F15", - "F16", - "F17", - "F18", - "F19", - "F20", - "F21", - "F22", - "F23", - "F24", - "Snapshot", - "Scroll", - "Pause", - "Insert", - "Home", - "Delete", - "End", - "PageDown", - "PageUp", - "Left", - "Up", - "Right", - "Down", - "Back", - "Return", - "Space", - "Compose", - "Caret", - "Numlock", - "Numpad0", - "Numpad1", - "Numpad2", - "Numpad3", - "Numpad4", - "Numpad5", - "Numpad6", - "Numpad7", - "Numpad8", - "Numpad9", - "AbntC1", - "AbntC2", - "NumpadAdd", - "Apostrophe", - "Apps", - "Asterisk", - "Plus", - "At", - "Ax", - "Backslash", - "Calculator", - "Capital", - "Colon", - "Comma", - "Convert", - "NumpadDecimal", - "NumpadDivide", - "Equals", - "Grave", - "Kana", - "Kanji", - "AltLeft", - "BracketLeft", - "ControlLeft", - "ShiftLeft", - "SuperLeft", - "Mail", - "MediaSelect", - "MediaStop", - "Minus", - "NumpadMultiply", - "Mute", - "MyComputer", - "NavigateForward", - "NavigateBackward", - "NextTrack", - "NoConvert", - "NumpadComma", - "NumpadEnter", - "NumpadEquals", - "Oem102", - "Period", - "PlayPause", - "Power", - "PrevTrack", - "AltRight", - "BracketRight", - "ControlRight", - "ShiftRight", - "SuperRight", - "Semicolon", - "Slash", - "Sleep", - "Stop", - "NumpadSubtract", - "Sysrq", - "Tab", - "Underline", - "Unlabeled", - "VolumeDown", - "VolumeUp", - "Wake", - "WebBack", - "WebFavorites", - "WebForward", - "WebHome", - "WebRefresh", - "WebSearch", - "WebStop", - "Yen", - "Copy", - "Paste", - "Cut" - ], - "short_name": "KeyCode", - "title": "bevy_input::keyboard::KeyCode", - "type": "string", - "typeInfo": "Enum" - }, - "bevy_input::keyboard::KeyboardInput": { - "additionalProperties": false, - "isComponent": false, - "isResource": false, - "properties": { - "key_code": { - "type": { - "$ref": "#/$defs/core::option::Option" - } - }, - "scan_code": { - "type": { - "$ref": "#/$defs/u32" - } - }, - "state": { - "type": { - "$ref": "#/$defs/bevy_input::ButtonState" - } - }, - "window": { - "type": { - "$ref": "#/$defs/bevy_ecs::Entity" - } - } - }, - "required": [ - "scan_code", - "state", - "window" - ], - "short_name": "KeyboardInput", - "title": "bevy_input::keyboard::KeyboardInput", - "type": "object", - "typeInfo": "Struct" - }, - "bevy_input::keyboard::ScanCode": { - "isComponent": false, - "isResource": false, - "items": false, - "prefixItems": [ - { - "type": { - "$ref": "#/$defs/u32" - } - } - ], - "short_name": "ScanCode", - "title": "bevy_input::keyboard::ScanCode", - "type": "array", - "typeInfo": "TupleStruct" - }, - "bevy_input::mouse::MouseButton": { + "bevy_input::keyboard::Key": { "isComponent": false, "isResource": false, "oneOf": [ { - "title": "Left" - }, - { - "title": "Right" + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/smol_str::SmolStr" + } + } + ], + "short_name": "Character", + "title": "Character", + "type": "array", + "typeInfo": "Tuple" }, { - "title": "Middle" + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/bevy_input::keyboard::NativeKey" + } + } + ], + "short_name": "Unidentified", + "title": "Unidentified", + "type": "array", + "typeInfo": "Tuple" }, { "items": false, "prefixItems": [ { "type": { - "$ref": "#/$defs/u16" + "$ref": "#/$defs/core::option::Option" } } ], - "short_name": "Other", - "title": "Other", + "short_name": "Dead", + "title": "Dead", "type": "array", "typeInfo": "Tuple" - } - ], - "short_name": "MouseButton", - "title": "bevy_input::mouse::MouseButton", - "type": "object", - "typeInfo": "Enum" - }, - "bevy_input::mouse::MouseButtonInput": { - "additionalProperties": false, - "isComponent": false, - "isResource": false, - "properties": { - "button": { - "type": { - "$ref": "#/$defs/bevy_input::mouse::MouseButton" - } }, - "state": { - "type": { - "$ref": "#/$defs/bevy_input::ButtonState" - } + { + "title": "Alt" }, - "window": { - "type": { - "$ref": "#/$defs/bevy_ecs::Entity" - } - } - }, - "required": [ - "button", - "state", - "window" - ], - "short_name": "MouseButtonInput", - "title": "bevy_input::mouse::MouseButtonInput", - "type": "object", - "typeInfo": "Struct" - }, - "bevy_input::mouse::MouseMotion": { - "additionalProperties": false, - "isComponent": false, - "isResource": false, - "properties": { - "delta": { - "type": { - "$ref": "#/$defs/glam::Vec2" - } - } - }, - "required": [ - "delta" - ], - "short_name": "MouseMotion", - "title": "bevy_input::mouse::MouseMotion", - "type": "object", - "typeInfo": "Struct" - }, - "bevy_input::mouse::MouseScrollUnit": { - "isComponent": false, - "isResource": false, - "oneOf": [ - "Line", - "Pixel" - ], - "short_name": "MouseScrollUnit", - "title": "bevy_input::mouse::MouseScrollUnit", - "type": "string", - "typeInfo": "Enum" - }, - "bevy_input::mouse::MouseWheel": { - "additionalProperties": false, - "isComponent": false, - "isResource": false, - "properties": { - "unit": { - "type": { + { + "title": "AltGraph" + }, + { + "title": "CapsLock" + }, + { + "title": "Control" + }, + { + "title": "Fn" + }, + { + "title": "FnLock" + }, + { + "title": "NumLock" + }, + { + "title": "ScrollLock" + }, + { + "title": "Shift" + }, + { + "title": "Symbol" + }, + { + "title": "SymbolLock" + }, + { + "title": "Meta" + }, + { + "title": "Hyper" + }, + { + "title": "Super" + }, + { + "title": "Enter" + }, + { + "title": "Tab" + }, + { + "title": "Space" + }, + { + "title": "ArrowDown" + }, + { + "title": "ArrowLeft" + }, + { + "title": "ArrowRight" + }, + { + "title": "ArrowUp" + }, + { + "title": "End" + }, + { + "title": "Home" + }, + { + "title": "PageDown" + }, + { + "title": "PageUp" + }, + { + "title": "Backspace" + }, + { + "title": "Clear" + }, + { + "title": "Copy" + }, + { + "title": "CrSel" + }, + { + "title": "Cut" + }, + { + "title": "Delete" + }, + { + "title": "EraseEof" + }, + { + "title": "ExSel" + }, + { + "title": "Insert" + }, + { + "title": "Paste" + }, + { + "title": "Redo" + }, + { + "title": "Undo" + }, + { + "title": "Accept" + }, + { + "title": "Again" + }, + { + "title": "Attn" + }, + { + "title": "Cancel" + }, + { + "title": "ContextMenu" + }, + { + "title": "Escape" + }, + { + "title": "Execute" + }, + { + "title": "Find" + }, + { + "title": "Help" + }, + { + "title": "Pause" + }, + { + "title": "Play" + }, + { + "title": "Props" + }, + { + "title": "Select" + }, + { + "title": "ZoomIn" + }, + { + "title": "ZoomOut" + }, + { + "title": "BrightnessDown" + }, + { + "title": "BrightnessUp" + }, + { + "title": "Eject" + }, + { + "title": "LogOff" + }, + { + "title": "Power" + }, + { + "title": "PowerOff" + }, + { + "title": "PrintScreen" + }, + { + "title": "Hibernate" + }, + { + "title": "Standby" + }, + { + "title": "WakeUp" + }, + { + "title": "AllCandidates" + }, + { + "title": "Alphanumeric" + }, + { + "title": "CodeInput" + }, + { + "title": "Compose" + }, + { + "title": "Convert" + }, + { + "title": "FinalMode" + }, + { + "title": "GroupFirst" + }, + { + "title": "GroupLast" + }, + { + "title": "GroupNext" + }, + { + "title": "GroupPrevious" + }, + { + "title": "ModeChange" + }, + { + "title": "NextCandidate" + }, + { + "title": "NonConvert" + }, + { + "title": "PreviousCandidate" + }, + { + "title": "Process" + }, + { + "title": "SingleCandidate" + }, + { + "title": "HangulMode" + }, + { + "title": "HanjaMode" + }, + { + "title": "JunjaMode" + }, + { + "title": "Eisu" + }, + { + "title": "Hankaku" + }, + { + "title": "Hiragana" + }, + { + "title": "HiraganaKatakana" + }, + { + "title": "KanaMode" + }, + { + "title": "KanjiMode" + }, + { + "title": "Katakana" + }, + { + "title": "Romaji" + }, + { + "title": "Zenkaku" + }, + { + "title": "ZenkakuHankaku" + }, + { + "title": "Soft1" + }, + { + "title": "Soft2" + }, + { + "title": "Soft3" + }, + { + "title": "Soft4" + }, + { + "title": "ChannelDown" + }, + { + "title": "ChannelUp" + }, + { + "title": "Close" + }, + { + "title": "MailForward" + }, + { + "title": "MailReply" + }, + { + "title": "MailSend" + }, + { + "title": "MediaClose" + }, + { + "title": "MediaFastForward" + }, + { + "title": "MediaPause" + }, + { + "title": "MediaPlay" + }, + { + "title": "MediaPlayPause" + }, + { + "title": "MediaRecord" + }, + { + "title": "MediaRewind" + }, + { + "title": "MediaStop" + }, + { + "title": "MediaTrackNext" + }, + { + "title": "MediaTrackPrevious" + }, + { + "title": "New" + }, + { + "title": "Open" + }, + { + "title": "Print" + }, + { + "title": "Save" + }, + { + "title": "SpellCheck" + }, + { + "title": "Key11" + }, + { + "title": "Key12" + }, + { + "title": "AudioBalanceLeft" + }, + { + "title": "AudioBalanceRight" + }, + { + "title": "AudioBassBoostDown" + }, + { + "title": "AudioBassBoostToggle" + }, + { + "title": "AudioBassBoostUp" + }, + { + "title": "AudioFaderFront" + }, + { + "title": "AudioFaderRear" + }, + { + "title": "AudioSurroundModeNext" + }, + { + "title": "AudioTrebleDown" + }, + { + "title": "AudioTrebleUp" + }, + { + "title": "AudioVolumeDown" + }, + { + "title": "AudioVolumeUp" + }, + { + "title": "AudioVolumeMute" + }, + { + "title": "MicrophoneToggle" + }, + { + "title": "MicrophoneVolumeDown" + }, + { + "title": "MicrophoneVolumeUp" + }, + { + "title": "MicrophoneVolumeMute" + }, + { + "title": "SpeechCorrectionList" + }, + { + "title": "SpeechInputToggle" + }, + { + "title": "LaunchApplication1" + }, + { + "title": "LaunchApplication2" + }, + { + "title": "LaunchCalendar" + }, + { + "title": "LaunchContacts" + }, + { + "title": "LaunchMail" + }, + { + "title": "LaunchMediaPlayer" + }, + { + "title": "LaunchMusicPlayer" + }, + { + "title": "LaunchPhone" + }, + { + "title": "LaunchScreenSaver" + }, + { + "title": "LaunchSpreadsheet" + }, + { + "title": "LaunchWebBrowser" + }, + { + "title": "LaunchWebCam" + }, + { + "title": "LaunchWordProcessor" + }, + { + "title": "BrowserBack" + }, + { + "title": "BrowserFavorites" + }, + { + "title": "BrowserForward" + }, + { + "title": "BrowserHome" + }, + { + "title": "BrowserRefresh" + }, + { + "title": "BrowserSearch" + }, + { + "title": "BrowserStop" + }, + { + "title": "AppSwitch" + }, + { + "title": "Call" + }, + { + "title": "Camera" + }, + { + "title": "CameraFocus" + }, + { + "title": "EndCall" + }, + { + "title": "GoBack" + }, + { + "title": "GoHome" + }, + { + "title": "HeadsetHook" + }, + { + "title": "LastNumberRedial" + }, + { + "title": "Notification" + }, + { + "title": "MannerMode" + }, + { + "title": "VoiceDial" + }, + { + "title": "TV" + }, + { + "title": "TV3DMode" + }, + { + "title": "TVAntennaCable" + }, + { + "title": "TVAudioDescription" + }, + { + "title": "TVAudioDescriptionMixDown" + }, + { + "title": "TVAudioDescriptionMixUp" + }, + { + "title": "TVContentsMenu" + }, + { + "title": "TVDataService" + }, + { + "title": "TVInput" + }, + { + "title": "TVInputComponent1" + }, + { + "title": "TVInputComponent2" + }, + { + "title": "TVInputComposite1" + }, + { + "title": "TVInputComposite2" + }, + { + "title": "TVInputHDMI1" + }, + { + "title": "TVInputHDMI2" + }, + { + "title": "TVInputHDMI3" + }, + { + "title": "TVInputHDMI4" + }, + { + "title": "TVInputVGA1" + }, + { + "title": "TVMediaContext" + }, + { + "title": "TVNetwork" + }, + { + "title": "TVNumberEntry" + }, + { + "title": "TVPower" + }, + { + "title": "TVRadioService" + }, + { + "title": "TVSatellite" + }, + { + "title": "TVSatelliteBS" + }, + { + "title": "TVSatelliteCS" + }, + { + "title": "TVSatelliteToggle" + }, + { + "title": "TVTerrestrialAnalog" + }, + { + "title": "TVTerrestrialDigital" + }, + { + "title": "TVTimer" + }, + { + "title": "AVRInput" + }, + { + "title": "AVRPower" + }, + { + "title": "ColorF0Red" + }, + { + "title": "ColorF1Green" + }, + { + "title": "ColorF2Yellow" + }, + { + "title": "ColorF3Blue" + }, + { + "title": "ColorF4Grey" + }, + { + "title": "ColorF5Brown" + }, + { + "title": "ClosedCaptionToggle" + }, + { + "title": "Dimmer" + }, + { + "title": "DisplaySwap" + }, + { + "title": "DVR" + }, + { + "title": "Exit" + }, + { + "title": "FavoriteClear0" + }, + { + "title": "FavoriteClear1" + }, + { + "title": "FavoriteClear2" + }, + { + "title": "FavoriteClear3" + }, + { + "title": "FavoriteRecall0" + }, + { + "title": "FavoriteRecall1" + }, + { + "title": "FavoriteRecall2" + }, + { + "title": "FavoriteRecall3" + }, + { + "title": "FavoriteStore0" + }, + { + "title": "FavoriteStore1" + }, + { + "title": "FavoriteStore2" + }, + { + "title": "FavoriteStore3" + }, + { + "title": "Guide" + }, + { + "title": "GuideNextDay" + }, + { + "title": "GuidePreviousDay" + }, + { + "title": "Info" + }, + { + "title": "InstantReplay" + }, + { + "title": "Link" + }, + { + "title": "ListProgram" + }, + { + "title": "LiveContent" + }, + { + "title": "Lock" + }, + { + "title": "MediaApps" + }, + { + "title": "MediaAudioTrack" + }, + { + "title": "MediaLast" + }, + { + "title": "MediaSkipBackward" + }, + { + "title": "MediaSkipForward" + }, + { + "title": "MediaStepBackward" + }, + { + "title": "MediaStepForward" + }, + { + "title": "MediaTopMenu" + }, + { + "title": "NavigateIn" + }, + { + "title": "NavigateNext" + }, + { + "title": "NavigateOut" + }, + { + "title": "NavigatePrevious" + }, + { + "title": "NextFavoriteChannel" + }, + { + "title": "NextUserProfile" + }, + { + "title": "OnDemand" + }, + { + "title": "Pairing" + }, + { + "title": "PinPDown" + }, + { + "title": "PinPMove" + }, + { + "title": "PinPToggle" + }, + { + "title": "PinPUp" + }, + { + "title": "PlaySpeedDown" + }, + { + "title": "PlaySpeedReset" + }, + { + "title": "PlaySpeedUp" + }, + { + "title": "RandomToggle" + }, + { + "title": "RcLowBattery" + }, + { + "title": "RecordSpeedNext" + }, + { + "title": "RfBypass" + }, + { + "title": "ScanChannelsToggle" + }, + { + "title": "ScreenModeNext" + }, + { + "title": "Settings" + }, + { + "title": "SplitScreenToggle" + }, + { + "title": "STBInput" + }, + { + "title": "STBPower" + }, + { + "title": "Subtitle" + }, + { + "title": "Teletext" + }, + { + "title": "VideoModeNext" + }, + { + "title": "Wink" + }, + { + "title": "ZoomToggle" + }, + { + "title": "F1" + }, + { + "title": "F2" + }, + { + "title": "F3" + }, + { + "title": "F4" + }, + { + "title": "F5" + }, + { + "title": "F6" + }, + { + "title": "F7" + }, + { + "title": "F8" + }, + { + "title": "F9" + }, + { + "title": "F10" + }, + { + "title": "F11" + }, + { + "title": "F12" + }, + { + "title": "F13" + }, + { + "title": "F14" + }, + { + "title": "F15" + }, + { + "title": "F16" + }, + { + "title": "F17" + }, + { + "title": "F18" + }, + { + "title": "F19" + }, + { + "title": "F20" + }, + { + "title": "F21" + }, + { + "title": "F22" + }, + { + "title": "F23" + }, + { + "title": "F24" + }, + { + "title": "F25" + }, + { + "title": "F26" + }, + { + "title": "F27" + }, + { + "title": "F28" + }, + { + "title": "F29" + }, + { + "title": "F30" + }, + { + "title": "F31" + }, + { + "title": "F32" + }, + { + "title": "F33" + }, + { + "title": "F34" + }, + { + "title": "F35" + } + ], + "short_name": "Key", + "title": "bevy_input::keyboard::Key", + "type": "object", + "typeInfo": "Enum" + }, + "bevy_input::keyboard::KeyCode": { + "isComponent": false, + "isResource": false, + "oneOf": [ + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/bevy_input::keyboard::NativeKeyCode" + } + } + ], + "short_name": "Unidentified", + "title": "Unidentified", + "type": "array", + "typeInfo": "Tuple" + }, + { + "title": "Backquote" + }, + { + "title": "Backslash" + }, + { + "title": "BracketLeft" + }, + { + "title": "BracketRight" + }, + { + "title": "Comma" + }, + { + "title": "Digit0" + }, + { + "title": "Digit1" + }, + { + "title": "Digit2" + }, + { + "title": "Digit3" + }, + { + "title": "Digit4" + }, + { + "title": "Digit5" + }, + { + "title": "Digit6" + }, + { + "title": "Digit7" + }, + { + "title": "Digit8" + }, + { + "title": "Digit9" + }, + { + "title": "Equal" + }, + { + "title": "IntlBackslash" + }, + { + "title": "IntlRo" + }, + { + "title": "IntlYen" + }, + { + "title": "KeyA" + }, + { + "title": "KeyB" + }, + { + "title": "KeyC" + }, + { + "title": "KeyD" + }, + { + "title": "KeyE" + }, + { + "title": "KeyF" + }, + { + "title": "KeyG" + }, + { + "title": "KeyH" + }, + { + "title": "KeyI" + }, + { + "title": "KeyJ" + }, + { + "title": "KeyK" + }, + { + "title": "KeyL" + }, + { + "title": "KeyM" + }, + { + "title": "KeyN" + }, + { + "title": "KeyO" + }, + { + "title": "KeyP" + }, + { + "title": "KeyQ" + }, + { + "title": "KeyR" + }, + { + "title": "KeyS" + }, + { + "title": "KeyT" + }, + { + "title": "KeyU" + }, + { + "title": "KeyV" + }, + { + "title": "KeyW" + }, + { + "title": "KeyX" + }, + { + "title": "KeyY" + }, + { + "title": "KeyZ" + }, + { + "title": "Minus" + }, + { + "title": "Period" + }, + { + "title": "Quote" + }, + { + "title": "Semicolon" + }, + { + "title": "Slash" + }, + { + "title": "AltLeft" + }, + { + "title": "AltRight" + }, + { + "title": "Backspace" + }, + { + "title": "CapsLock" + }, + { + "title": "ContextMenu" + }, + { + "title": "ControlLeft" + }, + { + "title": "ControlRight" + }, + { + "title": "Enter" + }, + { + "title": "SuperLeft" + }, + { + "title": "SuperRight" + }, + { + "title": "ShiftLeft" + }, + { + "title": "ShiftRight" + }, + { + "title": "Space" + }, + { + "title": "Tab" + }, + { + "title": "Convert" + }, + { + "title": "KanaMode" + }, + { + "title": "Lang1" + }, + { + "title": "Lang2" + }, + { + "title": "Lang3" + }, + { + "title": "Lang4" + }, + { + "title": "Lang5" + }, + { + "title": "NonConvert" + }, + { + "title": "Delete" + }, + { + "title": "End" + }, + { + "title": "Help" + }, + { + "title": "Home" + }, + { + "title": "Insert" + }, + { + "title": "PageDown" + }, + { + "title": "PageUp" + }, + { + "title": "ArrowDown" + }, + { + "title": "ArrowLeft" + }, + { + "title": "ArrowRight" + }, + { + "title": "ArrowUp" + }, + { + "title": "NumLock" + }, + { + "title": "Numpad0" + }, + { + "title": "Numpad1" + }, + { + "title": "Numpad2" + }, + { + "title": "Numpad3" + }, + { + "title": "Numpad4" + }, + { + "title": "Numpad5" + }, + { + "title": "Numpad6" + }, + { + "title": "Numpad7" + }, + { + "title": "Numpad8" + }, + { + "title": "Numpad9" + }, + { + "title": "NumpadAdd" + }, + { + "title": "NumpadBackspace" + }, + { + "title": "NumpadClear" + }, + { + "title": "NumpadClearEntry" + }, + { + "title": "NumpadComma" + }, + { + "title": "NumpadDecimal" + }, + { + "title": "NumpadDivide" + }, + { + "title": "NumpadEnter" + }, + { + "title": "NumpadEqual" + }, + { + "title": "NumpadHash" + }, + { + "title": "NumpadMemoryAdd" + }, + { + "title": "NumpadMemoryClear" + }, + { + "title": "NumpadMemoryRecall" + }, + { + "title": "NumpadMemoryStore" + }, + { + "title": "NumpadMemorySubtract" + }, + { + "title": "NumpadMultiply" + }, + { + "title": "NumpadParenLeft" + }, + { + "title": "NumpadParenRight" + }, + { + "title": "NumpadStar" + }, + { + "title": "NumpadSubtract" + }, + { + "title": "Escape" + }, + { + "title": "Fn" + }, + { + "title": "FnLock" + }, + { + "title": "PrintScreen" + }, + { + "title": "ScrollLock" + }, + { + "title": "Pause" + }, + { + "title": "BrowserBack" + }, + { + "title": "BrowserFavorites" + }, + { + "title": "BrowserForward" + }, + { + "title": "BrowserHome" + }, + { + "title": "BrowserRefresh" + }, + { + "title": "BrowserSearch" + }, + { + "title": "BrowserStop" + }, + { + "title": "Eject" + }, + { + "title": "LaunchApp1" + }, + { + "title": "LaunchApp2" + }, + { + "title": "LaunchMail" + }, + { + "title": "MediaPlayPause" + }, + { + "title": "MediaSelect" + }, + { + "title": "MediaStop" + }, + { + "title": "MediaTrackNext" + }, + { + "title": "MediaTrackPrevious" + }, + { + "title": "Power" + }, + { + "title": "Sleep" + }, + { + "title": "AudioVolumeDown" + }, + { + "title": "AudioVolumeMute" + }, + { + "title": "AudioVolumeUp" + }, + { + "title": "WakeUp" + }, + { + "title": "Meta" + }, + { + "title": "Hyper" + }, + { + "title": "Turbo" + }, + { + "title": "Abort" + }, + { + "title": "Resume" + }, + { + "title": "Suspend" + }, + { + "title": "Again" + }, + { + "title": "Copy" + }, + { + "title": "Cut" + }, + { + "title": "Find" + }, + { + "title": "Open" + }, + { + "title": "Paste" + }, + { + "title": "Props" + }, + { + "title": "Select" + }, + { + "title": "Undo" + }, + { + "title": "Hiragana" + }, + { + "title": "Katakana" + }, + { + "title": "F1" + }, + { + "title": "F2" + }, + { + "title": "F3" + }, + { + "title": "F4" + }, + { + "title": "F5" + }, + { + "title": "F6" + }, + { + "title": "F7" + }, + { + "title": "F8" + }, + { + "title": "F9" + }, + { + "title": "F10" + }, + { + "title": "F11" + }, + { + "title": "F12" + }, + { + "title": "F13" + }, + { + "title": "F14" + }, + { + "title": "F15" + }, + { + "title": "F16" + }, + { + "title": "F17" + }, + { + "title": "F18" + }, + { + "title": "F19" + }, + { + "title": "F20" + }, + { + "title": "F21" + }, + { + "title": "F22" + }, + { + "title": "F23" + }, + { + "title": "F24" + }, + { + "title": "F25" + }, + { + "title": "F26" + }, + { + "title": "F27" + }, + { + "title": "F28" + }, + { + "title": "F29" + }, + { + "title": "F30" + }, + { + "title": "F31" + }, + { + "title": "F32" + }, + { + "title": "F33" + }, + { + "title": "F34" + }, + { + "title": "F35" + } + ], + "short_name": "KeyCode", + "title": "bevy_input::keyboard::KeyCode", + "type": "object", + "typeInfo": "Enum" + }, + "bevy_input::keyboard::KeyboardInput": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "key_code": { + "type": { + "$ref": "#/$defs/bevy_input::keyboard::KeyCode" + } + }, + "logical_key": { + "type": { + "$ref": "#/$defs/bevy_input::keyboard::Key" + } + }, + "state": { + "type": { + "$ref": "#/$defs/bevy_input::ButtonState" + } + }, + "window": { + "type": { + "$ref": "#/$defs/bevy_ecs::entity::Entity" + } + } + }, + "required": [ + "key_code", + "logical_key", + "state", + "window" + ], + "short_name": "KeyboardInput", + "title": "bevy_input::keyboard::KeyboardInput", + "type": "object", + "typeInfo": "Struct" + }, + "bevy_input::keyboard::NativeKey": { + "isComponent": false, + "isResource": false, + "oneOf": [ + { + "title": "Unidentified" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/u32" + } + } + ], + "short_name": "Android", + "title": "Android", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/u16" + } + } + ], + "short_name": "MacOS", + "title": "MacOS", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/u16" + } + } + ], + "short_name": "Windows", + "title": "Windows", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/u32" + } + } + ], + "short_name": "Xkb", + "title": "Xkb", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/smol_str::SmolStr" + } + } + ], + "short_name": "Web", + "title": "Web", + "type": "array", + "typeInfo": "Tuple" + } + ], + "short_name": "NativeKey", + "title": "bevy_input::keyboard::NativeKey", + "type": "object", + "typeInfo": "Enum" + }, + "bevy_input::keyboard::NativeKeyCode": { + "isComponent": false, + "isResource": false, + "oneOf": [ + { + "title": "Unidentified" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/u32" + } + } + ], + "short_name": "Android", + "title": "Android", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/u16" + } + } + ], + "short_name": "MacOS", + "title": "MacOS", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/u16" + } + } + ], + "short_name": "Windows", + "title": "Windows", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/u32" + } + } + ], + "short_name": "Xkb", + "title": "Xkb", + "type": "array", + "typeInfo": "Tuple" + } + ], + "short_name": "NativeKeyCode", + "title": "bevy_input::keyboard::NativeKeyCode", + "type": "object", + "typeInfo": "Enum" + }, + "bevy_input::mouse::MouseButton": { + "isComponent": false, + "isResource": false, + "oneOf": [ + { + "title": "Left" + }, + { + "title": "Right" + }, + { + "title": "Middle" + }, + { + "title": "Back" + }, + { + "title": "Forward" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/u16" + } + } + ], + "short_name": "Other", + "title": "Other", + "type": "array", + "typeInfo": "Tuple" + } + ], + "short_name": "MouseButton", + "title": "bevy_input::mouse::MouseButton", + "type": "object", + "typeInfo": "Enum" + }, + "bevy_input::mouse::MouseButtonInput": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "button": { + "type": { + "$ref": "#/$defs/bevy_input::mouse::MouseButton" + } + }, + "state": { + "type": { + "$ref": "#/$defs/bevy_input::ButtonState" + } + }, + "window": { + "type": { + "$ref": "#/$defs/bevy_ecs::entity::Entity" + } + } + }, + "required": [ + "button", + "state", + "window" + ], + "short_name": "MouseButtonInput", + "title": "bevy_input::mouse::MouseButtonInput", + "type": "object", + "typeInfo": "Struct" + }, + "bevy_input::mouse::MouseMotion": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "delta": { + "type": { + "$ref": "#/$defs/glam::Vec2" + } + } + }, + "required": [ + "delta" + ], + "short_name": "MouseMotion", + "title": "bevy_input::mouse::MouseMotion", + "type": "object", + "typeInfo": "Struct" + }, + "bevy_input::mouse::MouseScrollUnit": { + "isComponent": false, + "isResource": false, + "oneOf": [ + "Line", + "Pixel" + ], + "short_name": "MouseScrollUnit", + "title": "bevy_input::mouse::MouseScrollUnit", + "type": "string", + "typeInfo": "Enum" + }, + "bevy_input::mouse::MouseWheel": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "unit": { + "type": { "$ref": "#/$defs/bevy_input::mouse::MouseScrollUnit" } }, "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } }, "x": { @@ -4416,11 +6305,17 @@ "type": { "$ref": "#/$defs/glam::Vec2" } + }, + "window": { + "type": { + "$ref": "#/$defs/bevy_ecs::entity::Entity" + } } }, "required": [ "phase", "position", + "window", "id" ], "short_name": "TouchInput", @@ -4560,30 +6455,101 @@ "type": "object", "typeInfo": "Struct" }, - "bevy_pbr::environment_map::EnvironmentMapLight": { - "additionalProperties": false, + "bevy_pbr::fog::FogFalloff": { "isComponent": false, "isResource": false, - "properties": { - "diffuse_map": { - "type": { - "$ref": "#/$defs/bevy_asset::handle::Handle" - } + "oneOf": [ + { + "additionalProperties": false, + "properties": { + "end": { + "title": "end", + "type": { + "$ref": "#/$defs/f32" + } + }, + "start": { + "title": "start", + "type": { + "$ref": "#/$defs/f32" + } + } + }, + "required": [ + "start", + "end" + ], + "short_name": "Linear", + "title": "Linear", + "type": "object", + "typeInfo": "Struct" }, - "specular_map": { - "type": { - "$ref": "#/$defs/bevy_asset::handle::Handle" - } + { + "additionalProperties": false, + "properties": { + "density": { + "title": "density", + "type": { + "$ref": "#/$defs/f32" + } + } + }, + "required": [ + "density" + ], + "short_name": "Exponential", + "title": "Exponential", + "type": "object", + "typeInfo": "Struct" + }, + { + "additionalProperties": false, + "properties": { + "density": { + "title": "density", + "type": { + "$ref": "#/$defs/f32" + } + } + }, + "required": [ + "density" + ], + "short_name": "ExponentialSquared", + "title": "ExponentialSquared", + "type": "object", + "typeInfo": "Struct" + }, + { + "additionalProperties": false, + "properties": { + "extinction": { + "title": "extinction", + "type": { + "$ref": "#/$defs/glam::Vec3" + } + }, + "inscattering": { + "title": "inscattering", + "type": { + "$ref": "#/$defs/glam::Vec3" + } + } + }, + "required": [ + "extinction", + "inscattering" + ], + "short_name": "Atmospheric", + "title": "Atmospheric", + "type": "object", + "typeInfo": "Struct" } - }, - "required": [ - "diffuse_map", - "specular_map" ], - "short_name": "EnvironmentMapLight", - "title": "bevy_pbr::environment_map::EnvironmentMapLight", + "short_name": "FogFalloff", + "title": "bevy_pbr::fog::FogFalloff", "type": "object", - "typeInfo": "Struct" + "typeInfo": "Enum" }, "bevy_pbr::fog::FogSettings": { "additionalProperties": false, @@ -4722,7 +6688,7 @@ "properties": { "cascades": { "type": { - "$ref": "#/$defs/bevy_utils::hashbrown::HashMap, bevy_utils::hashbrown::hash_map::DefaultHashBuilder>" + "$ref": "#/$defs/bevy_utils::hashbrown::HashMap, bevy_ecs::entity::hash::EntityHash>" } } }, @@ -5111,6 +7077,73 @@ "type": "object", "typeInfo": "Struct" }, + "bevy_pbr::light_probe::LightProbe": { + "additionalProperties": false, + "isComponent": true, + "isResource": false, + "properties": {}, + "required": [], + "short_name": "LightProbe", + "title": "bevy_pbr::light_probe::LightProbe", + "type": "object", + "typeInfo": "Struct" + }, + "bevy_pbr::light_probe::environment_map::EnvironmentMapLight": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "diffuse_map": { + "type": { + "$ref": "#/$defs/bevy_asset::handle::Handle" + } + }, + "intensity": { + "type": { + "$ref": "#/$defs/f32" + } + }, + "specular_map": { + "type": { + "$ref": "#/$defs/bevy_asset::handle::Handle" + } + } + }, + "required": [ + "diffuse_map", + "specular_map", + "intensity" + ], + "short_name": "EnvironmentMapLight", + "title": "bevy_pbr::light_probe::environment_map::EnvironmentMapLight", + "type": "object", + "typeInfo": "Struct" + }, + "bevy_pbr::light_probe::irradiance_volume::IrradianceVolume": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "intensity": { + "type": { + "$ref": "#/$defs/f32" + } + }, + "voxels": { + "type": { + "$ref": "#/$defs/bevy_asset::handle::Handle" + } + } + }, + "required": [ + "voxels", + "intensity" + ], + "short_name": "IrradianceVolume", + "title": "bevy_pbr::light_probe::irradiance_volume::IrradianceVolume", + "type": "object", + "typeInfo": "Struct" + }, "bevy_pbr::material::DefaultOpaqueRendererMethod": { "isComponent": false, "isResource": false, @@ -5122,10 +7155,54 @@ } } ], - "short_name": "DefaultOpaqueRendererMethod", - "title": "bevy_pbr::material::DefaultOpaqueRendererMethod", - "type": "array", - "typeInfo": "TupleStruct" + "short_name": "DefaultOpaqueRendererMethod", + "title": "bevy_pbr::material::DefaultOpaqueRendererMethod", + "type": "array", + "typeInfo": "TupleStruct" + }, + "bevy_pbr::material::OpaqueRendererMethod": { + "isComponent": false, + "isResource": false, + "oneOf": [ + "Forward", + "Deferred", + "Auto" + ], + "short_name": "OpaqueRendererMethod", + "title": "bevy_pbr::material::OpaqueRendererMethod", + "type": "string", + "typeInfo": "Enum" + }, + "bevy_pbr::parallax::ParallaxMappingMethod": { + "isComponent": false, + "isResource": false, + "oneOf": [ + { + "title": "Occlusion" + }, + { + "additionalProperties": false, + "properties": { + "max_steps": { + "title": "max_steps", + "type": { + "$ref": "#/$defs/u32" + } + } + }, + "required": [ + "max_steps" + ], + "short_name": "Relief", + "title": "Relief", + "type": "object", + "typeInfo": "Struct" + } + ], + "short_name": "ParallaxMappingMethod", + "title": "bevy_pbr::parallax::ParallaxMappingMethod", + "type": "object", + "typeInfo": "Enum" }, "bevy_pbr::pbr_material::StandardMaterial": { "additionalProperties": false, @@ -5207,6 +7284,11 @@ "$ref": "#/$defs/f32" } }, + "lightmap_exposure": { + "type": { + "$ref": "#/$defs/f32" + } + }, "max_parallax_layer_count": { "type": { "$ref": "#/$defs/f32" @@ -5294,6 +7376,7 @@ "parallax_depth_scale", "parallax_mapping_method", "max_parallax_layer_count", + "lightmap_exposure", "opaque_render_method", "deferred_lighting_pass_id" ], @@ -5343,6 +7426,25 @@ "type": "object", "typeInfo": "Struct" }, + "bevy_pbr::wireframe::WireframeColor": { + "additionalProperties": false, + "isComponent": true, + "isResource": false, + "properties": { + "color": { + "type": { + "$ref": "#/$defs/bevy_render::color::Color" + } + } + }, + "required": [ + "color" + ], + "short_name": "WireframeColor", + "title": "bevy_pbr::wireframe::WireframeColor", + "type": "object", + "typeInfo": "Struct" + }, "bevy_pbr::wireframe::WireframeConfig": { "additionalProperties": false, "isComponent": false, @@ -5373,6 +7475,11 @@ "isComponent": true, "isResource": false, "properties": { + "clear_color": { + "type": { + "$ref": "#/$defs/bevy_render::camera::clear_color::ClearColorConfig" + } + }, "hdr": { "type": { "$ref": "#/$defs/bool" @@ -5403,28 +7510,37 @@ "order", "is_active", "hdr", - "msaa_writeback" + "msaa_writeback", + "clear_color" ], "short_name": "Camera", "title": "bevy_render::camera::camera::Camera", "type": "object", "typeInfo": "Struct" }, + "bevy_render::camera::camera::CameraMainTextureUsages": { + "isComponent": true, + "isResource": false, + "short_name": "CameraMainTextureUsages", + "title": "bevy_render::camera::camera::CameraMainTextureUsages", + "type": "object", + "typeInfo": "Value" + }, "bevy_render::camera::camera::CameraRenderGraph": { "isComponent": true, "isResource": false, - "items": false, - "prefixItems": [ - { - "type": { - "$ref": "#/$defs/alloc::borrow::Cow" - } - } - ], "short_name": "CameraRenderGraph", "title": "bevy_render::camera::camera::CameraRenderGraph", - "type": "array", - "typeInfo": "TupleStruct" + "type": "object", + "typeInfo": "Value" + }, + "bevy_render::camera::camera::Exposure": { + "isComponent": true, + "isResource": false, + "short_name": "Exposure", + "title": "bevy_render::camera::camera::Exposure", + "type": "object", + "typeInfo": "Value" }, "bevy_render::camera::camera::RenderTarget": { "isComponent": false, @@ -5509,6 +7625,52 @@ "type": "object", "typeInfo": "Struct" }, + "bevy_render::camera::clear_color::ClearColor": { + "isComponent": false, + "isResource": true, + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/bevy_render::color::Color" + } + } + ], + "short_name": "ClearColor", + "title": "bevy_render::camera::clear_color::ClearColor", + "type": "array", + "typeInfo": "TupleStruct" + }, + "bevy_render::camera::clear_color::ClearColorConfig": { + "isComponent": false, + "isResource": false, + "oneOf": [ + { + "title": "Default" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/bevy_render::color::Color" + } + } + ], + "short_name": "Custom", + "title": "Custom", + "type": "array", + "typeInfo": "Tuple" + }, + { + "title": "None" + } + ], + "short_name": "ClearColorConfig", + "title": "bevy_render::camera::clear_color::ClearColorConfig", + "type": "object", + "typeInfo": "Enum" + }, "bevy_render::camera::projection::OrthographicProjection": { "additionalProperties": false, "isComponent": true, @@ -6000,6 +8162,11 @@ "isComponent": false, "isResource": false, "properties": { + "asset_usage": { + "type": { + "$ref": "#/$defs/bevy_render::render_asset::RenderAssetUsages" + } + }, "indices": { "type": { "$ref": "#/$defs/core::option::Option" @@ -6016,7 +8183,9 @@ } } }, - "required": [], + "required": [ + "asset_usage" + ], "short_name": "Mesh", "title": "bevy_render::mesh::mesh::Mesh", "type": "object", @@ -6034,7 +8203,7 @@ }, "joints": { "type": { - "$ref": "#/$defs/alloc::vec::Vec" + "$ref": "#/$defs/alloc::vec::Vec" } } }, @@ -6381,6 +8550,62 @@ "type": "object", "typeInfo": "Enum" }, + "bevy_sprite::sprite::ImageScaleMode": { + "isComponent": true, + "isResource": false, + "oneOf": [ + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/bevy_sprite::texture_slice::slicer::TextureSlicer" + } + } + ], + "short_name": "Sliced", + "title": "Sliced", + "type": "array", + "typeInfo": "Tuple" + }, + { + "additionalProperties": false, + "properties": { + "stretch_value": { + "title": "stretch_value", + "type": { + "$ref": "#/$defs/f32" + } + }, + "tile_x": { + "title": "tile_x", + "type": { + "$ref": "#/$defs/bool" + } + }, + "tile_y": { + "title": "tile_y", + "type": { + "$ref": "#/$defs/bool" + } + } + }, + "required": [ + "tile_x", + "tile_y", + "stretch_value" + ], + "short_name": "Tiled", + "title": "Tiled", + "type": "object", + "typeInfo": "Struct" + } + ], + "short_name": "ImageScaleMode", + "title": "bevy_sprite::sprite::ImageScaleMode", + "type": "object", + "typeInfo": "Enum" + }, "bevy_sprite::sprite::Sprite": { "additionalProperties": false, "isComponent": true, @@ -6433,14 +8658,34 @@ "isComponent": false, "isResource": false, "properties": { - "size": { + "index": { "type": { - "$ref": "#/$defs/glam::Vec2" + "$ref": "#/$defs/usize" } }, - "texture": { + "layout": { "type": { - "$ref": "#/$defs/bevy_asset::handle::Handle" + "$ref": "#/$defs/bevy_asset::handle::Handle" + } + } + }, + "required": [ + "layout", + "index" + ], + "short_name": "TextureAtlas", + "title": "bevy_sprite::texture_atlas::TextureAtlas", + "type": "object", + "typeInfo": "Struct" + }, + "bevy_sprite::texture_atlas::TextureAtlasLayout": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "size": { + "type": { + "$ref": "#/$defs/glam::Vec2" } }, "texture_handles": { @@ -6455,60 +8700,48 @@ } }, "required": [ - "texture", "size", "textures" ], - "short_name": "TextureAtlas", - "title": "bevy_sprite::texture_atlas::TextureAtlas", + "short_name": "TextureAtlasLayout", + "title": "bevy_sprite::texture_atlas::TextureAtlasLayout", "type": "object", "typeInfo": "Struct" }, - "bevy_sprite::texture_atlas::TextureAtlasSprite": { + "bevy_sprite::texture_slice::slicer::TextureSlicer": { "additionalProperties": false, - "isComponent": true, + "isComponent": false, "isResource": false, "properties": { - "anchor": { - "type": { - "$ref": "#/$defs/bevy_sprite::sprite::Anchor" - } - }, - "color": { - "type": { - "$ref": "#/$defs/bevy_render::color::Color" - } - }, - "custom_size": { + "border": { "type": { - "$ref": "#/$defs/core::option::Option" + "$ref": "#/$defs/bevy_sprite::texture_slice::border_rect::BorderRect" } }, - "flip_x": { + "center_scale_mode": { "type": { - "$ref": "#/$defs/bool" + "$ref": "#/$defs/bevy_sprite::texture_slice::slicer::SliceScaleMode" } }, - "flip_y": { + "max_corner_scale": { "type": { - "$ref": "#/$defs/bool" + "$ref": "#/$defs/f32" } }, - "index": { + "sides_scale_mode": { "type": { - "$ref": "#/$defs/usize" + "$ref": "#/$defs/bevy_sprite::texture_slice::slicer::SliceScaleMode" } } }, "required": [ - "color", - "index", - "flip_x", - "flip_y", - "anchor" + "border", + "center_scale_mode", + "sides_scale_mode", + "max_corner_scale" ], - "short_name": "TextureAtlasSprite", - "title": "bevy_sprite::texture_atlas::TextureAtlasSprite", + "short_name": "TextureSlicer", + "title": "bevy_sprite::texture_slice::slicer::TextureSlicer", "type": "object", "typeInfo": "Struct" }, @@ -6569,14 +8802,27 @@ "type": "string", "typeInfo": "Enum" }, + "bevy_text::text::JustifyText": { + "isComponent": false, + "isResource": false, + "oneOf": [ + "Left", + "Center", + "Right" + ], + "short_name": "JustifyText", + "title": "bevy_text::text::JustifyText", + "type": "string", + "typeInfo": "Enum" + }, "bevy_text::text::Text": { "additionalProperties": false, "isComponent": true, "isResource": false, "properties": { - "alignment": { + "justify": { "type": { - "$ref": "#/$defs/bevy_text::text::TextAlignment" + "$ref": "#/$defs/bevy_text::text::JustifyText" } }, "linebreak_behavior": { @@ -6592,7 +8838,7 @@ }, "required": [ "sections", - "alignment", + "justify", "linebreak_behavior" ], "short_name": "Text", @@ -6600,19 +8846,6 @@ "type": "object", "typeInfo": "Struct" }, - "bevy_text::text::TextAlignment": { - "isComponent": false, - "isResource": false, - "oneOf": [ - "Left", - "Center", - "Right" - ], - "short_name": "TextAlignment", - "title": "bevy_text::text::TextAlignment", - "type": "string", - "typeInfo": "Enum" - }, "bevy_text::text::TextSection": { "additionalProperties": false, "isComponent": false, @@ -7302,7 +9535,7 @@ "prefixItems": [ { "type": { - "$ref": "#/$defs/f64" + "$ref": "#/$defs/f32" } } ], @@ -7311,25 +9544,6 @@ "type": "array", "typeInfo": "TupleStruct" }, - "bevy_ui::camera_config::UiCameraConfig": { - "additionalProperties": false, - "isComponent": true, - "isResource": false, - "properties": { - "show_ui": { - "type": { - "$ref": "#/$defs/bool" - } - } - }, - "required": [ - "show_ui" - ], - "short_name": "UiCameraConfig", - "title": "bevy_ui::camera_config::UiCameraConfig", - "type": "object", - "typeInfo": "Struct" - }, "bevy_ui::focus::FocusPolicy": { "isComponent": true, "isResource": false, @@ -7937,7 +10151,7 @@ }, "tracks": { "type": { - "$ref": "#/$defs/smallvec::SmallVec<[bevy_ui::ui_node::GridTrack; 1]>" + "$ref": "#/$defs/bevy_utils::smallvec::SmallVec<[bevy_ui::ui_node::GridTrack; 1]>" } } }, @@ -8190,38 +10404,23 @@ "type": "object", "typeInfo": "Struct" }, - "bevy_ui::ui_node::UiImage": { - "additionalProperties": false, - "isComponent": true, + "bevy_ui::ui_node::TargetCamera": { + "isComponent": false, "isResource": false, - "properties": { - "flip_x": { - "type": { - "$ref": "#/$defs/bool" - } - }, - "flip_y": { - "type": { - "$ref": "#/$defs/bool" - } - }, - "texture": { + "items": false, + "prefixItems": [ + { "type": { - "$ref": "#/$defs/bevy_asset::handle::Handle" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } - }, - "required": [ - "texture", - "flip_x", - "flip_y" ], - "short_name": "UiImage", - "title": "bevy_ui::ui_node::UiImage", - "type": "object", - "typeInfo": "Struct" + "short_name": "TargetCamera", + "title": "bevy_ui::ui_node::TargetCamera", + "type": "array", + "typeInfo": "TupleStruct" }, - "bevy_ui::ui_node::UiTextureAtlasImage": { + "bevy_ui::ui_node::UiImage": { "additionalProperties": false, "isComponent": true, "isResource": false, @@ -8236,19 +10435,19 @@ "$ref": "#/$defs/bool" } }, - "index": { + "texture": { "type": { - "$ref": "#/$defs/usize" + "$ref": "#/$defs/bevy_asset::handle::Handle" } } }, "required": [ - "index", + "texture", "flip_x", "flip_y" ], - "short_name": "UiTextureAtlasImage", - "title": "bevy_ui::ui_node::UiTextureAtlasImage", + "short_name": "UiImage", + "title": "bevy_ui::ui_node::UiImage", "type": "object", "typeInfo": "Struct" }, @@ -8388,31 +10587,40 @@ "type": "object", "typeInfo": "Value" }, + "bevy_utils::smallvec::SmallVec<[bevy_ecs::entity::Entity; 8]>": { + "isComponent": false, + "isResource": false, + "items": { + "type": { + "$ref": "#/$defs/bevy_ecs::entity::Entity" + } + }, + "short_name": "SmallVec<[Entity; 8]>", + "title": "bevy_utils::smallvec::SmallVec<[bevy_ecs::entity::Entity; 8]>", + "type": "array", + "typeInfo": "List" + }, "bevy_window::cursor::CursorIcon": { "isComponent": false, "isResource": false, "oneOf": [ "Default", - "Crosshair", - "Hand", - "Arrow", - "Move", - "Text", - "Wait", + "ContextMenu", "Help", + "Pointer", "Progress", - "NotAllowed", - "ContextMenu", + "Wait", "Cell", + "Crosshair", + "Text", "VerticalText", "Alias", "Copy", + "Move", "NoDrop", + "NotAllowed", "Grab", "Grabbing", - "AllScroll", - "ZoomIn", - "ZoomOut", "EResize", "NResize", "NeResize", @@ -8426,7 +10634,10 @@ "NeswResize", "NwseResize", "ColResize", - "RowResize" + "RowResize", + "AllScroll", + "ZoomIn", + "ZoomOut" ], "short_name": "CursorIcon", "title": "bevy_window::cursor::CursorIcon", @@ -8453,7 +10664,7 @@ "properties": { "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8472,7 +10683,7 @@ "properties": { "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8489,6 +10700,11 @@ "isComponent": false, "isResource": false, "properties": { + "delta": { + "type": { + "$ref": "#/$defs/core::option::Option" + } + }, "position": { "type": { "$ref": "#/$defs/glam::Vec2" @@ -8496,7 +10712,7 @@ }, "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8525,7 +10741,7 @@ "window": { "title": "window", "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8550,7 +10766,7 @@ "window": { "title": "window", "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8569,7 +10785,7 @@ "window": { "title": "window", "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8594,12 +10810,12 @@ "properties": { "char": { "type": { - "$ref": "#/$defs/char" + "$ref": "#/$defs/smol_str::SmolStr" } }, "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8635,7 +10851,7 @@ }, "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8655,7 +10871,7 @@ "properties": { "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8674,7 +10890,7 @@ "properties": { "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8693,7 +10909,7 @@ "properties": { "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8717,7 +10933,7 @@ }, "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8735,19 +10951,19 @@ "isComponent": false, "isResource": false, "properties": { - "entity": { + "position": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/glam::IVec2" } }, - "position": { + "window": { "type": { - "$ref": "#/$defs/glam::IVec2" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, "required": [ - "entity", + "window", "position" ], "short_name": "WindowMoved", @@ -8755,6 +10971,31 @@ "type": "object", "typeInfo": "Struct" }, + "bevy_window::event::WindowOccluded": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "occluded": { + "type": { + "$ref": "#/$defs/bool" + } + }, + "window": { + "type": { + "$ref": "#/$defs/bevy_ecs::entity::Entity" + } + } + }, + "required": [ + "window", + "occluded" + ], + "short_name": "WindowOccluded", + "title": "bevy_window::event::WindowOccluded", + "type": "object", + "typeInfo": "Struct" + }, "bevy_window::event::WindowResized": { "additionalProperties": false, "isComponent": false, @@ -8772,7 +11013,7 @@ }, "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8798,7 +11039,7 @@ }, "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -8823,7 +11064,7 @@ }, "window": { "type": { - "$ref": "#/$defs/bevy_ecs::Entity" + "$ref": "#/$defs/bevy_ecs::entity::Entity" } } }, @@ -9046,11 +11287,6 @@ "$ref": "#/$defs/bevy_window::window::EnabledButtons" } }, - "fit_canvas_to_parent": { - "type": { - "$ref": "#/$defs/bool" - } - }, "focused": { "type": { "$ref": "#/$defs/bool" @@ -9076,6 +11312,11 @@ "$ref": "#/$defs/bevy_window::window::WindowMode" } }, + "name": { + "type": { + "$ref": "#/$defs/core::option::Option" + } + }, "position": { "type": { "$ref": "#/$defs/bevy_window::window::WindowPosition" @@ -9147,7 +11388,6 @@ "transparent", "focused", "window_level", - "fit_canvas_to_parent", "prevent_default_event_handling", "internal", "ime_enabled", @@ -9281,12 +11521,12 @@ }, "scale_factor": { "type": { - "$ref": "#/$defs/f64" + "$ref": "#/$defs/f32" } }, "scale_factor_override": { "type": { - "$ref": "#/$defs/core::option::Option" + "$ref": "#/$defs/core::option::Option" } } }, @@ -9609,80 +11849,6 @@ "type": "array", "typeInfo": "TupleStruct" }, - "bevy_xpbd_3d::components::collider::ColliderParent": { - "isComponent": false, - "isResource": false, - "items": false, - "prefixItems": [ - { - "type": { - "$ref": "#/$defs/bevy_ecs::Entity" - } - } - ], - "short_name": "ColliderParent", - "title": "bevy_xpbd_3d::components::collider::ColliderParent", - "type": "array", - "typeInfo": "TupleStruct" - }, - "bevy_xpbd_3d::components::collider::ColliderTransform": { - "additionalProperties": false, - "isComponent": false, - "isResource": false, - "properties": { - "rotation": { - "type": { - "$ref": "#/$defs/bevy_xpbd_3d::components::rotation::Rotation" - } - }, - "scale": { - "type": { - "$ref": "#/$defs/glam::Vec3" - } - }, - "translation": { - "type": { - "$ref": "#/$defs/glam::Vec3" - } - } - }, - "required": [ - "translation", - "rotation", - "scale" - ], - "short_name": "ColliderTransform", - "title": "bevy_xpbd_3d::components::collider::ColliderTransform", - "type": "object", - "typeInfo": "Struct" - }, - "bevy_xpbd_3d::components::collider::CollidingEntities": { - "isComponent": true, - "isResource": false, - "items": false, - "prefixItems": [ - { - "type": { - "$ref": "#/$defs/bevy_utils::HashSet" - } - } - ], - "short_name": "CollidingEntities", - "title": "bevy_xpbd_3d::components::collider::CollidingEntities", - "type": "array", - "typeInfo": "TupleStruct" - }, - "bevy_xpbd_3d::components::collider::Sensor": { - "additionalProperties": false, - "isComponent": true, - "isResource": false, - "properties": {}, - "required": [], - "short_name": "Sensor", - "title": "bevy_xpbd_3d::components::collider::Sensor", - "type": "object", - "typeInfo": "Struct" - }, "bevy_xpbd_3d::components::forces::ExternalAngularImpulse": { "additionalProperties": false, "isComponent": true, @@ -9800,20 +11966,20 @@ "isComponent": true, "isResource": false, "properties": { - "groups": { + "filters": { "type": { - "$ref": "#/$defs/u32" + "$ref": "#/$defs/bevy_xpbd_3d::components::layers::LayerMask" } }, - "masks": { + "memberships": { "type": { - "$ref": "#/$defs/u32" + "$ref": "#/$defs/bevy_xpbd_3d::components::layers::LayerMask" } } }, "required": [ - "groups", - "masks" + "memberships", + "filters" ], "short_name": "CollisionLayers", "title": "bevy_xpbd_3d::components::layers::CollisionLayers", @@ -10014,7 +12180,7 @@ "prefixItems": [ { "type": { - "$ref": "#/$defs/alloc::vec::Vec<(bevy_ecs::Entity, bevy_ecs::Entity)>" + "$ref": "#/$defs/alloc::vec::Vec<(bevy_ecs::entity::Entity, bevy_ecs::entity::Entity)>" } } ], @@ -10023,6 +12189,96 @@ "type": "array", "typeInfo": "TupleStruct" }, + "bevy_xpbd_3d::plugins::collision::collider::ColliderParent": { + "isComponent": false, + "isResource": false, + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/bevy_ecs::entity::Entity" + } + } + ], + "short_name": "ColliderParent", + "title": "bevy_xpbd_3d::plugins::collision::collider::ColliderParent", + "type": "array", + "typeInfo": "TupleStruct" + }, + "bevy_xpbd_3d::plugins::collision::collider::ColliderTransform": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "rotation": { + "type": { + "$ref": "#/$defs/bevy_xpbd_3d::components::rotation::Rotation" + } + }, + "scale": { + "type": { + "$ref": "#/$defs/glam::Vec3" + } + }, + "translation": { + "type": { + "$ref": "#/$defs/glam::Vec3" + } + } + }, + "required": [ + "translation", + "rotation", + "scale" + ], + "short_name": "ColliderTransform", + "title": "bevy_xpbd_3d::plugins::collision::collider::ColliderTransform", + "type": "object", + "typeInfo": "Struct" + }, + "bevy_xpbd_3d::plugins::collision::collider::CollidingEntities": { + "isComponent": true, + "isResource": false, + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/bevy_utils::HashSet" + } + } + ], + "short_name": "CollidingEntities", + "title": "bevy_xpbd_3d::plugins::collision::collider::CollidingEntities", + "type": "array", + "typeInfo": "TupleStruct" + }, + "bevy_xpbd_3d::plugins::collision::collider::Sensor": { + "additionalProperties": false, + "isComponent": true, + "isResource": false, + "properties": {}, + "required": [], + "short_name": "Sensor", + "title": "bevy_xpbd_3d::plugins::collision::collider::Sensor", + "type": "object", + "typeInfo": "Struct" + }, + "bevy_xpbd_3d::plugins::collision::collider_backend::PreviousColliderTransform": { + "isComponent": true, + "isResource": false, + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/bevy_xpbd_3d::plugins::collision::collider::ColliderTransform" + } + } + ], + "short_name": "PreviousColliderTransform", + "title": "bevy_xpbd_3d::plugins::collision::collider_backend::PreviousColliderTransform", + "type": "array", + "typeInfo": "TupleStruct" + }, "bevy_xpbd_3d::plugins::collision::narrow_phase::NarrowPhaseConfig": { "additionalProperties": false, "isComponent": false, @@ -10081,10 +12337,10 @@ "type": "object", "typeInfo": "Struct" }, - "bevy_xpbd_3d::plugins::debug::configuration::PhysicsDebugConfig": { + "bevy_xpbd_3d::plugins::debug::configuration::PhysicsGizmos": { "additionalProperties": false, "isComponent": false, - "isResource": true, + "isResource": false, "properties": { "aabb_color": { "type": { @@ -10101,14 +12357,19 @@ "$ref": "#/$defs/core::option::Option" } }, - "contact_color": { + "contact_normal_color": { "type": { "$ref": "#/$defs/core::option::Option" } }, - "enabled": { + "contact_normal_scale": { "type": { - "$ref": "#/$defs/bool" + "$ref": "#/$defs/bevy_xpbd_3d::plugins::debug::configuration::ContactGizmoScale" + } + }, + "contact_point_color": { + "type": { + "$ref": "#/$defs/core::option::Option" } }, "hide_meshes": { @@ -10168,29 +12429,38 @@ } }, "required": [ - "enabled", + "contact_normal_scale", "hide_meshes" ], - "short_name": "PhysicsDebugConfig", - "title": "bevy_xpbd_3d::plugins::debug::configuration::PhysicsDebugConfig", + "short_name": "PhysicsGizmos", + "title": "bevy_xpbd_3d::plugins::debug::configuration::PhysicsGizmos", "type": "object", "typeInfo": "Struct" }, - "bevy_xpbd_3d::plugins::prepare::PreviousColliderTransform": { - "isComponent": true, - "isResource": false, - "items": false, - "prefixItems": [ - { + "bevy_xpbd_3d::plugins::prepare::PrepareConfig": { + "additionalProperties": false, + "isComponent": false, + "isResource": true, + "properties": { + "position_to_transform": { + "type": { + "$ref": "#/$defs/bool" + } + }, + "transform_to_position": { "type": { - "$ref": "#/$defs/bevy_xpbd_3d::components::collider::ColliderTransform" + "$ref": "#/$defs/bool" } } + }, + "required": [ + "position_to_transform", + "transform_to_position" ], - "short_name": "PreviousColliderTransform", - "title": "bevy_xpbd_3d::plugins::prepare::PreviousColliderTransform", - "type": "array", - "typeInfo": "TupleStruct" + "short_name": "PrepareConfig", + "title": "bevy_xpbd_3d::plugins::prepare::PrepareConfig", + "type": "object", + "typeInfo": "Struct" }, "bevy_xpbd_3d::plugins::sync::PreviousGlobalTransform": { "isComponent": true, @@ -10988,7 +13258,7 @@ "prefixItems": [ { "type": { - "$ref": "#/$defs/core::option::Option" + "$ref": "#/$defs/core::option::Option" } } ], @@ -11366,55 +13636,309 @@ "isComponent": false, "isResource": false, "properties": { - "x": { + "x": { + "type": { + "$ref": "#/$defs/f64" + } + }, + "y": { + "type": { + "$ref": "#/$defs/f64" + } + }, + "z": { + "type": { + "$ref": "#/$defs/f64" + } + } + }, + "required": [ + "x", + "y", + "z" + ], + "short_name": "DVec3", + "title": "glam::DVec3", + "type": "object", + "typeInfo": "Struct" + }, + "glam::DVec4": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "w": { + "type": { + "$ref": "#/$defs/f64" + } + }, + "x": { + "type": { + "$ref": "#/$defs/f64" + } + }, + "y": { + "type": { + "$ref": "#/$defs/f64" + } + }, + "z": { + "type": { + "$ref": "#/$defs/f64" + } + } + }, + "required": [ + "x", + "y", + "z", + "w" + ], + "short_name": "DVec4", + "title": "glam::DVec4", + "type": "object", + "typeInfo": "Struct" + }, + "glam::IVec2": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "x": { + "type": { + "$ref": "#/$defs/i32" + } + }, + "y": { + "type": { + "$ref": "#/$defs/i32" + } + } + }, + "required": [ + "x", + "y" + ], + "short_name": "IVec2", + "title": "glam::IVec2", + "type": "object", + "typeInfo": "Struct" + }, + "glam::IVec3": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "x": { + "type": { + "$ref": "#/$defs/i32" + } + }, + "y": { + "type": { + "$ref": "#/$defs/i32" + } + }, + "z": { + "type": { + "$ref": "#/$defs/i32" + } + } + }, + "required": [ + "x", + "y", + "z" + ], + "short_name": "IVec3", + "title": "glam::IVec3", + "type": "object", + "typeInfo": "Struct" + }, + "glam::IVec4": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "w": { + "type": { + "$ref": "#/$defs/i32" + } + }, + "x": { + "type": { + "$ref": "#/$defs/i32" + } + }, + "y": { + "type": { + "$ref": "#/$defs/i32" + } + }, + "z": { + "type": { + "$ref": "#/$defs/i32" + } + } + }, + "required": [ + "x", + "y", + "z", + "w" + ], + "short_name": "IVec4", + "title": "glam::IVec4", + "type": "object", + "typeInfo": "Struct" + }, + "glam::Mat2": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "x_axis": { + "type": { + "$ref": "#/$defs/glam::Vec2" + } + }, + "y_axis": { + "type": { + "$ref": "#/$defs/glam::Vec2" + } + } + }, + "required": [ + "x_axis", + "y_axis" + ], + "short_name": "Mat2", + "title": "glam::Mat2", + "type": "object", + "typeInfo": "Struct" + }, + "glam::Mat3": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "x_axis": { + "type": { + "$ref": "#/$defs/glam::Vec3" + } + }, + "y_axis": { + "type": { + "$ref": "#/$defs/glam::Vec3" + } + }, + "z_axis": { + "type": { + "$ref": "#/$defs/glam::Vec3" + } + } + }, + "required": [ + "x_axis", + "y_axis", + "z_axis" + ], + "short_name": "Mat3", + "title": "glam::Mat3", + "type": "object", + "typeInfo": "Struct" + }, + "glam::Mat3A": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "x_axis": { + "type": { + "$ref": "#/$defs/glam::Vec3A" + } + }, + "y_axis": { + "type": { + "$ref": "#/$defs/glam::Vec3A" + } + }, + "z_axis": { + "type": { + "$ref": "#/$defs/glam::Vec3A" + } + } + }, + "required": [ + "x_axis", + "y_axis", + "z_axis" + ], + "short_name": "Mat3A", + "title": "glam::Mat3A", + "type": "object", + "typeInfo": "Struct" + }, + "glam::Mat4": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "w_axis": { "type": { - "$ref": "#/$defs/f64" + "$ref": "#/$defs/glam::Vec4" } }, - "y": { + "x_axis": { "type": { - "$ref": "#/$defs/f64" + "$ref": "#/$defs/glam::Vec4" } }, - "z": { + "y_axis": { "type": { - "$ref": "#/$defs/f64" + "$ref": "#/$defs/glam::Vec4" + } + }, + "z_axis": { + "type": { + "$ref": "#/$defs/glam::Vec4" } } }, "required": [ - "x", - "y", - "z" + "x_axis", + "y_axis", + "z_axis", + "w_axis" ], - "short_name": "DVec3", - "title": "glam::DVec3", + "short_name": "Mat4", + "title": "glam::Mat4", "type": "object", "typeInfo": "Struct" }, - "glam::DVec4": { + "glam::Quat": { "additionalProperties": false, "isComponent": false, "isResource": false, "properties": { "w": { "type": { - "$ref": "#/$defs/f64" + "$ref": "#/$defs/f32" } }, "x": { "type": { - "$ref": "#/$defs/f64" + "$ref": "#/$defs/f32" } }, "y": { "type": { - "$ref": "#/$defs/f64" + "$ref": "#/$defs/f32" } }, "z": { "type": { - "$ref": "#/$defs/f64" + "$ref": "#/$defs/f32" } } }, @@ -11424,24 +13948,24 @@ "z", "w" ], - "short_name": "DVec4", - "title": "glam::DVec4", + "short_name": "Quat", + "title": "glam::Quat", "type": "object", "typeInfo": "Struct" }, - "glam::IVec2": { + "glam::UVec2": { "additionalProperties": false, "isComponent": false, "isResource": false, "properties": { "x": { "type": { - "$ref": "#/$defs/i32" + "$ref": "#/$defs/u32" } }, "y": { "type": { - "$ref": "#/$defs/i32" + "$ref": "#/$defs/u32" } } }, @@ -11449,29 +13973,29 @@ "x", "y" ], - "short_name": "IVec2", - "title": "glam::IVec2", + "short_name": "UVec2", + "title": "glam::UVec2", "type": "object", "typeInfo": "Struct" }, - "glam::IVec3": { + "glam::UVec3": { "additionalProperties": false, "isComponent": false, "isResource": false, "properties": { "x": { "type": { - "$ref": "#/$defs/i32" + "$ref": "#/$defs/u32" } }, "y": { "type": { - "$ref": "#/$defs/i32" + "$ref": "#/$defs/u32" } }, "z": { "type": { - "$ref": "#/$defs/i32" + "$ref": "#/$defs/u32" } } }, @@ -11480,34 +14004,34 @@ "y", "z" ], - "short_name": "IVec3", - "title": "glam::IVec3", + "short_name": "UVec3", + "title": "glam::UVec3", "type": "object", "typeInfo": "Struct" }, - "glam::IVec4": { + "glam::UVec4": { "additionalProperties": false, "isComponent": false, "isResource": false, "properties": { "w": { "type": { - "$ref": "#/$defs/i32" + "$ref": "#/$defs/u32" } }, "x": { "type": { - "$ref": "#/$defs/i32" + "$ref": "#/$defs/u32" } }, "y": { "type": { - "$ref": "#/$defs/i32" + "$ref": "#/$defs/u32" } }, "z": { "type": { - "$ref": "#/$defs/i32" + "$ref": "#/$defs/u32" } } }, @@ -11517,494 +14041,910 @@ "z", "w" ], - "short_name": "IVec4", - "title": "glam::IVec4", + "short_name": "UVec4", + "title": "glam::UVec4", "type": "object", "typeInfo": "Struct" }, - "glam::Mat2": { + "glam::Vec2": { "additionalProperties": false, "isComponent": false, "isResource": false, "properties": { - "x_axis": { + "x": { "type": { - "$ref": "#/$defs/glam::Vec2" + "$ref": "#/$defs/f32" } }, - "y_axis": { + "y": { "type": { - "$ref": "#/$defs/glam::Vec2" + "$ref": "#/$defs/f32" } } }, "required": [ - "x_axis", - "y_axis" + "x", + "y" ], - "short_name": "Mat2", - "title": "glam::Mat2", + "short_name": "Vec2", + "title": "glam::Vec2", "type": "object", "typeInfo": "Struct" }, - "glam::Mat3": { + "glam::Vec3": { "additionalProperties": false, "isComponent": false, "isResource": false, "properties": { - "x_axis": { + "x": { "type": { - "$ref": "#/$defs/glam::Vec3" + "$ref": "#/$defs/f32" } }, - "y_axis": { + "y": { "type": { - "$ref": "#/$defs/glam::Vec3" + "$ref": "#/$defs/f32" } }, - "z_axis": { + "z": { "type": { - "$ref": "#/$defs/glam::Vec3" + "$ref": "#/$defs/f32" } } }, "required": [ - "x_axis", - "y_axis", - "z_axis" + "x", + "y", + "z" ], - "short_name": "Mat3", - "title": "glam::Mat3", + "short_name": "Vec3", + "title": "glam::Vec3", "type": "object", "typeInfo": "Struct" }, - "glam::Mat3A": { + "glam::Vec3A": { "additionalProperties": false, "isComponent": false, "isResource": false, "properties": { - "x_axis": { + "x": { "type": { - "$ref": "#/$defs/glam::Vec3A" + "$ref": "#/$defs/f32" } }, - "y_axis": { + "y": { "type": { - "$ref": "#/$defs/glam::Vec3A" + "$ref": "#/$defs/f32" } }, - "z_axis": { + "z": { "type": { - "$ref": "#/$defs/glam::Vec3A" + "$ref": "#/$defs/f32" } } }, "required": [ - "x_axis", - "y_axis", - "z_axis" + "x", + "y", + "z" ], - "short_name": "Mat3A", - "title": "glam::Mat3A", + "short_name": "Vec3A", + "title": "glam::Vec3A", "type": "object", "typeInfo": "Struct" }, - "glam::Mat4": { + "glam::Vec4": { "additionalProperties": false, "isComponent": false, "isResource": false, "properties": { - "w_axis": { + "w": { "type": { - "$ref": "#/$defs/glam::Vec4" + "$ref": "#/$defs/f32" } }, - "x_axis": { + "x": { "type": { - "$ref": "#/$defs/glam::Vec4" + "$ref": "#/$defs/f32" } }, - "y_axis": { + "y": { "type": { - "$ref": "#/$defs/glam::Vec4" + "$ref": "#/$defs/f32" } }, - "z_axis": { + "z": { "type": { - "$ref": "#/$defs/glam::Vec4" + "$ref": "#/$defs/f32" } } }, "required": [ - "x_axis", - "y_axis", - "z_axis", - "w_axis" + "x", + "y", + "z", + "w" ], - "short_name": "Mat4", - "title": "glam::Mat4", + "short_name": "Vec4", + "title": "glam::Vec4", "type": "object", "typeInfo": "Struct" }, - "glam::Quat": { + "i128": { + "isComponent": false, + "isResource": false, + "short_name": "i128", + "title": "i128", + "type": "int", + "typeInfo": "Value" + }, + "i16": { + "isComponent": false, + "isResource": false, + "short_name": "i16", + "title": "i16", + "type": "int", + "typeInfo": "Value" + }, + "i32": { + "isComponent": false, + "isResource": false, + "short_name": "i32", + "title": "i32", + "type": "int", + "typeInfo": "Value" + }, + "i64": { + "isComponent": false, + "isResource": false, + "short_name": "i64", + "title": "i64", + "type": "int", + "typeInfo": "Value" + }, + "i8": { + "isComponent": false, + "isResource": false, + "short_name": "i8", + "title": "i8", + "type": "int", + "typeInfo": "Value" + }, + "isize": { + "isComponent": false, + "isResource": false, + "short_name": "isize", + "title": "isize", + "type": "int", + "typeInfo": "Value" + }, + "leafwing_input_manager::action_state::ActionData": { "additionalProperties": false, "isComponent": false, "isResource": false, "properties": { - "w": { + "axis_pair": { "type": { - "$ref": "#/$defs/f32" + "$ref": "#/$defs/core::option::Option" } }, - "x": { + "consumed": { "type": { - "$ref": "#/$defs/f32" + "$ref": "#/$defs/bool" } }, - "y": { + "state": { "type": { - "$ref": "#/$defs/f32" + "$ref": "#/$defs/leafwing_input_manager::buttonlike::ButtonState" } }, - "z": { + "timing": { + "type": { + "$ref": "#/$defs/leafwing_input_manager::timing::Timing" + } + }, + "value": { "type": { "$ref": "#/$defs/f32" } } }, "required": [ - "x", - "y", - "z", - "w" + "state", + "value", + "timing", + "consumed" + ], + "short_name": "ActionData", + "title": "leafwing_input_manager::action_state::ActionData", + "type": "object", + "typeInfo": "Struct" + }, + "leafwing_input_manager::action_state::ActionState": { + "additionalProperties": false, + "isComponent": false, + "isResource": false, + "properties": { + "action_data": { + "type": { + "$ref": "#/$defs/bevy_utils::hashbrown::HashMap" + } + } + }, + "required": [ + "action_data" ], - "short_name": "Quat", - "title": "glam::Quat", + "short_name": "ActionState", + "title": "leafwing_input_manager::action_state::ActionState", "type": "object", "typeInfo": "Struct" }, - "glam::UVec2": { + "leafwing_input_manager::action_state::ActionState": { "additionalProperties": false, "isComponent": false, "isResource": false, "properties": { - "x": { - "type": { - "$ref": "#/$defs/u32" - } - }, - "y": { + "action_data": { "type": { - "$ref": "#/$defs/u32" + "$ref": "#/$defs/bevy_utils::hashbrown::HashMap" } } }, "required": [ - "x", - "y" + "action_data" ], - "short_name": "UVec2", - "title": "glam::UVec2", + "short_name": "ActionState", + "title": "leafwing_input_manager::action_state::ActionState", "type": "object", "typeInfo": "Struct" }, - "glam::UVec3": { + "leafwing_input_manager::action_state::ActionState": { "additionalProperties": false, "isComponent": false, "isResource": false, "properties": { - "x": { - "type": { - "$ref": "#/$defs/u32" - } - }, - "y": { - "type": { - "$ref": "#/$defs/u32" - } - }, - "z": { + "action_data": { "type": { - "$ref": "#/$defs/u32" + "$ref": "#/$defs/bevy_utils::hashbrown::HashMap" } } }, "required": [ - "x", - "y", - "z" + "action_data" ], - "short_name": "UVec3", - "title": "glam::UVec3", + "short_name": "ActionState", + "title": "leafwing_input_manager::action_state::ActionState", "type": "object", "typeInfo": "Struct" }, - "glam::UVec4": { + "leafwing_input_manager::axislike::AxisType": { + "isComponent": false, + "isResource": false, + "oneOf": [ + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/bevy_input::gamepad::GamepadAxisType" + } + } + ], + "short_name": "Gamepad", + "title": "Gamepad", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/leafwing_input_manager::axislike::MouseWheelAxisType" + } + } + ], + "short_name": "MouseWheel", + "title": "MouseWheel", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/leafwing_input_manager::axislike::MouseMotionAxisType" + } + } + ], + "short_name": "MouseMotion", + "title": "MouseMotion", + "type": "array", + "typeInfo": "Tuple" + } + ], + "short_name": "AxisType", + "title": "leafwing_input_manager::axislike::AxisType", + "type": "object", + "typeInfo": "Enum" + }, + "leafwing_input_manager::axislike::DeadZoneShape": { + "isComponent": false, + "isResource": false, + "oneOf": [ + { + "additionalProperties": false, + "properties": { + "horizontal_width": { + "title": "horizontal_width", + "type": { + "$ref": "#/$defs/f32" + } + }, + "vertical_width": { + "title": "vertical_width", + "type": { + "$ref": "#/$defs/f32" + } + } + }, + "required": [ + "horizontal_width", + "vertical_width" + ], + "short_name": "Cross", + "title": "Cross", + "type": "object", + "typeInfo": "Struct" + }, + { + "additionalProperties": false, + "properties": { + "radius_x": { + "title": "radius_x", + "type": { + "$ref": "#/$defs/f32" + } + }, + "radius_y": { + "title": "radius_y", + "type": { + "$ref": "#/$defs/f32" + } + } + }, + "required": [ + "radius_x", + "radius_y" + ], + "short_name": "Ellipse", + "title": "Ellipse", + "type": "object", + "typeInfo": "Struct" + } + ], + "short_name": "DeadZoneShape", + "title": "leafwing_input_manager::axislike::DeadZoneShape", + "type": "object", + "typeInfo": "Enum" + }, + "leafwing_input_manager::axislike::DualAxis": { "additionalProperties": false, "isComponent": false, "isResource": false, "properties": { - "w": { + "deadzone": { "type": { - "$ref": "#/$defs/u32" + "$ref": "#/$defs/leafwing_input_manager::axislike::DeadZoneShape" } }, "x": { "type": { - "$ref": "#/$defs/u32" + "$ref": "#/$defs/leafwing_input_manager::axislike::SingleAxis" } }, "y": { "type": { - "$ref": "#/$defs/u32" - } - }, - "z": { - "type": { - "$ref": "#/$defs/u32" + "$ref": "#/$defs/leafwing_input_manager::axislike::SingleAxis" } } }, "required": [ "x", "y", - "z", - "w" + "deadzone" ], - "short_name": "UVec4", - "title": "glam::UVec4", + "short_name": "DualAxis", + "title": "leafwing_input_manager::axislike::DualAxis", "type": "object", "typeInfo": "Struct" }, - "glam::Vec2": { + "leafwing_input_manager::axislike::DualAxisData": { "additionalProperties": false, "isComponent": false, "isResource": false, "properties": { - "x": { + "xy": { "type": { - "$ref": "#/$defs/f32" - } - }, - "y": { - "type": { - "$ref": "#/$defs/f32" + "$ref": "#/$defs/glam::Vec2" } } }, "required": [ - "x", - "y" + "xy" ], - "short_name": "Vec2", - "title": "glam::Vec2", + "short_name": "DualAxisData", + "title": "leafwing_input_manager::axislike::DualAxisData", "type": "object", "typeInfo": "Struct" }, - "glam::Vec3": { + "leafwing_input_manager::axislike::MouseMotionAxisType": { + "isComponent": false, + "isResource": false, + "oneOf": [ + "X", + "Y" + ], + "short_name": "MouseMotionAxisType", + "title": "leafwing_input_manager::axislike::MouseMotionAxisType", + "type": "string", + "typeInfo": "Enum" + }, + "leafwing_input_manager::axislike::MouseWheelAxisType": { + "isComponent": false, + "isResource": false, + "oneOf": [ + "X", + "Y" + ], + "short_name": "MouseWheelAxisType", + "title": "leafwing_input_manager::axislike::MouseWheelAxisType", + "type": "string", + "typeInfo": "Enum" + }, + "leafwing_input_manager::axislike::SingleAxis": { "additionalProperties": false, "isComponent": false, "isResource": false, "properties": { - "x": { + "axis_type": { + "type": { + "$ref": "#/$defs/leafwing_input_manager::axislike::AxisType" + } + }, + "inverted": { + "type": { + "$ref": "#/$defs/bool" + } + }, + "negative_low": { "type": { "$ref": "#/$defs/f32" } }, - "y": { + "positive_low": { "type": { "$ref": "#/$defs/f32" } }, - "z": { + "sensitivity": { "type": { "$ref": "#/$defs/f32" } + }, + "value": { + "type": { + "$ref": "#/$defs/core::option::Option" + } } }, "required": [ - "x", - "y", - "z" + "axis_type", + "positive_low", + "negative_low", + "inverted", + "sensitivity" ], - "short_name": "Vec3", - "title": "glam::Vec3", + "short_name": "SingleAxis", + "title": "leafwing_input_manager::axislike::SingleAxis", "type": "object", "typeInfo": "Struct" }, - "glam::Vec3A": { + "leafwing_input_manager::axislike::VirtualAxis": { "additionalProperties": false, "isComponent": false, "isResource": false, "properties": { - "x": { - "type": { - "$ref": "#/$defs/f32" - } - }, - "y": { + "negative": { "type": { - "$ref": "#/$defs/f32" + "$ref": "#/$defs/leafwing_input_manager::user_input::InputKind" } }, - "z": { + "positive": { "type": { - "$ref": "#/$defs/f32" + "$ref": "#/$defs/leafwing_input_manager::user_input::InputKind" } } }, "required": [ - "x", - "y", - "z" + "negative", + "positive" ], - "short_name": "Vec3A", - "title": "glam::Vec3A", + "short_name": "VirtualAxis", + "title": "leafwing_input_manager::axislike::VirtualAxis", "type": "object", "typeInfo": "Struct" }, - "glam::Vec4": { + "leafwing_input_manager::axislike::VirtualDPad": { "additionalProperties": false, "isComponent": false, "isResource": false, "properties": { - "w": { + "down": { "type": { - "$ref": "#/$defs/f32" + "$ref": "#/$defs/leafwing_input_manager::user_input::InputKind" } }, - "x": { + "left": { "type": { - "$ref": "#/$defs/f32" + "$ref": "#/$defs/leafwing_input_manager::user_input::InputKind" } }, - "y": { + "right": { "type": { - "$ref": "#/$defs/f32" + "$ref": "#/$defs/leafwing_input_manager::user_input::InputKind" } }, - "z": { + "up": { "type": { - "$ref": "#/$defs/f32" - } - } - }, - "required": [ - "x", - "y", - "z", - "w" - ], - "short_name": "Vec4", - "title": "glam::Vec4", - "type": "object", - "typeInfo": "Struct" - }, - "i128": { - "isComponent": false, - "isResource": false, - "short_name": "i128", - "title": "i128", - "type": "int", - "typeInfo": "Value" - }, - "i16": { - "isComponent": false, - "isResource": false, - "short_name": "i16", - "title": "i16", - "type": "int", - "typeInfo": "Value" - }, - "i32": { - "isComponent": false, - "isResource": false, - "short_name": "i32", - "title": "i32", - "type": "int", - "typeInfo": "Value" + "$ref": "#/$defs/leafwing_input_manager::user_input::InputKind" + } + } + }, + "required": [ + "up", + "down", + "left", + "right" + ], + "short_name": "VirtualDPad", + "title": "leafwing_input_manager::axislike::VirtualDPad", + "type": "object", + "typeInfo": "Struct" }, - "i64": { + "leafwing_input_manager::buttonlike::MouseMotionDirection": { "isComponent": false, "isResource": false, - "short_name": "i64", - "title": "i64", - "type": "int", - "typeInfo": "Value" + "oneOf": [ + "Up", + "Down", + "Right", + "Left" + ], + "short_name": "MouseMotionDirection", + "title": "leafwing_input_manager::buttonlike::MouseMotionDirection", + "type": "string", + "typeInfo": "Enum" }, - "i8": { + "leafwing_input_manager::buttonlike::MouseWheelDirection": { "isComponent": false, "isResource": false, - "short_name": "i8", - "title": "i8", - "type": "int", - "typeInfo": "Value" + "oneOf": [ + "Up", + "Down", + "Right", + "Left" + ], + "short_name": "MouseWheelDirection", + "title": "leafwing_input_manager::buttonlike::MouseWheelDirection", + "type": "string", + "typeInfo": "Enum" }, - "isize": { + "leafwing_input_manager::input_map::InputMap": { + "additionalProperties": false, "isComponent": false, "isResource": false, - "short_name": "isize", - "title": "isize", - "type": "int", - "typeInfo": "Value" + "properties": { + "associated_gamepad": { + "type": { + "$ref": "#/$defs/core::option::Option" + } + }, + "map": { + "type": { + "$ref": "#/$defs/bevy_utils::hashbrown::HashMap, bevy_utils::hashbrown::hash_map::DefaultHashBuilder>" + } + } + }, + "required": [ + "map" + ], + "short_name": "InputMap", + "title": "leafwing_input_manager::input_map::InputMap", + "type": "object", + "typeInfo": "Struct" }, - "leafwing_input_manager::action_state::ActionState": { + "leafwing_input_manager::input_map::InputMap": { "additionalProperties": false, "isComponent": false, "isResource": false, "properties": { - "action_data": { + "associated_gamepad": { "type": { - "$ref": "#/$defs/alloc::vec::Vec" + "$ref": "#/$defs/core::option::Option" + } + }, + "map": { + "type": { + "$ref": "#/$defs/bevy_utils::hashbrown::HashMap, bevy_utils::hashbrown::hash_map::DefaultHashBuilder>" } } }, "required": [ - "action_data" + "map" ], - "short_name": "ActionState", - "title": "leafwing_input_manager::action_state::ActionState", + "short_name": "InputMap", + "title": "leafwing_input_manager::input_map::InputMap", "type": "object", "typeInfo": "Struct" }, - "leafwing_input_manager::action_state::ActionState": { + "leafwing_input_manager::input_map::InputMap": { "additionalProperties": false, "isComponent": false, "isResource": false, "properties": { - "action_data": { + "associated_gamepad": { "type": { - "$ref": "#/$defs/alloc::vec::Vec" + "$ref": "#/$defs/core::option::Option" + } + }, + "map": { + "type": { + "$ref": "#/$defs/bevy_utils::hashbrown::HashMap, bevy_utils::hashbrown::hash_map::DefaultHashBuilder>" } } }, "required": [ - "action_data" + "map" ], - "short_name": "ActionState", - "title": "leafwing_input_manager::action_state::ActionState", + "short_name": "InputMap", + "title": "leafwing_input_manager::input_map::InputMap", "type": "object", "typeInfo": "Struct" }, - "leafwing_input_manager::action_state::ActionState": { + "leafwing_input_manager::timing::Timing": { "additionalProperties": false, "isComponent": false, "isResource": false, "properties": { - "action_data": { + "current_duration": { + "type": { + "$ref": "#/$defs/bevy_utils::Duration" + } + }, + "instant_started": { "type": { - "$ref": "#/$defs/alloc::vec::Vec" + "$ref": "#/$defs/core::option::Option" + } + }, + "previous_duration": { + "type": { + "$ref": "#/$defs/bevy_utils::Duration" } } }, "required": [ - "action_data" + "current_duration", + "previous_duration" ], - "short_name": "ActionState", - "title": "leafwing_input_manager::action_state::ActionState", + "short_name": "Timing", + "title": "leafwing_input_manager::timing::Timing", "type": "object", "typeInfo": "Struct" }, + "leafwing_input_manager::user_input::InputKind": { + "isComponent": false, + "isResource": false, + "oneOf": [ + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/bevy_input::gamepad::GamepadButtonType" + } + } + ], + "short_name": "GamepadButton", + "title": "GamepadButton", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/leafwing_input_manager::axislike::SingleAxis" + } + } + ], + "short_name": "SingleAxis", + "title": "SingleAxis", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/leafwing_input_manager::axislike::DualAxis" + } + } + ], + "short_name": "DualAxis", + "title": "DualAxis", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/bevy_input::keyboard::KeyCode" + } + } + ], + "short_name": "PhysicalKey", + "title": "PhysicalKey", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/leafwing_input_manager::user_input::Modifier" + } + } + ], + "short_name": "Modifier", + "title": "Modifier", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/bevy_input::mouse::MouseButton" + } + } + ], + "short_name": "Mouse", + "title": "Mouse", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/leafwing_input_manager::buttonlike::MouseWheelDirection" + } + } + ], + "short_name": "MouseWheel", + "title": "MouseWheel", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/leafwing_input_manager::buttonlike::MouseMotionDirection" + } + } + ], + "short_name": "MouseMotion", + "title": "MouseMotion", + "type": "array", + "typeInfo": "Tuple" + } + ], + "short_name": "InputKind", + "title": "leafwing_input_manager::user_input::InputKind", + "type": "object", + "typeInfo": "Enum" + }, + "leafwing_input_manager::user_input::Modifier": { + "isComponent": false, + "isResource": false, + "oneOf": [ + "Alt", + "Control", + "Shift", + "Super" + ], + "short_name": "Modifier", + "title": "leafwing_input_manager::user_input::Modifier", + "type": "string", + "typeInfo": "Enum" + }, + "leafwing_input_manager::user_input::UserInput": { + "isComponent": false, + "isResource": false, + "oneOf": [ + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/leafwing_input_manager::user_input::InputKind" + } + } + ], + "short_name": "Single", + "title": "Single", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/alloc::vec::Vec" + } + } + ], + "short_name": "Chord", + "title": "Chord", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/leafwing_input_manager::axislike::VirtualDPad" + } + } + ], + "short_name": "VirtualDPad", + "title": "VirtualDPad", + "type": "array", + "typeInfo": "Tuple" + }, + { + "items": false, + "prefixItems": [ + { + "type": { + "$ref": "#/$defs/leafwing_input_manager::axislike::VirtualAxis" + } + } + ], + "short_name": "VirtualAxis", + "title": "VirtualAxis", + "type": "array", + "typeInfo": "Tuple" + } + ], + "short_name": "UserInput", + "title": "leafwing_input_manager::user_input::UserInput", + "type": "object", + "typeInfo": "Enum" + }, "oxidized_navigation::NavMeshAffector": { "additionalProperties": false, "isComponent": true, @@ -12048,19 +14988,6 @@ "type": "array", "typeInfo": "TupleStruct" }, - "smallvec::SmallVec<[bevy_ecs::Entity; 8]>": { - "isComponent": false, - "isResource": false, - "items": { - "type": { - "$ref": "#/$defs/bevy_ecs::Entity" - } - }, - "short_name": "SmallVec<[Entity; 8]>", - "title": "smallvec::SmallVec<[bevy_ecs::Entity; 8]>", - "type": "array", - "typeInfo": "List" - }, "std::ffi::OsString": { "isComponent": false, "isResource": false, @@ -12125,25 +15052,6 @@ "type": "uint", "typeInfo": "Value" }, - "warbler_grass::GrassConfiguration": { - "additionalProperties": false, - "isComponent": false, - "isResource": true, - "properties": { - "wind": { - "type": { - "$ref": "#/$defs/glam::Vec2" - } - } - }, - "required": [ - "wind" - ], - "short_name": "GrassConfiguration", - "title": "warbler_grass::GrassConfiguration", - "type": "object", - "typeInfo": "Struct" - }, "yarnspinner_compiler::compiler::CompilationType": { "isComponent": false, "isResource": false, diff --git a/assets/shaders/glowy.wgsl b/assets/shaders/glowy.wgsl index b0f9e307..7ce75b8c 100644 --- a/assets/shaders/glowy.wgsl +++ b/assets/shaders/glowy.wgsl @@ -22,9 +22,9 @@ -@group(1) @binding(0) +@group(2) @binding(0) var texture: texture_2d; -@group(1) @binding(1) +@group(2) @binding(1) var texture_sampler: sampler; struct FragmentInput { diff --git a/build/macos/src/Game.app/Contents/Info.plist b/build/macos/src/Game.app/Contents/Info.plist index 82a0203a..504c7ab1 100644 --- a/build/macos/src/Game.app/Contents/Info.plist +++ b/build/macos/src/Game.app/Contents/Info.plist @@ -20,7 +20,7 @@ APPL CFBundleShortVersionString - 0.2.0 + 0.5.0 CFBundleSupportedPlatforms MacOSX diff --git a/build/windows/installer/Package.wxs b/build/windows/installer/Package.wxs index 08a570f4..d11f3a6c 100644 --- a/build/windows/installer/Package.wxs +++ b/build/windows/installer/Package.wxs @@ -2,7 +2,7 @@ diff --git a/readme.md b/readme.md index 8c89785a..e4d4c085 100644 --- a/readme.md +++ b/readme.md @@ -18,11 +18,10 @@ https://user-images.githubusercontent.com/9047632/226387411-70f662de-0681-47ff-b - GLTF imports, including auto-insertion of markers via the GLTF extras field - Smooth cameras via [`bevy_dolly`](https://crates.io/crates/bevy_dolly) - Simple error handling via [`bevy_mod_sysfail`](https://crates.io/crates/bevy_mod_sysfail) -- Simple plugin creation via [`seldom_fn_plugin`](https://crates.io/crates/seldom_fn_plugin) - Particle effects via [`bevy_hanabi`](https://crates.io/crates/bevy_hanabi) -- Procedural skies via [`bevy_athmospere`](https://crates.io/crates/bevy_atmosphere) +- Procedural skies via [`bevy_atmosphere`](https://crates.io/crates/bevy_atmosphere) - Grass via [`warbler_grass`](https://crates.io/crates/warbler_grass) -- Integrathion with Blender as an editor via +- Integration with Blender as an editor via the [`Blender_bevy_components_workflow`](https://github.com/kaosat-dev/Blender_bevy_components_workflow) set of tools ## Usage diff --git a/src/bevy_config.rs b/src/bevy_config.rs index 53805275..c2035465 100644 --- a/src/bevy_config.rs +++ b/src/bevy_config.rs @@ -1,6 +1,6 @@ -use anyhow::{Context, Result}; +use anyhow::Context; use bevy::{prelude::*, window::PrimaryWindow, winit::WinitWindows}; -use bevy_mod_sysfail::*; +use bevy_mod_sysfail::prelude::*; use std::io::Cursor; use winit::window::Icon; @@ -20,11 +20,11 @@ pub(crate) fn bevy_config_plugin(app: &mut App) { } // Sets the icon on Windows and X11 -#[sysfail(log(level = "error"))] +#[sysfail(Log)] fn set_window_icon( windows: NonSend, primary_windows: Query>, -) -> Result<()> { +) { let primary_entity = primary_windows.single(); let primary = windows .get_window(primary_entity) @@ -39,5 +39,4 @@ fn set_window_icon( let icon = Icon::from_rgba(rgba, width, height)?; primary.set_window_icon(Some(icon)); }; - Ok(()) } diff --git a/src/dev.rs b/src/dev.rs index 90b3b6dd..dfcca17d 100644 --- a/src/dev.rs +++ b/src/dev.rs @@ -5,7 +5,6 @@ use bevy::{ }; use bevy_editor_pls::prelude::*; use bevy_xpbd_3d::prelude::*; -use seldom_fn_plugin::FnPluginExt; pub(crate) mod dev_editor; @@ -15,14 +14,22 @@ pub(crate) fn dev_plugin(app: &mut App) { { app.add_plugins(EditorPlugin::new()) .insert_resource(default_editor_controls()) - .add_plugins(FrameTimeDiagnosticsPlugin) - .fn_plugin(dev_editor_plugin) - .add_plugins(LogDiagnosticsPlugin::filtered(vec![])) - .add_plugins(PhysicsDebugPlugin::default()) - .insert_resource(PhysicsDebugConfig { - enabled: false, - ..default() - }); + .add_plugins(( + FrameTimeDiagnosticsPlugin, + dev_editor_plugin, + LogDiagnosticsPlugin::filtered(vec![]), + PhysicsDebugPlugin::default(), + )) + .insert_gizmo_group( + PhysicsGizmos { + aabb_color: Some(Color::WHITE), + ..default() + }, + GizmoConfig { + enabled: false, + ..default() + }, + ); } } @@ -33,7 +40,7 @@ fn default_editor_controls() -> bevy_editor_pls::controls::EditorControls { editor_controls.insert( Action::PlayPauseEditor, Binding { - input: UserInput::Single(Button::Keyboard(KeyCode::G)), + input: UserInput::Single(Button::Keyboard(KeyCode::KeyG)), conditions: vec![BindingCondition::ListeningForText(false)], }, ); diff --git a/src/dev/dev_editor.rs b/src/dev/dev_editor.rs index 1d6010a7..fbde1397 100644 --- a/src/dev/dev_editor.rs +++ b/src/dev/dev_editor.rs @@ -1,5 +1,5 @@ use crate::{player_control::camera::ForceCursorGrabMode, GameState}; -use anyhow::{Context, Result}; +use anyhow::Context; use bevy::{prelude::*, window::CursorGrabMode}; use bevy_editor_pls::{ editor::{Editor, EditorEvent}, @@ -7,8 +7,8 @@ use bevy_editor_pls::{ AddEditorWindow, }; use bevy_egui::egui; -use bevy_mod_sysfail::*; -use bevy_xpbd_3d::prelude::PhysicsDebugConfig; +use bevy_mod_sysfail::prelude::*; +use bevy_xpbd_3d::prelude::PhysicsGizmos; use serde::{Deserialize, Serialize}; pub(crate) fn dev_editor_plugin(app: &mut App) { @@ -51,12 +51,12 @@ pub(crate) struct DevEditorState { pub(crate) navmesh_render_enabled: bool, } -#[sysfail(log(level = "error"))] +#[sysfail(Log)] fn handle_debug_render( state: Res, mut last_enabled: Local, - mut debug_config: ResMut, -) -> Result<()> { + mut config_store: ResMut, +) { let current_enabled = state .window_state::() .context("Failed to read dev window state")? @@ -65,8 +65,8 @@ fn handle_debug_render( return Ok(()); } *last_enabled = current_enabled; - debug_config.enabled = current_enabled; - Ok(()) + let config = config_store.config_mut::().0; + config.enabled = current_enabled; } fn set_cursor_grab_mode( diff --git a/src/file_system_interaction.rs b/src/file_system_interaction.rs index 05cc1db2..5547c048 100644 --- a/src/file_system_interaction.rs +++ b/src/file_system_interaction.rs @@ -1,6 +1,5 @@ use crate::file_system_interaction::{asset_loading::loading_plugin, audio::internal_audio_plugin}; use bevy::prelude::*; -use seldom_fn_plugin::FnPluginExt; pub(crate) mod asset_loading; pub(crate) mod audio; @@ -11,6 +10,5 @@ pub(crate) mod config; /// - [`loading_plugin`] handles loading of assets.els. /// - [`internal_audio_plugin`]: Handles audio initialization pub(crate) fn file_system_interaction_plugin(app: &mut App) { - app.fn_plugin(loading_plugin) - .fn_plugin(internal_audio_plugin); + app.add_plugins((loading_plugin, internal_audio_plugin)); } diff --git a/src/file_system_interaction/asset_loading.rs b/src/file_system_interaction/asset_loading.rs index c3aea3d8..e52a8eb6 100644 --- a/src/file_system_interaction/asset_loading.rs +++ b/src/file_system_interaction/asset_loading.rs @@ -1,11 +1,10 @@ use crate::{file_system_interaction::config::GameConfig, GameState}; -use anyhow::Result; use bevy::{gltf::Gltf, prelude::*, utils::HashMap}; use bevy_asset_loader::prelude::*; use bevy_common_assets::toml::TomlAssetPlugin; use bevy_egui::{egui, egui::ProgressBar, EguiContexts}; use bevy_kira_audio::AudioSource; -use bevy_mod_sysfail::*; +use bevy_mod_sysfail::prelude::*; use iyes_progress::{ProgressCounter, ProgressPlugin}; /// Loads resources and assets for the game. @@ -96,12 +95,12 @@ fn show_progress( } } -#[sysfail(log(level = "error"))] +#[sysfail(Log)] fn update_config( mut commands: Commands, config: Res>, mut config_asset_events: EventReader>, -) -> Result<()> { +) { #[cfg(feature = "tracing")] let _span = info_span!("update_config").entered(); for event in config_asset_events.read() { @@ -114,5 +113,4 @@ fn update_config( _ => {} } } - Ok(()) } diff --git a/src/ingame_menu.rs b/src/ingame_menu.rs index 53d38b68..5a9976da 100644 --- a/src/ingame_menu.rs +++ b/src/ingame_menu.rs @@ -22,7 +22,7 @@ fn handle_pause( mut paused: Local, ) { for action in actions.iter() { - let toggled = action.just_pressed(UiAction::TogglePause); + let toggled = action.just_pressed(&UiAction::TogglePause); if toggled { if *paused { *paused = false; diff --git a/src/level_instantiation.rs b/src/level_instantiation.rs index 973676f2..09fb5615 100644 --- a/src/level_instantiation.rs +++ b/src/level_instantiation.rs @@ -1,6 +1,5 @@ use crate::level_instantiation::{grass::grass_plugin, map::map_plugin, spawning::spawning_plugin}; use bevy::prelude::*; -use seldom_fn_plugin::FnPluginExt; pub(crate) mod grass; pub(crate) mod map; @@ -11,7 +10,5 @@ pub(crate) mod spawning; /// - [`spawning_plugin`] handles the spawning of objects in general. /// - [`grass_plugin`] handles the spawning of grass on top of marked meshes. pub(crate) fn level_instantiation_plugin(app: &mut App) { - app.fn_plugin(map_plugin) - .fn_plugin(spawning_plugin) - .fn_plugin(grass_plugin); + app.add_plugins((map_plugin, spawning_plugin, grass_plugin)); } diff --git a/src/level_instantiation/grass.rs b/src/level_instantiation/grass.rs index a8bd391a..e862da36 100644 --- a/src/level_instantiation/grass.rs +++ b/src/level_instantiation/grass.rs @@ -9,11 +9,15 @@ use warbler_grass::{ prelude::*, }; pub(crate) fn grass_plugin(app: &mut App) { - app.add_systems(Update, spawn.run_if(in_state(GameState::Playing))) - .add_plugins(WarblersPlugin); + if cfg!(not(feature = "grass")) { + // Waiting for https://github.com/EmiOnGit/warbler_grass/pull/76 + return; + } + app.add_plugins(WarblersPlugin) + .add_systems(Update, spawn.run_if(in_state(GameState::Playing))); } -// Spawns the grass using the ground as a base +/// Spawns the grass using the ground as a base pub(crate) fn spawn( mut commands: Commands, ground: Query<&Transform, Added>, diff --git a/src/level_instantiation/map.rs b/src/level_instantiation/map.rs index e59322ba..f35b2930 100644 --- a/src/level_instantiation/map.rs +++ b/src/level_instantiation/map.rs @@ -10,7 +10,7 @@ pub(crate) fn map_plugin(app: &mut App) { .add_systems( Update, show_loading_screen - .run_if(not(any_with_component::()).and_then(in_state(GameState::Playing))), + .run_if(not(any_with_component::).and_then(in_state(GameState::Playing))), ); } diff --git a/src/level_instantiation/spawning/objects/orb.rs b/src/level_instantiation/spawning/objects/orb.rs index 8a2e5df8..b5994d35 100644 --- a/src/level_instantiation/spawning/objects/orb.rs +++ b/src/level_instantiation/spawning/objects/orb.rs @@ -11,12 +11,7 @@ pub(crate) struct Orb; fn get_or_add_mesh_handle(mesh_assets: &mut Assets) -> Handle { const MESH_HANDLE: Handle = Handle::weak_from_u128(0x1f40128bac02a9b); - mesh_assets.get_or_add(MESH_HANDLE, || { - Mesh::from(shape::UVSphere { - radius: 1.0, - ..default() - }) - }) + mesh_assets.get_or_add(MESH_HANDLE, || Mesh::from(Sphere::new(1.0))) } pub(crate) fn spawn( diff --git a/src/level_instantiation/spawning/objects/player.rs b/src/level_instantiation/spawning/objects/player.rs index c5a1d3ba..04af5cb8 100644 --- a/src/level_instantiation/spawning/objects/player.rs +++ b/src/level_instantiation/spawning/objects/player.rs @@ -22,9 +22,7 @@ pub(crate) fn spawn( ) { for (entity, transform) in player.iter() { let mut controller = CharacterControllerBundle::capsule(HEIGHT, RADIUS, transform.scale.y); - controller.collision_layers = controller - .collision_layers - .add_group(CollisionLayer::Player); + controller.collision_layers.memberships |= CollisionLayer::Player; commands .entity(entity) diff --git a/src/lib.rs b/src/lib.rs index 42eb665c..27ede164 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,13 +1,6 @@ -#![feature(stmt_expr_attributes)] #![feature(let_chains)] -#![feature(fs_try_exists)] -#![feature(never_type)] -#![feature(if_let_guard)] -#![feature(lazy_cell)] -#![feature(iter_array_chunks)] // These two generate a lot of false positives for Bevy systems -#![allow(clippy::too_many_arguments)] -#![allow(clippy::type_complexity)] +#![allow(clippy::too_many_arguments, clippy::type_complexity)] //! Foxtrot is split into many plugins with their own set of responsibilities. //! This is an organizational measure and not meant to be imply that you can turn them on or off at will, @@ -26,7 +19,6 @@ use crate::{ world_interaction::world_interaction_plugin, }; use bevy::prelude::*; -use seldom_fn_plugin::FnPluginExt; pub(crate) mod bevy_config; #[cfg(feature = "dev")] @@ -67,24 +59,23 @@ enum GameState { /// - [`dev_plugin`]: Handles the dev tools. /// - [`ingame_menu_plugin`]: Handles the ingame menu accessed via ESC. /// - [`particle_plugin`]: Handles the particle system. -/// -/// Because Foxtrot uses `seldom_fn_plugin`, these are all functions. pub struct GamePlugin; impl Plugin for GamePlugin { fn build(&self, app: &mut App) { - app.add_state::() - .fn_plugin(bevy_config_plugin) - .fn_plugin(menu_plugin) - .fn_plugin(movement_plugin) - .fn_plugin(player_control_plugin) - .fn_plugin(world_interaction_plugin) - .fn_plugin(level_instantiation_plugin) - .fn_plugin(file_system_interaction_plugin) - .fn_plugin(shader_plugin) - .fn_plugin(ingame_menu_plugin) - .fn_plugin(particle_plugin); - #[cfg(feature = "dev")] - app.fn_plugin(dev_plugin); + app.init_state::().add_plugins(( + bevy_config_plugin, + menu_plugin, + movement_plugin, + player_control_plugin, + world_interaction_plugin, + level_instantiation_plugin, + file_system_interaction_plugin, + shader_plugin, + ingame_menu_plugin, + particle_plugin, + #[cfg(feature = "dev")] + dev_plugin, + )); } } diff --git a/src/movement.rs b/src/movement.rs index eb63b069..1f7937f7 100644 --- a/src/movement.rs +++ b/src/movement.rs @@ -1,14 +1,13 @@ -pub(crate) mod character_controller; - -pub(crate) mod navigation; -pub(crate) mod physics; - use crate::movement::{ character_controller::character_controller_plugin, navigation::navigation_plugin, physics::physics_plugin, }; use bevy::prelude::*; -use seldom_fn_plugin::FnPluginExt; + +pub(crate) mod character_controller; + +pub(crate) mod navigation; +pub(crate) mod physics; /// This plugin handles all physical movement that is not exclusive to the player. /// It is further split into the following sub-plugins: @@ -18,7 +17,9 @@ use seldom_fn_plugin::FnPluginExt; /// Contrast this with pure rigidbodies like a ball, a crate, etc. /// - [`navigation_plugin`]: Handles npc pathfinding via bevy_pathmesh integration. pub(crate) fn movement_plugin(app: &mut App) { - app.fn_plugin(physics_plugin) - .fn_plugin(character_controller_plugin) - .fn_plugin(navigation_plugin); + app.add_plugins(( + physics_plugin, + character_controller_plugin, + navigation_plugin, + )); } diff --git a/src/movement/character_controller/animations.rs b/src/movement/character_controller/animations.rs index 675bb51a..3e34938c 100644 --- a/src/movement/character_controller/animations.rs +++ b/src/movement/character_controller/animations.rs @@ -1,14 +1,14 @@ use crate::movement::character_controller::{AnimationState, CharacterAnimations}; use bevy::{animation::AnimationPlayer, prelude::*}; use bevy_gltf_blueprints::{AnimationPlayerLink, Animations}; -use bevy_mod_sysfail::sysfail; +use bevy_mod_sysfail::prelude::*; use bevy_tnua::{ builtins::TnuaBuiltinWalk, controller::TnuaController, TnuaAnimatingState, TnuaAnimatingStateDirective, }; use std::time::Duration; -#[sysfail(log(level = "error"))] +#[sysfail(Log)] pub(crate) fn play_animations( mut query: Query<( &mut TnuaAnimatingState, @@ -18,7 +18,7 @@ pub(crate) fn play_animations( &Animations, )>, mut animation_players: Query<&mut AnimationPlayer>, -) -> anyhow::Result<()> { +) { #[cfg(feature = "tracing")] let _span = info_span!("play_animations").entered(); for (mut animating_state, controller, animation_names, link, animations) in query.iter_mut() { @@ -89,5 +89,4 @@ pub(crate) fn play_animations( }, } } - Ok(()) } diff --git a/src/movement/navigation.rs b/src/movement/navigation.rs index fbf3c42e..3c0f20e3 100644 --- a/src/movement/navigation.rs +++ b/src/movement/navigation.rs @@ -5,12 +5,10 @@ use crate::{ util::trait_extension::{F32Ext, Vec3Ext}, GameState, }; - #[cfg(feature = "dev")] use anyhow::Context; -use anyhow::Result; use bevy::prelude::*; -use bevy_mod_sysfail::*; +use bevy_mod_sysfail::prelude::*; use bevy_xpbd_3d::prelude::Collider; #[cfg(feature = "dev")] use oxidized_navigation::debug_draw::{DrawNavMesh, DrawPath, OxidizedNavigationDebugDrawPlugin}; @@ -60,7 +58,7 @@ pub(crate) fn navigation_plugin(app: &mut App) { #[reflect(Component, Serialize, Deserialize)] pub(crate) struct Follower; -#[sysfail(log(level = "error"))] +#[sysfail(Log)] fn query_mesh( #[cfg(feature = "dev")] mut commands: Commands, mut with_follower: Query<(&Transform, &mut Walk), (With, Without)>, @@ -68,7 +66,7 @@ fn query_mesh( nav_mesh_settings: Res, nav_mesh: Res, #[cfg(feature = "dev")] editor_state: Res, -) -> Result<()> { +) { #[cfg(feature = "tracing")] let _span = info_span!("query_mesh").entered(); if let Ok(nav_mesh) = nav_mesh.get().read() { @@ -114,20 +112,17 @@ fn query_mesh( } } } - - Ok(()) } #[cfg(feature = "dev")] -#[sysfail(log(level = "error"))] +#[sysfail(Log)] fn draw_navmesh( editor: Res, mut draw_nav_mesh: ResMut, -) -> Result<()> { +) { let nav_render_enabled = editor .window_state::() .context("Failed to read dev window state")? .navmesh_render_enabled; draw_nav_mesh.0 = nav_render_enabled; - Ok(()) } diff --git a/src/movement/physics.rs b/src/movement/physics.rs index 4acc3ccb..d232d1cf 100644 --- a/src/movement/physics.rs +++ b/src/movement/physics.rs @@ -1,7 +1,7 @@ use crate::{level_instantiation::spawning::objects::CollisionLayer, GameState}; -use anyhow::{Context, Result}; +use anyhow::Context; use bevy::prelude::*; -use bevy_mod_sysfail::*; +use bevy_mod_sysfail::prelude::*; use bevy_xpbd_3d::prelude::*; use oxidized_navigation::NavMeshAffector; use serde::{Deserialize, Serialize}; @@ -19,14 +19,14 @@ pub(crate) fn physics_plugin(app: &mut App) { #[reflect(Component, Serialize, Deserialize)] pub(crate) struct ColliderMarker; -#[sysfail(log(level = "error"))] +#[sysfail(Log)] pub(crate) fn read_colliders( collider_marker: Query>, mut commands: Commands, children: Query<&Children>, meshes: Res>, mesh_handles: Query<&Handle>, -) -> Result<()> { +) { #[cfg(feature = "tracing")] let _span = info_span!("read_colliders").entered(); for entity in collider_marker.iter() { @@ -45,7 +45,6 @@ pub(crate) fn read_colliders( NavMeshAffector, )); } - Ok(()) } fn find_mesh<'a>( diff --git a/src/particles.rs b/src/particles.rs index 9b2e826c..d38101d0 100644 --- a/src/particles.rs +++ b/src/particles.rs @@ -4,10 +4,9 @@ use crate::{ util::trait_extension::{F32Ext, Vec3Ext}, GameState, }; -use anyhow::Result; use bevy::prelude::*; use bevy_hanabi::prelude::*; -use bevy_mod_sysfail::sysfail; +use bevy_mod_sysfail::prelude::*; use bevy_tnua::prelude::*; use bevy_xpbd_3d::PhysicsSet; pub(crate) use creation::*; @@ -30,12 +29,12 @@ pub(crate) fn particle_plugin(app: &mut App) { #[reflect(Component)] struct SprintingParticle; -#[sysfail(log(level = "error"))] +#[sysfail(Log)] fn play_sprinting_effect( with_player: Query<&TnuaController, With>, mut with_particle: Query<&mut EffectSpawner, With>, config: Res, -) -> Result<()> { +) { for controller in with_player.iter() { let Some((_, basis_state)) = controller.concrete_basis::() else { continue; @@ -48,5 +47,4 @@ fn play_sprinting_effect( effect_spawner.set_active(active); } } - Ok(()) } diff --git a/src/player_control.rs b/src/player_control.rs index 530cc7e9..3660551b 100644 --- a/src/player_control.rs +++ b/src/player_control.rs @@ -2,7 +2,6 @@ pub(crate) use crate::player_control::{ actions::actions_plugin, camera::camera_plugin, player_embodiment::player_embodiment_plugin, }; use bevy::prelude::*; -use seldom_fn_plugin::FnPluginExt; pub(crate) mod actions; pub(crate) mod camera; @@ -14,7 +13,5 @@ pub(crate) mod player_embodiment; /// - [`player_embodiment_plugin`]: Tells the components from [`super::movement_plugin`] about the desired player [`actions::Actions`]. /// Also handles other systems that change how the player is physically represented in the world. pub(crate) fn player_control_plugin(app: &mut App) { - app.fn_plugin(actions_plugin) - .fn_plugin(camera_plugin) - .fn_plugin(player_embodiment_plugin); + app.add_plugins((actions_plugin, camera_plugin, player_embodiment_plugin)); } diff --git a/src/player_control/actions.rs b/src/player_control/actions.rs index 488d285b..5e12e267 100644 --- a/src/player_control/actions.rs +++ b/src/player_control/actions.rs @@ -76,22 +76,22 @@ pub(crate) enum UiAction { pub(crate) fn create_player_action_input_manager_bundle() -> InputManagerBundle { InputManagerBundle { input_map: InputMap::new([ - (QwertyScanCode::Space, PlayerAction::Jump), - (QwertyScanCode::ShiftLeft, PlayerAction::Sprint), - (QwertyScanCode::E, PlayerAction::Interact), - (QwertyScanCode::Space, PlayerAction::SpeedUpDialog), - (QwertyScanCode::Key1, PlayerAction::NumberedChoice1), - (QwertyScanCode::Key2, PlayerAction::NumberedChoice2), - (QwertyScanCode::Key3, PlayerAction::NumberedChoice3), - (QwertyScanCode::Key4, PlayerAction::NumberedChoice4), - (QwertyScanCode::Key5, PlayerAction::NumberedChoice5), - (QwertyScanCode::Key6, PlayerAction::NumberedChoice6), - (QwertyScanCode::Key7, PlayerAction::NumberedChoice7), - (QwertyScanCode::Key8, PlayerAction::NumberedChoice8), - (QwertyScanCode::Key9, PlayerAction::NumberedChoice9), - (QwertyScanCode::Key0, PlayerAction::NumberedChoice0), + (PlayerAction::Jump, KeyCode::Space), + (PlayerAction::Sprint, KeyCode::ShiftLeft), + (PlayerAction::Interact, KeyCode::KeyE), + (PlayerAction::SpeedUpDialog, KeyCode::Space), + (PlayerAction::NumberedChoice1, KeyCode::Digit1), + (PlayerAction::NumberedChoice2, KeyCode::Digit2), + (PlayerAction::NumberedChoice3, KeyCode::Digit3), + (PlayerAction::NumberedChoice4, KeyCode::Digit4), + (PlayerAction::NumberedChoice5, KeyCode::Digit5), + (PlayerAction::NumberedChoice6, KeyCode::Digit6), + (PlayerAction::NumberedChoice7, KeyCode::Digit7), + (PlayerAction::NumberedChoice8, KeyCode::Digit8), + (PlayerAction::NumberedChoice9, KeyCode::Digit9), + (PlayerAction::NumberedChoice0, KeyCode::Digit0), ]) - .insert(VirtualDPad::wasd(), PlayerAction::Move) + .insert(PlayerAction::Move, VirtualDPad::wasd()) .build(), ..default() } @@ -100,8 +100,8 @@ pub(crate) fn create_player_action_input_manager_bundle() -> InputManagerBundle< pub(crate) fn create_camera_action_input_manager_bundle() -> InputManagerBundle { InputManagerBundle { input_map: InputMap::default() - .insert(DualAxis::mouse_motion(), CameraAction::Orbit) - .insert(SingleAxis::mouse_wheel_y(), CameraAction::Zoom) + .insert(CameraAction::Orbit, DualAxis::mouse_motion()) + .insert(CameraAction::Zoom, SingleAxis::mouse_wheel_y()) .build(), ..default() } @@ -109,7 +109,7 @@ pub(crate) fn create_camera_action_input_manager_bundle() -> InputManagerBundle< pub(crate) fn create_ui_action_input_manager_bundle() -> InputManagerBundle { InputManagerBundle { - input_map: InputMap::new([(QwertyScanCode::Escape, UiAction::TogglePause)]), + input_map: InputMap::new([(UiAction::TogglePause, KeyCode::Escape)]), ..default() } } @@ -119,16 +119,20 @@ pub(crate) fn remove_actions_when_frozen( mut camera_actions_query: Query<&mut ActionState>, ) { for mut player_actions in player_actions_query.iter_mut() { - player_actions.action_data_mut(PlayerAction::Move).axis_pair = Some(default()); - player_actions.release(PlayerAction::Jump); - player_actions.release(PlayerAction::Interact); - player_actions.release(PlayerAction::Sprint); + player_actions + .action_data_mut_or_default(&PlayerAction::Move) + .axis_pair = Some(default()); + player_actions.release(&PlayerAction::Jump); + player_actions.release(&PlayerAction::Interact); + player_actions.release(&PlayerAction::Sprint); } for mut camera_actions in camera_actions_query.iter_mut() { camera_actions - .action_data_mut(CameraAction::Orbit) + .action_data_mut_or_default(&CameraAction::Orbit) .axis_pair = Some(default()); - camera_actions.action_data_mut(CameraAction::Zoom).value = default(); + camera_actions + .action_data_mut_or_default(&CameraAction::Zoom) + .value = default(); } } diff --git a/src/player_control/camera/cursor.rs b/src/player_control/camera/cursor.rs index 20a11f88..82a1d588 100644 --- a/src/player_control/camera/cursor.rs +++ b/src/player_control/camera/cursor.rs @@ -1,21 +1,21 @@ use crate::player_control::actions::ActionsFrozen; -use anyhow::{Context, Result}; +use anyhow::Context; use bevy::{ prelude::*, window::{CursorGrabMode, PrimaryWindow}, }; -use bevy_mod_sysfail::*; +use bevy_mod_sysfail::prelude::*; use serde::{Deserialize, Serialize}; #[derive(Debug, Clone, Copy, Resource, Serialize, Deserialize, Default)] pub(crate) struct ForceCursorGrabMode(pub(crate) Option); -#[sysfail(log(level = "error"))] +#[sysfail(Log)] pub(crate) fn grab_cursor( mut primary_windows: Query<&mut Window, With>, actions_frozen: Res, force_cursor_grab: Res, -) -> Result<()> { +) { #[cfg(feature = "tracing")] let _span = info_span!("cursor_grab_system").entered(); let mut window = primary_windows @@ -32,5 +32,4 @@ pub(crate) fn grab_cursor( cursor.grab_mode = CursorGrabMode::Locked; cursor.visible = false; } - Ok(()) } diff --git a/src/player_control/camera/focus.rs b/src/player_control/camera/focus.rs index 348101a2..de651ccd 100644 --- a/src/player_control/camera/focus.rs +++ b/src/player_control/camera/focus.rs @@ -2,20 +2,20 @@ use crate::{ player_control::{camera::IngameCamera, player_embodiment::Player}, world_interaction::dialog::DialogTarget, }; -use anyhow::Result; + use bevy::prelude::*; -use bevy_mod_sysfail::*; +use bevy_mod_sysfail::prelude::*; use bevy_yarnspinner::events::DialogueCompleteEvent; use bevy_yarnspinner_example_dialogue_view::SpeakerChangeEvent; -#[sysfail(log(level = "error"))] +#[sysfail(Log)] pub(crate) fn set_camera_focus( mut camera_query: Query<&mut IngameCamera>, mut speaker_change_events: EventReader, player_query: Query<&Transform, With>, 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() { for event in speaker_change_events.read() { @@ -35,5 +35,4 @@ pub(crate) fn set_camera_focus( camera.secondary_target = None; } } - Ok(()) } diff --git a/src/player_control/camera/kind.rs b/src/player_control/camera/kind.rs index 6f14e7d0..aad13294 100644 --- a/src/player_control/camera/kind.rs +++ b/src/player_control/camera/kind.rs @@ -14,7 +14,7 @@ pub(crate) fn update_kind( config: Res, ) { for (mut camera, actions) in camera_query.iter_mut() { - let zoom = actions.clamped_value(CameraAction::Zoom); + let zoom = actions.clamped_value(&CameraAction::Zoom); let zoomed_out = zoom < -1e-5; let zoomed_in = zoom > 1e-5; let new_kind = match camera.kind { diff --git a/src/player_control/camera/rig.rs b/src/player_control/camera/rig.rs index f23d7edb..ac12aa59 100644 --- a/src/player_control/camera/rig.rs +++ b/src/player_control/camera/rig.rs @@ -9,16 +9,16 @@ use crate::{ }, util::trait_extension::Vec2Ext, }; -use anyhow::Result; + use bevy::prelude::*; use bevy_dolly::prelude::*; -use bevy_mod_sysfail::*; +use bevy_mod_sysfail::prelude::*; use bevy_xpbd_3d::prelude::SpatialQuery; use leafwing_input_manager::prelude::ActionState; mod arm; -#[sysfail(log(level = "error"))] +#[sysfail(Log)] pub(crate) fn update_rig( time: Res>, mut camera_query: Query<( @@ -29,7 +29,7 @@ pub(crate) fn update_rig( )>, config: Res, spatial_query: SpatialQuery, -) -> Result<()> { +) { let dt = time.delta_seconds(); for (mut camera, mut rig, actions, transform) in camera_query.iter_mut() { set_look_at(&mut rig, &camera); @@ -54,12 +54,11 @@ pub(crate) fn update_rig( set_smoothness(&mut rig, &config, &camera); } - Ok(()) } fn get_camera_movement(actions: &ActionState) -> Vec2 { actions - .axis_pair(CameraAction::Orbit) + .axis_pair(&CameraAction::Orbit) .map(|pair| pair.xy()) .unwrap_or_default() } @@ -113,7 +112,7 @@ fn set_desired_distance( actions: &ActionState, config: &GameConfig, ) { - let zoom = actions.clamped_value(CameraAction::Zoom) * config.camera.third_person.zoom_speed; + let zoom = actions.clamped_value(&CameraAction::Zoom) * config.camera.third_person.zoom_speed; let (min_distance, max_distance) = match camera.kind { IngameCameraKind::ThirdPerson => ( config.camera.third_person.min_distance, diff --git a/src/player_control/camera/rig/arm.rs b/src/player_control/camera/rig/arm.rs index be776fd7..e2b41d70 100644 --- a/src/player_control/camera/rig/arm.rs +++ b/src/player_control/camera/rig/arm.rs @@ -2,7 +2,7 @@ use crate::{ file_system_interaction::config::GameConfig, level_instantiation::spawning::objects::CollisionLayer, player_control::camera::{IngameCamera, IngameCameraKind}, - util::{smoothness_to_lerp_factor, trait_extension::F32Ext}, + util::smoothness_to_lerp_factor, }; use bevy::prelude::*; use bevy_dolly::prelude::*; @@ -65,8 +65,7 @@ fn get_distance_to_collision( let max_toi = camera.desired_distance; let solid = true; - let filter = - SpatialQueryFilter::new().with_masks_from_bits(CollisionLayer::CameraObstacle.to_bits()); + let filter = SpatialQueryFilter::from_mask(CollisionLayer::CameraObstacle.to_bits()); let min_distance = match camera.kind { IngameCameraKind::ThirdPerson => config.camera.third_person.min_distance_to_objects, @@ -87,7 +86,7 @@ fn get_distance_to_collision( fn get_distance_such_that_min_distance_from_collision_is_ensured( hit: RayHitData, - direction: Vec3, + direction: Direction3d, min_distance: f32, ) -> f32 { // Wall diff --git a/src/player_control/player_embodiment.rs b/src/player_control/player_embodiment.rs index ed22867a..f01e5f04 100644 --- a/src/player_control/player_embodiment.rs +++ b/src/player_control/player_embodiment.rs @@ -8,10 +8,10 @@ use crate::{ }; use crate::{util::trait_extension::Vec3Ext, world_interaction::dialog::DialogTarget, GameState}; -use anyhow::{Context, Result}; +use anyhow::Context; use bevy::prelude::*; use bevy_kira_audio::AudioInstance; -use bevy_mod_sysfail::*; +use bevy_mod_sysfail::prelude::*; use bevy_tnua::{builtins::TnuaBuiltinWalk, controller::TnuaController}; use bevy_yarnspinner_example_dialogue_view::SpeakerChangeEvent; use leafwing_input_manager::prelude::ActionState; @@ -46,15 +46,15 @@ fn handle_jump(mut player_query: Query<(&ActionState, &mut Jump), #[cfg(feature = "tracing")] let _span = info_span!("handle_jump").entered(); for (actions, mut jump) in &mut player_query { - jump.requested |= actions.pressed(PlayerAction::Jump); + jump.requested |= actions.pressed(&PlayerAction::Jump); } } -#[sysfail(log(level = "error"))] +#[sysfail(Log)] fn handle_horizontal_movement( mut player_query: Query<(&ActionState, &mut Walk, &mut Sprinting), With>, camera_query: Query<(&IngameCamera, &Transform), Without>, -) -> Result<()> { +) { #[cfg(feature = "tracing")] let _span = info_span!("handle_horizontal_movement").entered(); let Some((camera, camera_transform)) = camera_query.iter().next() else { @@ -62,7 +62,7 @@ fn handle_horizontal_movement( }; for (actions, mut walk, mut sprint) in &mut player_query { - let Some(axis) = actions.axis_pair(PlayerAction::Move) else { + let Some(axis) = actions.axis_pair(&PlayerAction::Move) else { continue; }; if let Some(movement) = axis.max_normalized() { @@ -88,10 +88,9 @@ fn handle_horizontal_movement( let direction = forward_action * modifier + sideways_action; walk.direction = Some(direction); - sprint.requested = actions.pressed(PlayerAction::Sprint); + sprint.requested = actions.pressed(&PlayerAction::Sprint); } } - Ok(()) } fn handle_camera_kind( @@ -144,13 +143,13 @@ fn rotate_to_speaker( } } -#[sysfail(log(level = "error"))] +#[sysfail(Log)] fn control_walking_sound( time: Res>, character_query: Query<&TnuaController, With>, audio: Res, mut audio_instances: ResMut>, -) -> Result<()> { +) { #[cfg(feature = "tracing")] let _span = info_span!("control_walking_sound").entered(); for controller in character_query.iter() { @@ -168,5 +167,4 @@ fn control_walking_sound( audio_instance.pause(default()); } } - Ok(()) } diff --git a/src/shader.rs b/src/shader.rs index 254cd93f..f4238ef8 100644 --- a/src/shader.rs +++ b/src/shader.rs @@ -1,4 +1,3 @@ -#![allow(clippy::extra_unused_type_parameters)] use crate::{file_system_interaction::asset_loading::TextureAssets, GameState}; use anyhow::Result; diff --git a/src/util/trait_extension.rs b/src/util/trait_extension.rs index 45abebc7..1379d97a 100644 --- a/src/util/trait_extension.rs +++ b/src/util/trait_extension.rs @@ -28,7 +28,6 @@ impl Vec2Ext for Vec2 { pub(crate) trait F32Ext: Copy { fn squared(self) -> f32; - fn lerp(self, other: f32, ratio: f32) -> f32; } impl F32Ext for f32 { @@ -36,9 +35,4 @@ impl F32Ext for f32 { fn squared(self) -> f32 { self * self } - - #[inline] - fn lerp(self, other: f32, ratio: f32) -> f32 { - self.mul_add(1. - ratio, other * ratio) - } } diff --git a/src/world_interaction.rs b/src/world_interaction.rs index a503ebdf..944d3bfa 100644 --- a/src/world_interaction.rs +++ b/src/world_interaction.rs @@ -1,6 +1,5 @@ use crate::world_interaction::{dialog::dialog_plugin, interactions_ui::interactions_ui_plugin}; use bevy::prelude::*; -use seldom_fn_plugin::FnPluginExt; pub(crate) mod dialog; pub(crate) mod interactions_ui; @@ -9,6 +8,5 @@ pub(crate) mod interactions_ui; /// - [`dialog_plugin`] handles dialog trees /// - [`interactions_ui_plugin`] handles the UI for interacting with an object in front of the player. pub(crate) fn world_interaction_plugin(app: &mut App) { - app.fn_plugin(dialog_plugin) - .fn_plugin(interactions_ui_plugin); + app.add_plugins((dialog_plugin, interactions_ui_plugin)); } diff --git a/src/world_interaction/dialog.rs b/src/world_interaction/dialog.rs index 71e25903..fc351b45 100644 --- a/src/world_interaction/dialog.rs +++ b/src/world_interaction/dialog.rs @@ -1,8 +1,11 @@ -use crate::player_control::actions::ActionsFrozen; +use crate::{ + level_instantiation::spawning::objects::camera::IngameCameraMarker, + player_control::actions::ActionsFrozen, +}; use bevy::prelude::*; use bevy_egui::EguiPlugin; use bevy_yarnspinner::{events::DialogueCompleteEvent, prelude::*}; -use bevy_yarnspinner_example_dialogue_view::prelude::*; +use bevy_yarnspinner_example_dialogue_view::{prelude::*, UiRootNode}; use serde::{Deserialize, Serialize}; pub(crate) fn dialog_plugin(app: &mut App) { @@ -14,9 +17,11 @@ pub(crate) fn dialog_plugin(app: &mut App) { .add_systems( Update, ( - spawn_dialogue_runner.run_if(resource_added::()), - unfreeze_after_dialog.after(ExampleYarnSpinnerDialogueViewSystemSet), - ), + spawn_dialogue_runner.run_if(resource_added::), + unfreeze_after_dialog, + set_ui_target_camera, + ) + .after(ExampleYarnSpinnerDialogueViewSystemSet), ); } @@ -41,3 +46,17 @@ fn unfreeze_after_dialog( freeze.unfreeze(); } } + +fn set_ui_target_camera( + mut commands: Commands, + root_ui_node: Query, Without)>, + main_camera: Query>, +) { + for camera_entity in main_camera.iter() { + for node_entity in root_ui_node.iter() { + commands + .entity(node_entity) + .insert(TargetCamera(camera_entity)); + } + } +} diff --git a/src/world_interaction/interactions_ui.rs b/src/world_interaction/interactions_ui.rs index b037cfad..d9be4d3e 100644 --- a/src/world_interaction/interactions_ui.rs +++ b/src/world_interaction/interactions_ui.rs @@ -8,10 +8,10 @@ use crate::{ }; use crate::{world_interaction::dialog::DialogTarget, GameState}; -use anyhow::{Context, Result}; +use anyhow::Context; use bevy::{prelude::*, window::PrimaryWindow}; use bevy_egui::{egui, EguiContexts}; -use bevy_mod_sysfail::*; +use bevy_mod_sysfail::prelude::*; use bevy_xpbd_3d::prelude::*; use bevy_yarnspinner::prelude::DialogueRunner; use leafwing_input_manager::prelude::ActionState; @@ -31,7 +31,7 @@ pub(crate) fn interactions_ui_plugin(app: &mut App) { .run_if( not(is_frozen) .and_then(in_state(GameState::Playing)) - .and_then(any_with_component::()), + .and_then(any_with_component::), ), ); } @@ -40,7 +40,7 @@ pub(crate) fn interactions_ui_plugin(app: &mut App) { #[reflect(Resource, Serialize, Deserialize)] pub(crate) struct InteractionOpportunity(pub(crate) Option); -#[sysfail(log(level = "error"))] +#[sysfail(Log)] fn update_interaction_opportunities( mut collisions: EventReader, player_query: Query<&Transform, With>, @@ -51,7 +51,7 @@ fn update_interaction_opportunities( >, camera_query: Query<(&IngameCamera, &Transform), Without>, mut interaction_opportunity: ResMut, -) -> Result<()> { +) { interaction_opportunity.0 = None; for Collision(ref contacts) in collisions.read() { @@ -93,7 +93,6 @@ fn update_interaction_opportunities( interaction_opportunity.0.replace(target); } } - Ok(()) } fn get_player_and_target( @@ -125,7 +124,7 @@ fn is_facing_target( angle < TAU / 8. } -#[sysfail(log(level = "error"))] +#[sysfail(Log)] fn display_interaction_prompt( interaction_opportunity: Res, mut dialogue_runner: Query<&mut DialogueRunner>, @@ -134,7 +133,7 @@ fn display_interaction_prompt( primary_windows: Query<&Window, With>, dialog_target_query: Query<&DialogTarget>, mut freeze: ResMut, -) -> Result<()> { +) { let Some(opportunity) = interaction_opportunity.0 else { return Ok(()); }; @@ -151,11 +150,10 @@ fn display_interaction_prompt( ui.label("E: Talk"); }); for actions in actions.iter() { - if actions.just_pressed(PlayerAction::Interact) { + if actions.just_pressed(&PlayerAction::Interact) { let mut dialogue_runner = dialogue_runner.single_mut(); dialogue_runner.start_node(&dialog_target.node); freeze.freeze(); } } - Ok(()) }