From 42ee8b91241fb2cd3b847c69c6e615da6351ab84 Mon Sep 17 00:00:00 2001 From: Charlotte McElwain Date: Sat, 31 Aug 2024 15:11:09 -0700 Subject: [PATCH 01/17] 0.15-dev --- Cargo.lock | 3172 +++++++++++++++++++++++++----------- Cargo.toml | 8 +- bevy_nannou_isf/Cargo.toml | 2 +- 3 files changed, 2270 insertions(+), 912 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 21c42d330..6c84cbd89 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -24,13 +24,29 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6cf780eb737f2d4a49ffbd512324d53ad089070f813f7be7f99dbd5123a7f448" +[[package]] +name = "accesskit" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4700bdc115b306d6c43381c344dc307f03b7f0460c304e4892c309930322bd7" + [[package]] name = "accesskit_consumer" version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3bdfa1638ddd6eb9c752def95568df8b3ad832df252e9156d2eb783b201ca8a9" dependencies = [ - "accesskit", + "accesskit 0.14.0", + "immutable-chunkmap", +] + +[[package]] +name = "accesskit_consumer" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe3a07a32ab5837ad83db3230ac490c8504c2cd5b90ac8c00db6535f6ed65d0b" +dependencies = [ + "accesskit 0.16.0", "immutable-chunkmap", ] @@ -40,8 +56,22 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c236a84ff1111defc280cee755eaa953d0b24398786851b9d28322c6d3bb1ebd" dependencies = [ - "accesskit", - "accesskit_consumer", + "accesskit 0.14.0", + "accesskit_consumer 0.22.0", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "once_cell", +] + +[[package]] +name = "accesskit_macos" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a189d159c153ae0fce5f9eefdcfec4a27885f453ce5ef0ccf078f72a73c39d34" +dependencies = [ + "accesskit 0.16.0", + "accesskit_consumer 0.24.0", "objc2", "objc2-app-kit", "objc2-foundation", @@ -54,8 +84,21 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d7f43d24b16b3e76bef248124fbfd2493c3a9860edb5aae1010c890e826de5e" dependencies = [ - "accesskit", - "accesskit_consumer", + "accesskit 0.14.0", + "accesskit_consumer 0.22.0", + "paste", + "static_assertions", + "windows 0.54.0", +] + +[[package]] +name = "accesskit_windows" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "682d8c4fb425606f97408e7577793f32e96310b646fa77662eb4216293eddc7f" +dependencies = [ + "accesskit 0.16.0", + "accesskit_consumer 0.24.0", "paste", "static_assertions", "windows 0.54.0", @@ -67,9 +110,22 @@ version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "755535e6bf711a42dac28b888b884b10fc00ff4010d9d3bd871c5f5beae5aa78" dependencies = [ - "accesskit", - "accesskit_macos", - "accesskit_windows", + "accesskit 0.14.0", + "accesskit_macos 0.15.0", + "accesskit_windows 0.20.0", + "raw-window-handle", + "winit", +] + +[[package]] +name = "accesskit_winit" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9afbd6d598b7c035639ad2b664aa0edc94c93dc1fc3ebb4b40d8a95fcd43ffac" +dependencies = [ + "accesskit 0.16.0", + "accesskit_macos 0.17.0", + "accesskit_windows 0.22.0", "raw-window-handle", "winit", ] @@ -89,6 +145,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "adler32" version = "1.2.0" @@ -152,12 +214,13 @@ dependencies = [ [[package]] name = "alsa" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce" +checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43" dependencies = [ "alsa-sys", "bitflags 2.6.0", + "cfg-if 1.0.0", "libc", ] @@ -188,7 +251,7 @@ dependencies = [ "ndk 0.9.0", "ndk-context", "ndk-sys 0.6.0+11769913", - "num_enum 0.7.2", + "num_enum 0.7.3", "thiserror", ] @@ -266,7 +329,7 @@ checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" dependencies = [ "clipboard-win", "core-graphics", - "image 0.25.1", + "image 0.25.2", "log", "objc2", "objc2-app-kit", @@ -283,15 +346,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" @@ -310,12 +373,18 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" +<<<<<<< HEAD checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" dependencies = [ "serde", ] +||||||| parent of a76e8ed (0.15-dev) +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +======= +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +>>>>>>> a76e8ed (0.15-dev) [[package]] name = "as-raw-xcb-connection" @@ -331,11 +400,11 @@ checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" [[package]] name = "ash" -version = "0.37.3+1.3.251" +version = "0.38.0+1.3.281" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" dependencies = [ - "libloading 0.7.4", + "libloading", ] [[package]] @@ -376,9 +445,9 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ "async-task", "concurrent-queue", @@ -421,6 +490,12 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" +[[package]] +name = "atomicow" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "467163b50876d3a4a44da5f4dbd417537e522fc059ede8d518d57941cfb3d745" + [[package]] name = "atty" version = "0.2.14" @@ -469,7 +544,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" dependencies = [ "anyhow", - "arrayvec 0.7.4", + "arrayvec 0.7.6", "log", "nom 7.1.3", "num-rational 0.4.2", @@ -482,7 +557,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", ] [[package]] @@ -539,39 +614,46 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bevy" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e938630e9f472b1899c78ef84aa907081b23bad8333140e2295c620485b6ee7" +checksum = "c8ece0d8dde51890fb52dcba5b04fd1c657617a4022908c327b2d6e83d173a32" +dependencies = [ + "bevy_internal 0.14.1", +] + +[[package]] +name = "bevy" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" dependencies = [ - "bevy_internal", + "bevy_internal 0.15.0-dev", ] [[package]] name = "bevy-inspector-egui" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "094e2d697a9dcbbd62fc6ff133d1d95990f66b6c4d25cdfb528f4b102c6a3ed1" +version = "0.24.0" +source = "git+https://github.com/tychedelia/bevy-inspector-egui?branch=main#c2efce18beb32ce9e89d0ed0a591985e683d2b6d" dependencies = [ "bevy-inspector-egui-derive", - "bevy_app", - "bevy_asset", - "bevy_color", - "bevy_core", - "bevy_core_pipeline", - "bevy_ecs", - "bevy_egui", - "bevy_hierarchy", - "bevy_log", - "bevy_math", - "bevy_pbr", - "bevy_reflect", - "bevy_render", - "bevy_state", - "bevy_time", - "bevy_utils", - "bevy_window", + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_core_pipeline 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_egui 0.29.0 (git+https://github.com/tychedelia/bevy_egui)", + "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_log 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_pbr 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_time 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_window 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bytemuck", - "egui", + "egui 0.27.2", + "egui-dropdown", "fuzzy-matcher", "image 0.24.9", "once_cell", @@ -581,47 +663,69 @@ dependencies = [ [[package]] name = "bevy-inspector-egui-derive" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "161d93f4b3a9246a87485e30ccf4cc927f204a14f26df42da977e383f0a0ec5d" +version = "0.24.0" +source = "git+https://github.com/tychedelia/bevy-inspector-egui?branch=main#c2efce18beb32ce9e89d0ed0a591985e683d2b6d" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] name = "bevy_a11y" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e613f0e7d5a92637e59744f7185e374c9a59654ecc6d7575adcec9581db1363" +checksum = "82d84e0ae7155afa21c4926fb8b89ebe0cbd66239ac817fdb834025327c4089b" +dependencies = [ + "accesskit 0.14.0", + "bevy_app 0.14.1", + "bevy_derive 0.14.1", + "bevy_ecs 0.14.1", +] + +[[package]] +name = "bevy_a11y" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "accesskit 0.16.0", + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", +] + +[[package]] +name = "bevy_a11y" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" dependencies = [ - "accesskit", - "bevy_app", - "bevy_derive", - "bevy_ecs", + "accesskit 0.16.0", + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", ] [[package]] name = "bevy_animation" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23aa4141df149b743e69c90244261c6372bafb70d9f115885de48a75fc28fd9b" -dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_color", - "bevy_core", - "bevy_derive", - "bevy_ecs", - "bevy_hierarchy", - "bevy_log", - "bevy_math", - "bevy_reflect", - "bevy_render", - "bevy_time", - "bevy_transform", - "bevy_utils", +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_log 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_time 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "blake3", "fixedbitset 0.5.7", "petgraph 0.6.5", @@ -629,21 +733,57 @@ dependencies = [ "serde", "thiserror", "thread_local", - "uuid 1.9.1", + "uuid 1.10.0", ] [[package]] name = "bevy_app" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f548e9dab7d10c5f99e3b504c758c4bf87aa67df9bcb9cc8b317a0271770e72" +checksum = "0af99549f5de61cc91c8c23303b13aa07f97b73fbace39695dee0a0a32cec9d4" dependencies = [ - "bevy_derive", - "bevy_ecs", - "bevy_reflect", - "bevy_tasks", - "bevy_utils", + "bevy_derive 0.14.1", + "bevy_ecs 0.14.1", + "bevy_reflect 0.14.1", + "bevy_tasks 0.14.1", + "bevy_utils 0.14.1", + "console_error_panic_hook", + "downcast-rs", + "thiserror", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "bevy_app" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "console_error_panic_hook", + "ctrlc", + "downcast-rs", + "thiserror", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "bevy_app" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "console_error_panic_hook", + "ctrlc", "downcast-rs", "thiserror", "wasm-bindgen", @@ -652,20 +792,52 @@ dependencies = [ [[package]] name = "bevy_asset" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d198e4c3419215de2ad981d4e734bbfab46469b7575e3b7150c912b9ec5175" +checksum = "6533d17f13b44ea4fb5177f83b0900269ed13c0fd45772ccffd19a69980647ec" +dependencies = [ + "async-broadcast", + "async-fs", + "async-lock", + "bevy_app 0.14.1", + "bevy_asset_macros 0.14.1", + "bevy_ecs 0.14.1", + "bevy_reflect 0.14.1", + "bevy_tasks 0.14.1", + "bevy_utils 0.14.1", + "bevy_winit 0.14.1", + "blake3", + "crossbeam-channel", + "downcast-rs", + "futures-io", + "futures-lite", + "js-sys", + "parking_lot 0.12.3", + "ron", + "serde", + "thiserror", + "uuid 1.10.0", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "bevy_asset" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" dependencies = [ "async-broadcast", "async-fs", "async-lock", - "bevy_app", - "bevy_asset_macros", - "bevy_ecs", - "bevy_reflect", - "bevy_tasks", - "bevy_utils", - "bevy_winit", + "atomicow", + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_asset_macros 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_winit 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "blake3", "crossbeam-channel", "downcast-rs", @@ -676,8 +848,42 @@ dependencies = [ "parking_lot 0.12.3", "ron", "serde", + "stackfuture", + "thiserror", + "uuid 1.10.0", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "bevy_asset" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "async-broadcast", + "async-fs", + "async-lock", + "atomicow", + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_asset_macros 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_winit 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "blake3", + "crossbeam-channel", + "downcast-rs", + "futures-io", + "futures-lite", + "js-sys", + "parking_lot 0.12.3", + "ron", + "serde", + "stackfuture", "thiserror", - "uuid 1.9.1", + "uuid 1.10.0", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -685,43 +891,77 @@ dependencies = [ [[package]] name = "bevy_asset_macros" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11b2cbeba287a4b44e116c33dbaf37dce80a9d84477b2bb35ff459999d6c9e1b" +checksum = "74b0e132a89e254c0f5c8bc8deebb0f2490f5662f4aa2215a6996701446d6a7b" +dependencies = [ + "bevy_macro_utils 0.14.1", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.77", +] + +[[package]] +name = "bevy_asset_macros" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.77", +] + +[[package]] +name = "bevy_asset_macros" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] name = "bevy_audio" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e41ecf15d0aae31bdb6d2b5cc590f966451e9736ddfee634c8f1ca5af1ac4342" -dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_derive", - "bevy_ecs", - "bevy_hierarchy", - "bevy_math", - "bevy_reflect", - "bevy_transform", - "bevy_utils", +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "cpal 0.15.3", "rodio", ] [[package]] name = "bevy_color" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a933306f5c7dc9568209180f482b28b5f40d2f8d5b361bc1b270c0a588752c0" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bytemuck", + "encase", + "serde", + "thiserror", + "wgpu-types", +] + +[[package]] +name = "bevy_color" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" dependencies = [ - "bevy_math", - "bevy_reflect", + "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bytemuck", "encase", "serde", @@ -736,44 +976,93 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f631ce2863f3b6f1af3fa24143363b9fbd21c44218caad495a17b83e6968256" dependencies = [ "anyhow", - "bevy", + "bevy 0.14.1", "serde", "serde_json", "thiserror", - "toml 0.8.14", + "toml 0.8.19", ] [[package]] name = "bevy_core" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ddeed5ebf2fa75a4d4f32e2da9c60f11037e36252695059a151c6685cd3d72b" +checksum = "8ccc7118a2865267136afb5e6a2c0aed30994e522f298b2ba0b088878e6ddf59" +dependencies = [ + "bevy_app 0.14.1", + "bevy_ecs 0.14.1", + "bevy_reflect 0.14.1", + "bevy_tasks 0.14.1", + "bevy_utils 0.14.1", + "uuid 1.10.0", +] + +[[package]] +name = "bevy_core" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "uuid 1.10.0", +] + +[[package]] +name = "bevy_core" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_reflect", - "bevy_tasks", - "bevy_utils", - "uuid 1.9.1", + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "uuid 1.10.0", ] [[package]] name = "bevy_core_pipeline" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b978220b5edc98f2c5cbbd14c118c74b3ec7216e5416d3c187c1097279b009b" -dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_color", - "bevy_core", - "bevy_derive", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_render", - "bevy_transform", - "bevy_utils", +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bitflags 2.6.0", + "nonmax", + "radsort", + "serde", + "smallvec 1.13.2", + "thiserror", +] + +[[package]] +name = "bevy_core_pipeline" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bitflags 2.6.0", "nonmax", "radsort", @@ -784,43 +1073,129 @@ dependencies = [ [[package]] name = "bevy_derive" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8a8173bad3ed53fa158806b1beda147263337d6ef71a093780dd141b74386b1" +checksum = "8675f337f374b2b8ae90539982b947d171f9adb302d00c032b823bd5231f8978" +dependencies = [ + "bevy_macro_utils 0.14.1", + "quote 1.0.37", + "syn 2.0.77", +] + +[[package]] +name = "bevy_derive" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "quote 1.0.37", + "syn 2.0.77", +] + +[[package]] +name = "bevy_derive" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" dependencies = [ - "bevy_macro_utils", - "quote 1.0.36", - "syn 2.0.69", + "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] name = "bevy_diagnostic" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7f82011fd70048be282526a99756d54bf00e874edafa9664ba0dc247678f03" +checksum = "fdcc1d7ba5797e4285a7867227134d4cabaaf8cabfb7cdc42eb697d3b3db0460" dependencies = [ - "bevy_app", - "bevy_core", - "bevy_ecs", - "bevy_tasks", - "bevy_time", - "bevy_utils", + "bevy_app 0.14.1", + "bevy_core 0.14.1", + "bevy_ecs 0.14.1", + "bevy_tasks 0.14.1", + "bevy_time 0.14.1", + "bevy_utils 0.14.1", + "const-fnv1a-hash", +] + +[[package]] +name = "bevy_diagnostic" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_time 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "const-fnv1a-hash", "sysinfo", ] +[[package]] +name = "bevy_diagnostic" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_time 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "const-fnv1a-hash", +] + [[package]] name = "bevy_ecs" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c77fdc3a7230eff2fcebe4bd17c155bd238c660a0089d0f98c39ba0d461b923" +checksum = "7a3eed7f144811946ebfa1c740da9e3bcd6dd2dd4da844eda085249d29bc9fef" dependencies = [ - "arrayvec 0.7.4", - "bevy_ecs_macros", - "bevy_ptr", - "bevy_reflect", - "bevy_tasks", - "bevy_utils", + "bevy_ecs_macros 0.14.1", + "bevy_ptr 0.14.1", + "bevy_reflect 0.14.1", + "bevy_tasks 0.14.1", + "bevy_utils 0.14.1", + "bitflags 2.6.0", + "concurrent-queue", + "fixedbitset 0.5.7", + "nonmax", + "petgraph 0.6.5", + "serde", + "thiserror", +] + +[[package]] +name = "bevy_ecs" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "arrayvec 0.7.6", + "bevy_ecs_macros 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ptr 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bitflags 2.6.0", + "concurrent-queue", + "fixedbitset 0.5.7", + "nonmax", + "petgraph 0.6.5", + "serde", + "thiserror", +] + +[[package]] +name = "bevy_ecs" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_ecs_macros 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_ptr 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bitflags 2.6.0", "concurrent-queue", "fixedbitset 0.5.7", @@ -832,28 +1207,71 @@ dependencies = [ [[package]] name = "bevy_ecs_macros" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272b511958525306cd141726d3ca59740f79fc0707c439b55a007bcc3497308" +checksum = "d523630f2eb9fde6727e6c5ea48fa708079c5345da21ffeb1a4bd8ca761830da" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.14.1", "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] -name = "bevy_egui" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4a90f30f2849a07d91e393b10c0cc05df09b5773c010ddde57dd8b583be230" +name = "bevy_ecs_macros" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" dependencies = [ - "arboard", - "bevy", - "bytemuck", + "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.77", +] + +[[package]] +name = "bevy_ecs_macros" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.77", +] + +[[package]] +name = "bevy_egui" +version = "0.29.0" +source = "git+https://github.com/tychedelia/bevy_egui?branch=main#5c7095cab99df8009dd41b3126acadab9f6099c9" +dependencies = [ + "arboard", + "bevy 0.15.0-dev", + "bytemuck", + "console_log", + "crossbeam-channel", + "egui 0.28.1", + "js-sys", + "log", + "thread_local", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webbrowser", + "wgpu-types", + "winit", +] + +[[package]] +name = "bevy_egui" +version = "0.29.0" +source = "git+https://github.com/tychedelia/bevy_egui#5c7095cab99df8009dd41b3126acadab9f6099c9" +dependencies = [ + "arboard", + "bevy 0.15.0-dev", + "bytemuck", "console_log", "crossbeam-channel", - "egui", + "egui 0.28.1", "js-sys", "log", "thread_local", @@ -861,92 +1279,97 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "webbrowser", + "wgpu-types", "winit", ] [[package]] name = "bevy_encase_derive" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0452d8254c8bfae4bff6caca2a8be3b0c1b2e1a72b93e9b9f6a21c8dff807e0" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" dependencies = [ - "bevy_macro_utils", - "encase_derive_impl", + "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "encase_derive_impl 0.8.0", ] [[package]] -name = "bevy_gilrs" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbad8e59470c3d5cf25aa8c48462c4cf6f0c6314538c68ab2f5cf393146f0fc2" +name = "bevy_encase_derive" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_input", - "bevy_time", - "bevy_utils", + "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "encase_derive_impl 0.8.0", +] + +[[package]] +name = "bevy_gilrs" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_input 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_time 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "gilrs", "thiserror", ] [[package]] name = "bevy_gizmos" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdbb0556f0c6e45f4a17aef9c708c06ebf15ae1bed4533d7eddb493409f9f025" -dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_color", - "bevy_core_pipeline", - "bevy_ecs", +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_core_pipeline 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_gizmos_macros", - "bevy_math", - "bevy_pbr", - "bevy_reflect", - "bevy_render", + "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_pbr 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_sprite", - "bevy_time", - "bevy_transform", - "bevy_utils", + "bevy_time 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bytemuck", ] [[package]] name = "bevy_gizmos_macros" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ef351a4b6498c197d1317c62f46ba84b69fbde3dbeb57beb2e744bbe5b7c3e0" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] name = "bevy_gltf" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfd7abeaf3f28afd1f8999c2169aa17b40a37ad11253cf7dd05017024b65adc6" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" dependencies = [ "base64 0.22.1", "bevy_animation", - "bevy_app", - "bevy_asset", - "bevy_color", - "bevy_core", - "bevy_core_pipeline", - "bevy_ecs", - "bevy_hierarchy", - "bevy_math", - "bevy_pbr", - "bevy_reflect", - "bevy_render", + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_core_pipeline 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_pbr 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_scene", - "bevy_tasks", - "bevy_transform", - "bevy_utils", + "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "gltf", "percent-encoding 2.3.1", "serde", @@ -957,84 +1380,192 @@ dependencies = [ [[package]] name = "bevy_hierarchy" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "802eca6f341d19ade790ccfaba7044be4d823b708087eb5ac4c1f74e4ea0916a" +checksum = "bb332d2789442ca1577c765977bafefea1dcd4db29479713ec8c6932dfb82cdb" dependencies = [ - "bevy_app", - "bevy_core", - "bevy_ecs", - "bevy_reflect", - "bevy_utils", + "bevy_app 0.14.1", + "bevy_core 0.14.1", + "bevy_ecs 0.14.1", + "bevy_reflect 0.14.1", + "bevy_utils 0.14.1", + "smallvec 1.13.2", +] + +[[package]] +name = "bevy_hierarchy" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "smallvec 1.13.2", +] + +[[package]] +name = "bevy_hierarchy" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "smallvec 1.13.2", ] [[package]] name = "bevy_input" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d050f1433f48ca23f1ea078734ebff119a3f76eb7d221725ab0f1fd9f81230b" +checksum = "a9ce5f27a8729b473205b01927cd6a5c4898a004cb8fcffa7c896e19ba999d98" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_utils", + "bevy_app 0.14.1", + "bevy_ecs 0.14.1", + "bevy_math 0.14.1", + "bevy_reflect 0.14.1", + "bevy_utils 0.14.1", + "smol_str", + "thiserror", +] + +[[package]] +name = "bevy_input" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "smol_str", + "thiserror", +] + +[[package]] +name = "bevy_input" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "smol_str", "thiserror", ] [[package]] name = "bevy_internal" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ddd2b23e44d3a1f8ae547cbee5b6661f8135cc456c5de206e8648789944e7a1" +checksum = "c2463102e46d7d67440dbfe3bc97d34bf529c93191c4f4bb41395f4982062ff3" +dependencies = [ + "bevy_a11y 0.14.1", + "bevy_app 0.14.1", + "bevy_asset 0.14.1", + "bevy_core 0.14.1", + "bevy_derive 0.14.1", + "bevy_diagnostic 0.14.1", + "bevy_ecs 0.14.1", + "bevy_hierarchy 0.14.1", + "bevy_input 0.14.1", + "bevy_log 0.14.1", + "bevy_math 0.14.1", + "bevy_ptr 0.14.1", + "bevy_reflect 0.14.1", + "bevy_tasks 0.14.1", + "bevy_time 0.14.1", + "bevy_transform 0.14.1", + "bevy_utils 0.14.1", + "bevy_window 0.14.1", +] + +[[package]] +name = "bevy_internal" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" dependencies = [ - "bevy_a11y", + "bevy_a11y 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_animation", - "bevy_app", - "bevy_asset", + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_audio", - "bevy_color", - "bevy_core", - "bevy_core_pipeline", - "bevy_derive", - "bevy_diagnostic", - "bevy_ecs", + "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_core_pipeline 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_diagnostic 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_gilrs", "bevy_gizmos", "bevy_gltf", - "bevy_hierarchy", - "bevy_input", - "bevy_log", - "bevy_math", - "bevy_pbr", - "bevy_ptr", - "bevy_reflect", - "bevy_render", + "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_input 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_log 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_pbr 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_picking", + "bevy_ptr 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_scene", "bevy_sprite", "bevy_state", - "bevy_tasks", + "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_text", - "bevy_time", - "bevy_transform", + "bevy_time 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_ui", - "bevy_utils", - "bevy_window", - "bevy_winit", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_window 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_winit 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", ] [[package]] name = "bevy_log" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab641fd0de254915ab746165a07677465b2d89b72f5b49367d73b9197548a35" +checksum = "52f2c0c374af59007396793a51f747f6b10d74ca4acfb080ce0ade267118827b" +dependencies = [ + "android_log-sys", + "bevy_app 0.14.1", + "bevy_ecs 0.14.1", + "bevy_utils 0.14.1", + "tracing-log", + "tracing-subscriber", + "tracing-wasm", +] + +[[package]] +name = "bevy_log" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "android_log-sys", + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "tracing-log", + "tracing-subscriber", + "tracing-wasm", +] + +[[package]] +name = "bevy_log" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" dependencies = [ "android_log-sys", - "bevy_app", - "bevy_ecs", - "bevy_utils", + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "tracing-log", "tracing-subscriber", "tracing-wasm", @@ -1042,43 +1573,103 @@ dependencies = [ [[package]] name = "bevy_macro_utils" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ad860d35d74b35d4d6ae7f656d163b6f475aa2e64fc293ee86ac901977ddb7" +checksum = "7ec4a585ec2a6dedd4f4143c07219d120ae142121929f0d83e68d82a452cdc9b" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", - "toml_edit 0.22.14", + "quote 1.0.37", + "syn 2.0.77", + "toml_edit 0.22.20", +] + +[[package]] +name = "bevy_macro_utils" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.77", + "toml_edit 0.22.20", +] + +[[package]] +name = "bevy_macro_utils" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.77", + "toml_edit 0.22.20", ] [[package]] name = "bevy_math" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51bd6ce2174d3237d30e0ab5b2508480cc7593ca4d96ffb3a3095f9fc6bbc34c" +checksum = "40253578fe83a5ffe5f4fcb4dfa196b7d9c50f36dc8efaa231a53344bf4b3e57" dependencies = [ - "bevy_reflect", - "glam", + "bevy_reflect 0.14.1", + "glam 0.27.0", "rand 0.8.5", + "serde", + "smallvec 1.13.2", + "thiserror", +] + +[[package]] +name = "bevy_math" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "glam 0.28.0", + "itertools 0.13.0", + "rand 0.8.5", + "rand_distr", + "serde", + "smallvec 1.13.2", + "thiserror", +] + +[[package]] +name = "bevy_math" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "glam 0.28.0", + "itertools 0.13.0", + "rand 0.8.5", + "rand_distr", + "serde", "smallvec 1.13.2", "thiserror", ] [[package]] name = "bevy_mikktspace" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7ce4266293629a2d10459cc112dffe3b3e9229a4f2b8a4d20061b8dd53316d0" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "glam 0.28.0", +] + +[[package]] +name = "bevy_mikktspace" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" dependencies = [ - "glam", + "glam 0.28.0", ] [[package]] name = "bevy_nannou" version = "0.1.0" dependencies = [ - "bevy", + "bevy 0.15.0-dev", "bevy_nannou_draw", "bevy_nannou_isf", "bevy_nannou_video", @@ -1088,23 +1679,23 @@ dependencies = [ name = "bevy_nannou_draw" version = "0.1.0" dependencies = [ - "bevy", + "bevy 0.15.0-dev", "bytemuck", "lyon", "nannou_core", "num-traits", "rayon", "rusttype", - "uuid 1.9.1", + "uuid 1.10.0", ] [[package]] name = "bevy_nannou_isf" version = "0.1.0" dependencies = [ - "bevy", + "bevy 0.15.0-dev", "bevy-inspector-egui", - "bevy_egui", + "bevy_egui 0.29.0 (git+https://github.com/tychedelia/bevy_egui?branch=main)", "bytemuck", "isf", "meval", @@ -1115,7 +1706,7 @@ dependencies = [ name = "bevy_nannou_video" version = "0.1.0" dependencies = [ - "bevy", + "bevy 0.15.0-dev", "rayon", "serde", "thiserror", @@ -1124,22 +1715,47 @@ dependencies = [ [[package]] name = "bevy_pbr" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3effe8ff28899f14d250d0649ca9868dbe68b389d0f2b7af086759b8e16c6e3d" -dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_color", - "bevy_core_pipeline", - "bevy_derive", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_render", - "bevy_transform", - "bevy_utils", - "bevy_window", +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_core_pipeline 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_window 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bitflags 2.6.0", + "bytemuck", + "fixedbitset 0.5.7", + "nonmax", + "radsort", + "smallvec 1.13.2", + "static_assertions", +] + +[[package]] +name = "bevy_pbr" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_core_pipeline 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_window 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bitflags 2.6.0", "bytemuck", "fixedbitset 0.5.7", @@ -1149,70 +1765,161 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "bevy_picking" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_input 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_time 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_window 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "uuid 1.10.0", +] + [[package]] name = "bevy_ptr" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c115c97a5c8a263bd0aa7001b999772c744ac5ba797d07c86f25734ce381ea69" +checksum = "7ed72afbb6249a6803a3ed7bd2f68ff080d9392f550475e050b34c1e1c1e3e8f" + +[[package]] +name = "bevy_ptr" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" + +[[package]] +name = "bevy_ptr" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" [[package]] name = "bevy_reflect" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406ea0fce267169c2320c7302d97d09f605105686346762562c5f65960b5ca2f" +checksum = "fb37e8fc3c61d04da480c95cc8c303aa7781afed6be01dae333b336af493c38e" dependencies = [ - "bevy_ptr", - "bevy_reflect_derive", - "bevy_utils", + "bevy_ptr 0.14.1", + "bevy_reflect_derive 0.14.1", + "bevy_utils 0.14.1", "downcast-rs", "erased-serde", - "glam", + "glam 0.27.0", + "serde", + "smallvec 1.13.2", + "smol_str", + "thiserror", + "uuid 1.10.0", +] + +[[package]] +name = "bevy_reflect" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_ptr 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_reflect_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "downcast-rs", + "erased-serde", + "glam 0.28.0", "petgraph 0.6.5", "serde", "smallvec 1.13.2", "smol_str", "thiserror", - "uuid 1.9.1", + "uuid 1.10.0", +] + +[[package]] +name = "bevy_reflect" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_ptr 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_reflect_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "downcast-rs", + "erased-serde", + "glam 0.28.0", + "serde", + "smallvec 1.13.2", + "smol_str", + "thiserror", + "uuid 1.10.0", ] [[package]] name = "bevy_reflect_derive" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0427fdb4425fc72cc96d45e550df83ace6347f0503840de116c76a40843ba751" +checksum = "8fc00d5086f5bf534b4c2dbeba549a6b8d3223515f3cb5ba4fdaabe953ec6cea" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.14.1", "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", - "uuid 1.9.1", + "quote 1.0.37", + "syn 2.0.77", + "uuid 1.10.0", +] + +[[package]] +name = "bevy_reflect_derive" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.77", + "uuid 1.10.0", +] + +[[package]] +name = "bevy_reflect_derive" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.77", + "uuid 1.10.0", ] [[package]] name = "bevy_render" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c48acf1ff4267c231def4cbf573248d42ac60c9952108822d505019460bf36d" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" dependencies = [ "async-channel", - "bevy_app", - "bevy_asset", - "bevy_color", - "bevy_core", - "bevy_derive", - "bevy_diagnostic", - "bevy_ecs", - "bevy_encase_derive", - "bevy_hierarchy", - "bevy_math", - "bevy_mikktspace", - "bevy_reflect", - "bevy_render_macros", - "bevy_tasks", - "bevy_time", - "bevy_transform", - "bevy_utils", - "bevy_window", + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_diagnostic 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_encase_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_mikktspace 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_render_macros 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_time 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_window 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_winit 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bitflags 2.6.0", "bytemuck", "codespan-reporting", @@ -1220,12 +1927,13 @@ dependencies = [ "encase", "futures-lite", "hexasphere", - "image 0.25.1", + "image 0.25.2", "js-sys", "ktx2", - "naga 0.20.0", + "naga 22.1.0", "naga_oil", "nonmax", + "offset-allocator", "ruzstd", "send_wrapper", "serde", @@ -1236,59 +1944,117 @@ dependencies = [ "wgpu", ] +[[package]] +name = "bevy_render" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "async-channel", + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_diagnostic 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_encase_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_mikktspace 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_render_macros 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_time 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_window 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_winit 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bitflags 2.6.0", + "bytemuck", + "codespan-reporting", + "downcast-rs", + "encase", + "futures-lite", + "hexasphere", + "image 0.25.2", + "js-sys", + "naga 22.1.0", + "naga_oil", + "nonmax", + "offset-allocator", + "send_wrapper", + "serde", + "smallvec 1.13.2", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu", +] + [[package]] name = "bevy_render_macros" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ddf4a96d71519c8eca3d74dabcb89a9c0d50ab5d9230638cb004145f46e9ed" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.77", +] + +[[package]] +name = "bevy_render_macros" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] name = "bevy_scene" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7a9f0388612a116f02ab6187aeab66e52c9e91abbc21f919b8b50230c4d83e7" -dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_derive", - "bevy_ecs", - "bevy_hierarchy", - "bevy_reflect", - "bevy_render", - "bevy_transform", - "bevy_utils", +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "serde", "thiserror", - "uuid 1.9.1", + "uuid 1.10.0", ] [[package]] name = "bevy_sprite" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d837e33ed27b9f2e5212eca4bdd5655a9ee64c52914112e6189c043cb25dd1ec" -dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_color", - "bevy_core_pipeline", - "bevy_derive", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_render", - "bevy_transform", - "bevy_utils", +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_core_pipeline 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_picking", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_window 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bitflags 2.6.0", "bytemuck", "fixedbitset 0.5.7", "guillotiere", + "nonmax", "radsort", "rectangle-pack", "thiserror", @@ -1296,117 +2062,192 @@ dependencies = [ [[package]] name = "bevy_state" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0959984092d56885fd3b320ea84fb816821bad6bfa3040b9d4ee850d3273233d" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_hierarchy", - "bevy_reflect", + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_state_macros", - "bevy_utils", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", ] [[package]] name = "bevy_state_macros" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "887a98bfa268258377cd073f5bb839518d3a1cd6b96ed81418145485b69378e6" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] name = "bevy_tasks" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a8bfb8d484bdb1e9bec3789c75202adc5e608c4244347152e50fb31668a54f9" +checksum = "84f5414c3f49c96e02ceccf5fa12fb6cfbf8b271d2a820902d6f622e9c2fa681" +dependencies = [ + "async-executor", + "futures-lite", + "wasm-bindgen-futures", +] + +[[package]] +name = "bevy_tasks" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" dependencies = [ "async-channel", "async-executor", "concurrent-queue", + "futures-channel", "futures-lite", + "pin-project", "wasm-bindgen-futures", ] [[package]] -name = "bevy_text" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "454fd29b7828244356b2e0ce782e6d0a6f26b47f521456accde3a7191b121727" +name = "bevy_tasks" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" dependencies = [ - "ab_glyph", - "bevy_app", - "bevy_asset", - "bevy_color", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_render", + "async-executor", + "futures-channel", + "futures-lite", + "pin-project", + "wasm-bindgen-futures", +] + +[[package]] +name = "bevy_text" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_sprite", - "bevy_transform", - "bevy_utils", - "bevy_window", - "glyph_brush_layout", + "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_window 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "cosmic-text", "serde", + "sys-locale", "thiserror", + "unicode-bidi", ] [[package]] name = "bevy_time" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6c3d3d14ee8b0dbe4819fd516cc75509b61946134d78e0ee89ad3d1835ffe6c" +checksum = "b3fb18cfac62098e07786e422e84b4f45f469f27ccb5b572b409500bef465f33" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_reflect", - "bevy_utils", + "bevy_app 0.14.1", + "bevy_ecs 0.14.1", + "bevy_reflect 0.14.1", + "bevy_utils 0.14.1", + "crossbeam-channel", + "thiserror", +] + +[[package]] +name = "bevy_time" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "crossbeam-channel", + "thiserror", +] + +[[package]] +name = "bevy_time" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "crossbeam-channel", "thiserror", ] [[package]] name = "bevy_transform" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97e8aa6b16be573277c6ceda30aebf1d78af7c6ede19b448dcb052fb8601d815" +checksum = "4ff09cea0dd0d4e6a3ed5f7dcbd4fbbcec07e518ceb64a4c8a75dedbe294ab60" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_hierarchy", - "bevy_math", - "bevy_reflect", + "bevy_app 0.14.1", + "bevy_ecs 0.14.1", + "bevy_hierarchy 0.14.1", + "bevy_math 0.14.1", + "bevy_reflect 0.14.1", + "thiserror", +] + +[[package]] +name = "bevy_transform" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "thiserror", +] + +[[package]] +name = "bevy_transform" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "thiserror", ] [[package]] name = "bevy_ui" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d9f864c646f3742ff77f67bcd89a13a7ab024b68ca2f1bfbab8245bcb1c06c" -dependencies = [ - "bevy_a11y", - "bevy_app", - "bevy_asset", - "bevy_color", - "bevy_core_pipeline", - "bevy_derive", - "bevy_ecs", - "bevy_hierarchy", - "bevy_input", - "bevy_math", - "bevy_reflect", - "bevy_render", +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_a11y 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_core_pipeline 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_input 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_picking", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_sprite", "bevy_text", - "bevy_transform", - "bevy_utils", - "bevy_window", + "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_window 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bytemuck", "nonmax", "smallvec 1.13.2", @@ -1416,12 +2257,40 @@ dependencies = [ [[package]] name = "bevy_utils" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fab364910e8f5839578aba9cfda00a8388e9ebe352ceb8491a742ce6af9ec6e" +checksum = "f6efbe5a621b56cc4ffa41074929eca84107e242302496b9bb7550675e6bf2e7" +dependencies = [ + "ahash", + "bevy_utils_proc_macros 0.14.1", + "getrandom 0.2.15", + "hashbrown 0.14.5", + "thread_local", + "tracing", + "web-time", +] + +[[package]] +name = "bevy_utils" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "ahash", + "bevy_utils_proc_macros 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "getrandom 0.2.15", + "hashbrown 0.14.5", + "thread_local", + "tracing", + "web-time", +] + +[[package]] +name = "bevy_utils" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" dependencies = [ "ahash", - "bevy_utils_proc_macros", + "bevy_utils_proc_macros 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "getrandom 0.2.15", "hashbrown 0.14.5", "thread_local", @@ -1431,51 +2300,155 @@ dependencies = [ [[package]] name = "bevy_utils_proc_macros" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9db261ab33a046e1f54b35f885a44f21fcc80aa2bc9050319466b88fe58fe3" +checksum = "36a1e91b4294cad2d08620ac062509395d4f65247b636946d6497eaeccf4dbfd" +dependencies = [ + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.77", +] + +[[package]] +name = "bevy_utils_proc_macros" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.77", +] + +[[package]] +name = "bevy_utils_proc_macros" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] name = "bevy_window" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9ea5777f933bf7ecaeb3af1a30845720ec730e007972ca7d4aba2d3512abe24" +checksum = "8ba11880f05a3b267ecfa4149fe789b0c046c35fd8418dd8899fad3a4359c986" dependencies = [ - "bevy_a11y", - "bevy_app", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_utils", + "bevy_a11y 0.14.1", + "bevy_app 0.14.1", + "bevy_ecs 0.14.1", + "bevy_math 0.14.1", + "bevy_reflect 0.14.1", + "bevy_utils 0.14.1", + "raw-window-handle", + "smol_str", +] + +[[package]] +name = "bevy_window" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_a11y 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "raw-window-handle", + "smol_str", +] + +[[package]] +name = "bevy_window" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "bevy_a11y 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "raw-window-handle", "smol_str", ] [[package]] name = "bevy_winit" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8c2213bbf14debe819ec8ad4913f233c596002d087bc6f1f20d533e2ebaf8c6" +checksum = "d5aeb4b2e3b1ece189fcf37ea2de625ceab93e6ac2a14d4b15b0393351e4c18b" +dependencies = [ + "accesskit_winit 0.20.4", + "approx 0.5.1", + "bevy_a11y 0.14.1", + "bevy_app 0.14.1", + "bevy_derive 0.14.1", + "bevy_ecs 0.14.1", + "bevy_hierarchy 0.14.1", + "bevy_input 0.14.1", + "bevy_log 0.14.1", + "bevy_math 0.14.1", + "bevy_reflect 0.14.1", + "bevy_tasks 0.14.1", + "bevy_utils 0.14.1", + "bevy_window 0.14.1", + "cfg-if 1.0.0", + "crossbeam-channel", + "raw-window-handle", + "wasm-bindgen", + "web-sys", + "winit", +] + +[[package]] +name = "bevy_winit" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +dependencies = [ + "accesskit_winit 0.22.0", + "approx 0.5.1", + "bevy_a11y 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_input 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_log 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_window 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "cfg-if 1.0.0", + "crossbeam-channel", + "raw-window-handle", + "wasm-bindgen", + "web-sys", + "winit", +] + +[[package]] +name = "bevy_winit" +version = "0.15.0-dev" +source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" dependencies = [ - "accesskit_winit", + "accesskit_winit 0.22.0", "approx 0.5.1", - "bevy_a11y", - "bevy_app", - "bevy_derive", - "bevy_ecs", - "bevy_hierarchy", - "bevy_input", - "bevy_log", - "bevy_math", - "bevy_reflect", - "bevy_tasks", - "bevy_utils", - "bevy_window", + "bevy_a11y 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_input 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_log 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_window 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "cfg-if 1.0.0", "crossbeam-channel", "raw-window-handle", @@ -1493,17 +2466,17 @@ dependencies = [ "bitflags 2.6.0", "cexpr", "clang-sys", - "itertools", + "itertools 0.12.1", "lazy_static", "lazycell", "log", "prettyplease", "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "regex", "rustc-hash", "shlex", - "syn 2.0.69", + "syn 2.0.77", "which", ] @@ -1513,7 +2486,16 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" dependencies = [ - "bit-vec", + "bit-vec 0.6.3", +] + +[[package]] +name = "bit-set" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" +dependencies = [ + "bit-vec 0.7.0", ] [[package]] @@ -1522,6 +2504,12 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +[[package]] +name = "bit-vec" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" + [[package]] name = "bit_field" version = "0.10.2" @@ -1563,18 +2551,18 @@ dependencies = [ [[package]] name = "bitstream-io" -version = "2.4.2" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "415f8399438eb5e4b2f73ed3152a3448b98149dda642a957ee704e1daa5cf1d8" +checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452" [[package]] name = "blake3" -version = "1.5.1" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" +checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" dependencies = [ "arrayref", - "arrayvec 0.7.4", + "arrayvec 0.7.6", "cc", "cfg-if 1.0.0", "constant_time_eq", @@ -1619,9 +2607,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", "serde", @@ -1629,9 +2617,9 @@ dependencies = [ [[package]] name = "built" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6a6c0b39c38fd754ac338b00a88066436389c0f029da5d37d1e01091d9b7c17" +checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4" [[package]] name = "bumpalo" @@ -1647,22 +2635,22 @@ checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" [[package]] name = "bytemuck" -version = "1.16.1" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" +checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" +checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -1690,9 +2678,9 @@ dependencies = [ [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "bytesize" @@ -1738,9 +2726,9 @@ dependencies = [ [[package]] name = "calloop" -version = "0.12.4" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" +checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" dependencies = [ "bitflags 2.6.0", "log", @@ -1752,9 +2740,9 @@ dependencies = [ [[package]] name = "calloop-wayland-source" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ "calloop", "rustix", @@ -1764,9 +2752,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.7" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" dependencies = [ "serde", ] @@ -1857,13 +2845,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.104" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" dependencies = [ "jobserver", "libc", - "once_cell", + "shlex", ] [[package]] @@ -1937,7 +2925,7 @@ checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", - "libloading 0.8.4", + "libloading", ] [[package]] @@ -1963,9 +2951,9 @@ checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688" [[package]] name = "clipboard-win" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" dependencies = [ "error-code", ] @@ -2022,7 +3010,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] @@ -2045,7 +3033,7 @@ version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ - "bytes 1.6.0", + "bytes 1.7.1", "memchr", ] @@ -2104,9 +3092,9 @@ checksum = "32b13ea120a812beba79e34316b3942a857c86ec1593cb34f27bb28272ce2cca" [[package]] name = "const_panic" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b" +checksum = "7782af8f90fe69a4bb41e460abe1727d493403d8b2cc43201a3a3e906b24379f" [[package]] name = "const_soft_float" @@ -2116,9 +3104,9 @@ checksum = "87ca1caa64ef4ed453e68bb3db612e51cf1b2f5b871337f0fcab1c8f87cc3dff" [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "constgebra" @@ -2182,7 +3170,7 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ - "core-foundation-sys 0.8.6", + "core-foundation-sys 0.8.7", "libc", ] @@ -2194,9 +3182,9 @@ checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics" @@ -2239,7 +3227,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" dependencies = [ "bitflags 1.3.2", - "core-foundation-sys 0.8.6", + "core-foundation-sys 0.8.7", "coreaudio-sys", ] @@ -2252,6 +3240,29 @@ dependencies = [ "bindgen", ] +[[package]] +name = "cosmic-text" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59fd57d82eb4bfe7ffa9b1cec0c05e2fd378155b47f255a67983cb4afe0e80c2" +dependencies = [ + "bitflags 2.6.0", + "fontdb", + "log", + "rangemap", + "rayon", + "rustc-hash", + "rustybuzz", + "self_cell", + "swash", + "sys-locale", + "ttf-parser 0.21.1", + "unicode-bidi", + "unicode-linebreak", + "unicode-script", + "unicode-segmentation", +] + [[package]] name = "cpal" version = "0.13.5" @@ -2260,7 +3271,7 @@ checksum = "74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116" dependencies = [ "alsa 0.6.0", "asio-sys", - "core-foundation-sys 0.8.6", + "core-foundation-sys 0.8.7", "coreaudio-rs 0.10.0", "jni 0.19.0", "js-sys", @@ -2285,8 +3296,8 @@ version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779" dependencies = [ - "alsa 0.9.0", - "core-foundation-sys 0.8.6", + "alsa 0.9.1", + "core-foundation-sys 0.8.7", "coreaudio-rs 0.11.3", "dasp_sample", "jni 0.21.1", @@ -2426,6 +3437,16 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "ctrlc" +version = "3.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" +dependencies = [ + "nix 0.29.0", + "windows-sys 0.59.0", +] + [[package]] name = "curl" version = "0.4.46" @@ -2443,9 +3464,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.73+curl-8.8.0" +version = "0.4.74+curl-8.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "450ab250ecf17227c39afb9a2dd9261dc0035cb80f2612472fc0c4aac2dcb84d" +checksum = "8af10b986114528fcdc4b63b6f5f021b7057618411046a4de2ba0f0149a097bf" dependencies = [ "cc", "libc", @@ -2465,12 +3486,12 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" [[package]] name = "d3d12" -version = "0.20.0" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b28bfe653d79bd16c77f659305b195b82bb5ce0c0eb2a4846b82ddbd77586813" +checksum = "bdbd1f579714e3c809ebd822c81ef148b1ceaeb3d535352afc73fd0c4c6a0017" dependencies = [ "bitflags 2.6.0", - "libloading 0.8.4", + "libloading", "winapi 0.3.9", ] @@ -2493,7 +3514,7 @@ dependencies = [ "fnv", "ident_case", "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "strsim 0.10.0", "syn 1.0.109", ] @@ -2505,7 +3526,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] @@ -2552,14 +3573,14 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.4", + "libloading", ] [[package]] name = "document-features" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" dependencies = [ "litrs", ] @@ -2582,6 +3603,12 @@ version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" +[[package]] +name = "ecolor" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20930a432bbd57a6d55e07976089708d4893f3d556cf42a0d79e9e321fa73b10" + [[package]] name = "ecolor" version = "0.28.1" @@ -2589,7 +3616,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e6b451ff1143f6de0f33fc7f1b68fecfd2c7de06e104de96c4514de3f5396f8" dependencies = [ "bytemuck", - "emath", + "emath 0.28.1", +] + +[[package]] +name = "egui" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "584c5d1bf9a67b25778a3323af222dbe1a1feb532190e103901187f92c7fe29a" +dependencies = [ + "ahash", + "epaint 0.27.2", + "nohash-hasher", ] [[package]] @@ -2599,17 +3637,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20c97e70a2768de630f161bb5392cbd3874fcf72868f14df0e002e82e06cb798" dependencies = [ "ahash", - "emath", - "epaint", + "emath 0.28.1", + "epaint 0.28.1", "nohash-hasher", ] +[[package]] +name = "egui-dropdown" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240e9423d44c6fd18a72208b442b1101ac871f9636c06d30cc6555d125f57db0" +dependencies = [ + "egui 0.27.2", +] + [[package]] name = "either" version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +[[package]] +name = "emath" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4c3a552cfca14630702449d35f41c84a0d15963273771c6059175a803620f3f" + [[package]] name = "emath" version = "0.28.1" @@ -2621,23 +3674,23 @@ dependencies = [ [[package]] name = "encase" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9299a95fa5671ddf29ecc22b00e121843a65cb9ff24911e394b4ae556baf36" +checksum = "0265fa0e7bcdb058128cdf7597cdacea42e33911713663a04d971a39cad16afa" dependencies = [ "const_panic", "encase_derive", - "glam", + "glam 0.28.0", "thiserror", ] [[package]] name = "encase_derive" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e09decb3beb1fe2db6940f598957b2e1f7df6206a804d438ff6cb2a9cddc10" +checksum = "e3b6f7502bafc52a60b5582560a2aaee16921eef79a742ae48dd411fe7a9263b" dependencies = [ - "encase_derive_impl", + "encase_derive_impl 0.9.0", ] [[package]] @@ -2647,8 +3700,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd31dbbd9743684d339f907a87fe212cb7b51d75b9e8e74181fe363199ee9b47" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", +] + +[[package]] +name = "encase_derive_impl" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b36f2ddfca91251bed7f931f24b192e4eaf0a0e0fa70cf81cfb1416a1973620e" +dependencies = [ + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -2673,6 +3737,20 @@ dependencies = [ "termcolor", ] +[[package]] +name = "epaint" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b381f8b149657a4acf837095351839f32cd5c4aec1817fc4df84e18d76334176" +dependencies = [ + "ab_glyph", + "ahash", + "ecolor 0.27.2", + "emath 0.27.2", + "nohash-hasher", + "parking_lot 0.12.3", +] + [[package]] name = "epaint" version = "0.28.1" @@ -2682,8 +3760,8 @@ dependencies = [ "ab_glyph", "ahash", "bytemuck", - "ecolor", - "emath", + "ecolor 0.28.1", + "emath 0.28.1", "nohash-hasher", "parking_lot 0.12.3", ] @@ -2751,9 +3829,9 @@ dependencies = [ [[package]] name = "euclid" -version = "0.22.10" +version = "0.22.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20" +checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48" dependencies = [ "num-traits", ] @@ -2812,7 +3890,7 @@ dependencies = [ "pitch_calc", "ringbuf", "time_calc", - "tokio 1.38.0", + "tokio 1.40.0", "walkdir", ] @@ -2849,16 +3927,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", "synstructure", ] [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" @@ -2871,9 +3949,9 @@ dependencies = [ [[package]] name = "ffmpeg-next" -version = "7.0.2" +version = "7.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfce5242643c8a57b5a44b7e933ccbde85f9508d1379e578e97eee4a9d4334b" +checksum = "19a340e3d664ad5f530147cd6d4a86ece739a829fe2d81c369389ef903bd96f6" dependencies = [ "bitflags 2.6.0", "ffmpeg-sys-next", @@ -2882,9 +3960,9 @@ dependencies = [ [[package]] name = "ffmpeg-sys-next" -version = "7.0.0" +version = "7.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "972a460dd8e901b737ce0482bf71a837e1751e3dd7c8f8b0a4ead808e7f174a5" +checksum = "db1b7546e70609ead8c06b2b4c618a1ba352364675f81608f431dd4f321fe3f1" dependencies = [ "bindgen", "cc", @@ -2905,14 +3983,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox 0.1.3", + "windows-sys 0.59.0", ] [[package]] @@ -2941,13 +4019,13 @@ checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", "libz-sys", - "miniz_oxide 0.7.4", + "miniz_oxide 0.8.0", ] [[package]] @@ -2980,6 +4058,38 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "font-types" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f0189ccb084f77c5523e08288d418cbaa09c451a08515678a0aa265df9a8b60" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "fontconfig-parser" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" +dependencies = [ + "roxmltree 0.20.0", +] + +[[package]] +name = "fontdb" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2", + "slotmap", + "tinyvec", + "ttf-parser 0.20.0", +] + [[package]] name = "foreign-types" version = "0.3.2" @@ -3006,8 +4116,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -3156,8 +4266,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -3274,22 +4384,22 @@ dependencies = [ [[package]] name = "gilrs" -version = "0.10.8" +version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f226b8f4d9bc7da93de8efd8747c6b1086409ca3f4b6d51e9a7f5461a9183fe" +checksum = "dfb8c78963a8856a5b10015c9349176ff5edbc8095384d52aada467a848bc03a" dependencies = [ "fnv", "gilrs-core", "log", - "uuid 1.9.1", + "uuid 1.10.0", "vec_map", ] [[package]] name = "gilrs-core" -version = "0.5.12" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b922f294d9f062af517ea0bd0a036ddcf11c2842211c2f9c71a3ceee859e10b6" +checksum = "732dadc05170599ddec9a89653f10d7a2af54da9181b3fa6e2bd49907ec8f7e4" dependencies = [ "core-foundation 0.9.4", "inotify 0.10.2", @@ -3299,11 +4409,11 @@ dependencies = [ "libudev-sys", "log", "nix 0.29.0", - "uuid 1.9.1", + "uuid 1.10.0", "vec_map", "wasm-bindgen", "web-sys", - "windows 0.57.0", + "windows 0.58.0", ] [[package]] @@ -3362,6 +4472,17 @@ dependencies = [ "serde", ] +[[package]] +name = "glam" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94" +dependencies = [ + "bytemuck", + "rand 0.8.5", + "serde", +] + [[package]] name = "glob" version = "0.3.1" @@ -3413,8 +4534,8 @@ checksum = "14070e711538afba5d6c807edb74bcb84e5dbb9211a3bf5dea0dfab5b24f4c51" dependencies = [ "inflections", "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -3431,24 +4552,13 @@ dependencies = [ [[package]] name = "glutin_wgl_sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" dependencies = [ "gl_generator", ] -[[package]] -name = "glyph_brush_layout" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1e288bfd2f6c0313f78bf5aa538356ad481a3bb97e9b7f93220ab0066c5992" -dependencies = [ - "ab_glyph", - "approx 0.5.1", - "xi-unicode", -] - [[package]] name = "gpu-alloc" version = "0.6.0" @@ -3470,9 +4580,9 @@ dependencies = [ [[package]] name = "gpu-allocator" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" +checksum = "fdd4240fc91d3433d5e5b0fc5b67672d771850dc19bbee03c1381e19322803d7" dependencies = [ "log", "presser", @@ -3513,7 +4623,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" dependencies = [ - "euclid 0.22.10", + "euclid 0.22.11", "svg_fmt", ] @@ -3571,7 +4681,7 @@ dependencies = [ "bitflags 2.6.0", "com", "libc", - "libloading 0.8.4", + "libloading", "thiserror", "widestring", "winapi 0.3.9", @@ -3618,12 +4728,12 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hexasphere" -version = "12.0.0" +version = "14.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd6b038160f086b0a7496edae34169ae22f328793cbe2b627a5a3d8373748ec" +checksum = "344d5bf5d6b6da1020fcfd4014d44e0cc695356c603db9c774b30bd6d385ad2b" dependencies = [ "constgebra", - "glam", + "glam 0.28.0", ] [[package]] @@ -3758,7 +4868,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", - "core-foundation-sys 0.8.6", + "core-foundation-sys 0.8.7", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", @@ -3886,12 +4996,12 @@ dependencies = [ [[package]] name = "image" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" dependencies = [ "bytemuck", - "byteorder", + "byteorder-lite", "color_quant", "exr", "gif 0.13.1", @@ -3909,12 +5019,12 @@ dependencies = [ [[package]] name = "image-webp" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d" +checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" dependencies = [ "byteorder-lite", - "thiserror", + "quick-error 2.0.1", ] [[package]] @@ -3929,7 +5039,7 @@ version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4419f022e55cc63d5bbd6b44b71e1d226b9c9480a47824c706e9d54e5c40c5eb" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", ] [[package]] @@ -3944,9 +5054,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -4006,8 +5116,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -4016,7 +5126,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "617ee6cf8e3f66f3b4ea67a4058564628cde41901316e19f559e14c7c72c5e7b" dependencies = [ - "core-foundation-sys 0.8.6", + "core-foundation-sys 0.8.7", "mach2", ] @@ -4049,6 +5159,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "0.4.8" @@ -4099,9 +5218,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -4123,9 +5242,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -4147,7 +5266,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.4", + "libloading", "pkg-config", ] @@ -4237,9 +5356,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libflate" @@ -4280,19 +5399,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if 1.0.0", - "winapi 0.3.9", -] - -[[package]] -name = "libloading" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if 1.0.0", "windows-targets 0.52.6", @@ -4325,6 +5434,17 @@ dependencies = [ "redox_syscall 0.4.1", ] +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", + "redox_syscall 0.5.3", +] + [[package]] name = "libssh2-sys" version = "0.2.23" @@ -4351,9 +5471,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.18" +version = "1.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" +checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" dependencies = [ "cc", "libc", @@ -4450,8 +5570,8 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9" dependencies = [ - "arrayvec 0.7.4", - "euclid 0.22.10", + "arrayvec 0.7.6", + "euclid 0.22.11", "num-traits", ] @@ -4525,7 +5645,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" dependencies = [ "cfg-if 1.0.0", - "rayon", ] [[package]] @@ -4569,9 +5688,9 @@ dependencies = [ [[package]] name = "metal" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5637e166ea14be6063a3f8ba5ccb9a4159df7d8f6d61c02fc3d480b1f90dcfcb" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" dependencies = [ "bitflags 2.6.0", "block", @@ -4643,6 +5762,15 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "mio" version = "0.6.23" @@ -4666,12 +5794,24 @@ dependencies = [ name = "mio" version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", +] + +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ + "hermit-abi 0.3.9", "libc", - "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -4723,9 +5863,9 @@ version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae585df4b6514cf8842ac0f1ab4992edc975892704835b549cf818dc0191249e" dependencies = [ - "bit-set", + "bit-set 0.5.3", "bitflags 2.6.0", - "indexmap 2.2.6", + "indexmap 2.5.0", "log", "num-traits", "pp-rs", @@ -4736,39 +5876,45 @@ dependencies = [ [[package]] name = "naga" -version = "0.20.0" +version = "22.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e536ae46fcab0876853bd4a632ede5df4b1c2527a58f6c5a4150fe86be858231" +checksum = "8bd5a652b6faf21496f2cfd88fc49989c8db0825d1f6746b1a71a6ede24a63ad" dependencies = [ - "arrayvec 0.7.4", - "bit-set", + "arrayvec 0.7.6", + "bit-set 0.6.0", "bitflags 2.6.0", + "cfg_aliases 0.1.1", "codespan-reporting", "hexf-parse", - "indexmap 2.2.6", + "indexmap 2.5.0", "log", +<<<<<<< HEAD "num-traits", "petgraph 0.6.5", +||||||| parent of a76e8ed (0.15-dev) + "num-traits", +======= +>>>>>>> a76e8ed (0.15-dev) "pp-rs", "rustc-hash", "serde", "spirv 0.3.0+sdk-1.3.268.0", "termcolor", "thiserror", - "unicode-xid 0.2.4", + "unicode-xid 0.2.5", ] [[package]] name = "naga_oil" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "275d9720a7338eedac966141089232514c84d76a246a58ef501af88c5edf402f" +checksum = "b4820e04fa302dda2ed32aa989bcf8014478be2233f331aea18f5eb7186fdae2" dependencies = [ - "bit-set", + "bit-set 0.5.3", "codespan-reporting", "data-encoding", - "indexmap 2.2.6", - "naga 0.20.0", + "indexmap 2.5.0", + "naga 22.1.0", "once_cell", "regex", "regex-syntax 0.8.4", @@ -4791,15 +5937,15 @@ dependencies = [ name = "nannou" version = "0.19.0" dependencies = [ - "bevy", + "bevy 0.15.0-dev", "bevy-inspector-egui", "bevy_common_assets", - "bevy_egui", + "bevy_egui 0.29.0 (git+https://github.com/tychedelia/bevy_egui?branch=main)", "bevy_nannou", "find_folder", "futures 0.3.30", "getrandom 0.2.15", - "image 0.25.1", + "image 0.25.2", "instant", "lyon", "nannou_core", @@ -4811,8 +5957,8 @@ dependencies = [ "rusttype", "serde", "serde_json", - "tokio 1.38.0", - "toml 0.8.14", + "tokio 1.40.0", + "toml 0.8.19", "walkdir", "web-sys", "wgpu", @@ -4831,7 +5977,7 @@ dependencies = [ name = "nannou_core" version = "0.19.0" dependencies = [ - "glam", + "glam 0.27.0", "num-traits", "rand 0.8.5", ] @@ -4931,7 +6077,7 @@ dependencies = [ "jni-sys", "log", "ndk-sys 0.5.0+25.2.9519653", - "num_enum 0.7.2", + "num_enum 0.7.3", "thiserror", ] @@ -4945,7 +6091,7 @@ dependencies = [ "jni-sys", "log", "ndk-sys 0.6.0+11769913", - "num_enum 0.7.2", + "num_enum 0.7.3", "raw-window-handle", "thiserror", ] @@ -4980,7 +6126,7 @@ dependencies = [ "darling", "proc-macro-crate 1.3.1", "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] @@ -5224,7 +6370,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] @@ -5235,8 +6381,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -5324,11 +6470,11 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ - "num_enum_derive 0.7.2", + "num_enum_derive 0.7.3", ] [[package]] @@ -5339,20 +6485,20 @@ checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] [[package]] name = "num_enum_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -5569,9 +6715,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.1" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -5622,6 +6768,16 @@ dependencies = [ "cc", ] +[[package]] +name = "offset-allocator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e234d535da3521eb95106f40f0b73483d80bfb3aacf27c40d7e2b72f1a3e00a2" +dependencies = [ + "log", + "nonmax", +] + [[package]] name = "ogg" version = "0.7.1" @@ -5657,9 +6813,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ "bitflags 2.6.0", "cfg-if 1.0.0", @@ -5677,8 +6833,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -5689,9 +6845,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -5705,7 +6861,7 @@ version = "0.3.47" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" dependencies = [ - "libredox", + "libredox 0.0.2", ] [[package]] @@ -5729,7 +6885,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" dependencies = [ - "ttf-parser", + "ttf-parser 0.24.1", ] [[package]] @@ -5807,7 +6963,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.5.2", + "redox_syscall 0.5.3", "smallvec 1.13.2", "windows-targets 0.52.6", ] @@ -5865,7 +7021,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset 0.4.2", - "indexmap 2.2.6", + "indexmap 2.5.0", "serde", "serde_derive", ] @@ -5904,8 +7060,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -5922,9 +7078,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", "fastrand", @@ -5981,9 +7137,9 @@ checksum = "b18befed8bc2b61abc79a457295e7e838417326da1586050b919414073977f19" [[package]] name = "polling" -version = "3.7.2" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if 1.0.0", "concurrent-queue", @@ -5991,7 +7147,7 @@ dependencies = [ "pin-project-lite", "rustix", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6000,14 +7156,17 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb458bb7f6e250e6eb79d5026badc10a3ebb8f9a15d1fff0f13d17c71f4d6dee" dependencies = [ - "unicode-xid 0.2.4", + "unicode-xid 0.2.5", ] [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy 0.7.35", +] [[package]] name = "presser" @@ -6023,12 +7182,12 @@ checksum = "f0f73cdaf19b52e6143685c3606206e114a4dfa969d6b14ec3894c88eb38bd4b" [[package]] name = "prettyplease" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2 1.0.86", - "syn 2.0.69", + "syn 2.0.77", ] [[package]] @@ -6043,11 +7202,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit 0.22.20", ] [[package]] @@ -6083,8 +7242,8 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -6149,18 +7308,18 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2 1.0.86", ] [[package]] name = "radsort" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17fd96390ed3feda12e1dfe2645ed587e0bea749e319333f104a33ff62f77a0b" +checksum = "019b4b213425016d7d84a153c4c73afb0946fbb4840e4eece7ba8848b9d6da22" [[package]] name = "rand" @@ -6291,6 +7450,16 @@ dependencies = [ "getrandom 0.2.15", ] +[[package]] +name = "rand_distr" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" +dependencies = [ + "num-traits", + "rand 0.8.5", +] + [[package]] name = "rand_hc" version = "0.1.0" @@ -6386,6 +7555,12 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" +[[package]] +name = "rangemap" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" + [[package]] name = "rav1e" version = "0.7.1" @@ -6394,13 +7569,13 @@ checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" dependencies = [ "arbitrary", "arg_enum_proc_macro", - "arrayvec 0.7.4", + "arrayvec 0.7.6", "av1-grain", "bitstream-io", "built", "cfg-if 1.0.0", "interpolate_name", - "itertools", + "itertools 0.12.1", "libc", "libfuzzer-sys", "log", @@ -6423,16 +7598,15 @@ dependencies = [ [[package]] name = "ravif" -version = "0.11.7" +version = "0.11.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67376f469e7e7840d0040bbf4b9b3334005bb167f814621326e4c7ab8cd6e944" +checksum = "a8f0bfd976333248de2078d350bfdf182ff96e168a24d23d2436cef320dd4bdd" dependencies = [ "avif-serialize", "imgref", "loop9", "quick-error 2.0.1", "rav1e", - "rayon", "rgb", ] @@ -6477,6 +7651,16 @@ dependencies = [ "rand_core 0.3.1", ] +[[package]] +name = "read-fonts" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c141b9980e1150201b2a3a32879001c8f975fe313ec3df5471a9b5c79a880cd" +dependencies = [ + "bytemuck", + "font-types", +] + [[package]] name = "realfft" version = "0.3.0" @@ -6518,18 +7702,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ "bitflags 2.6.0", ] [[package]] name = "regex" -version = "1.10.5" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -6633,9 +7817,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.40" +version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7439be6844e40133eda024efd85bf07f59d0dd2f59b10c00dd6cfb92cc5c741" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" dependencies = [ "bytemuck", ] @@ -6657,9 +7841,9 @@ checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" [[package]] name = "rodio" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1fceb9d127d515af1586d8d0cc601e1245bdb0af38e75c865a156290184f5b3" +checksum = "6006a627c1a38d37f3d3a85c6575418cfe34a5392d60a686d0071e1c8d427acb" dependencies = [ "cpal 0.15.3", "lewton 0.10.2", @@ -6697,6 +7881,12 @@ dependencies = [ "xmlparser", ] +[[package]] +name = "roxmltree" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" + [[package]] name = "rubato" version = "0.5.2" @@ -6777,9 +7967,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" dependencies = [ "bitflags 2.6.0", "errno", @@ -6810,11 +8000,28 @@ version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +[[package]] +name = "rustybuzz" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c" +dependencies = [ + "bitflags 2.6.0", + "bytemuck", + "libm", + "smallvec 1.13.2", + "ttf-parser 0.21.1", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-properties", + "unicode-script", +] + [[package]] name = "ruzstd" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5022b253619b1ba797f243056276bed8ed1a73b0f5a7ce7225d524067644bf8f" +checksum = "1c8b8f3d26bd9f945e5cbae77f7cdfbf37af9a66956f1115eb4516e45df519f4" dependencies = [ "byteorder", "twox-hash", @@ -6870,9 +8077,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sctk-adwaita" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7555fcb4f753d095d734fdefebb0ad8c98478a21db500492d87c55913d3b0086" +checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec" dependencies = [ "ab_glyph", "log", @@ -6883,27 +8090,33 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags 2.6.0", "core-foundation 0.9.4", - "core-foundation-sys 0.8.6", + "core-foundation-sys 0.8.7", "libc", "security-framework-sys", ] [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ - "core-foundation-sys 0.8.6", + "core-foundation-sys 0.8.7", "libc", ] +[[package]] +name = "self_cell" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" + [[package]] name = "semver" version = "0.9.0" @@ -6937,22 +8150,22 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.204" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -6966,20 +8179,21 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ "itoa 1.0.11", + "memchr", "ryu", "serde", ] [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -7046,7 +8260,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" dependencies = [ - "quote 1.0.36", + "quote 1.0.37", ] [[package]] @@ -7086,6 +8300,16 @@ dependencies = [ "walkdir", ] +[[package]] +name = "skrifa" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abea4738067b1e628c6ce28b2c216c19e9ea95715cdb332680e821c3bec2ef23" +dependencies = [ + "bytemuck", + "read-fonts", +] + [[package]] name = "slab" version = "0.4.9" @@ -7121,9 +8345,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay-client-toolkit" -version = "0.18.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" +checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" dependencies = [ "bitflags 2.6.0", "calloop", @@ -7191,6 +8415,12 @@ dependencies = [ "bitflags 2.6.0", ] +[[package]] +name = "stackfuture" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eae92052b72ef70dafa16eddbabffc77e5ca3574be2f7bc1127b36f0a7ad7f2" + [[package]] name = "static_assertions" version = "1.1.0" @@ -7267,7 +8497,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a9b53b3ed152fc6b871f7232a8772c640567fd25d056941450637ecba32924d" dependencies = [ "log", - "roxmltree", + "roxmltree 0.4.1", "simplecss", "slab", "svgtypes", @@ -7283,6 +8513,17 @@ dependencies = [ "phf", ] +[[package]] +name = "swash" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93cdc334a50fcc2aa3f04761af3b28196280a6aaadb1ef11215c478ae32615ac" +dependencies = [ + "skrifa", + "yazi", + "zeno", +] + [[package]] name = "syn" version = "0.15.44" @@ -7301,18 +8542,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.69" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201fcda3845c23e8212cd466bfebf0bd20694490fc0356ae8e428e0824a915a6" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "unicode-ident", ] @@ -7323,23 +8564,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", - "unicode-xid 0.2.4", + "unicode-xid 0.2.5", +] + +[[package]] +name = "sys-locale" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" +dependencies = [ + "libc", ] [[package]] name = "sysinfo" -version = "0.30.12" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae" +checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be" dependencies = [ - "cfg-if 1.0.0", - "core-foundation-sys 0.8.6", + "core-foundation-sys 0.8.7", "libc", + "memchr", "ntapi", - "once_cell", - "windows 0.52.0", + "windows 0.57.0", ] [[package]] @@ -7351,17 +8600,17 @@ dependencies = [ "cfg-expr", "heck", "pkg-config", - "toml 0.8.14", + "toml 0.8.19", "version-compare", ] [[package]] name = "taffy" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b61630cba2afd2c851821add2e1bb1b7851a2436e839ab73b56558b009035e" +checksum = "9cb893bff0f80ae17d3a57e030622a967b8dbc90e38284d9b4b1442e23873c94" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", "grid", "num-traits", "serde", @@ -7386,20 +8635,21 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if 1.0.0", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -7422,22 +8672,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -7501,7 +8751,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" dependencies = [ "arrayref", - "arrayvec 0.7.4", + "arrayvec 0.7.6", "bytemuck", "cfg-if 1.0.0", "log", @@ -7521,9 +8771,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6b6a2fb3a985e99cebfaefa9faa3024743da73304ca1c683a36429613d3d22" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -7555,21 +8805,20 @@ dependencies = [ [[package]] name = "tokio" -version = "1.38.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", - "bytes 1.6.0", + "bytes 1.7.1", "libc", - "mio 0.8.11", - "num_cpus", + "mio 1.0.2", "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -7616,13 +8865,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -7708,21 +8957,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.14" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.14", + "toml_edit 0.22.20", ] [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] @@ -7744,33 +8993,22 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.6", - "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 2.2.6", + "indexmap 2.5.0", "toml_datetime", "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.22.14" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.13", + "winnow 0.6.18", ] [[package]] @@ -7791,8 +9029,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -7872,9 +9110,21 @@ dependencies = [ [[package]] name = "ttf-parser" -version = "0.24.0" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" + +[[package]] +name = "ttf-parser" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" + +[[package]] +name = "ttf-parser" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8686b91785aff82828ed725225925b33b4fde44c4bb15876e5f7c832724c420a" +checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" [[package]] name = "twox-hash" @@ -7888,9 +9138,9 @@ dependencies = [ [[package]] name = "typeid" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf" +checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e" [[package]] name = "typenum" @@ -7913,12 +9163,30 @@ version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +[[package]] +name = "unicode-bidi-mirroring" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" + +[[package]] +name = "unicode-ccc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656" + [[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +[[package]] +name = "unicode-linebreak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" + [[package]] name = "unicode-normalization" version = "0.1.23" @@ -7928,6 +9196,18 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-properties" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524" + +[[package]] +name = "unicode-script" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" + [[package]] name = "unicode-segmentation" version = "1.11.0" @@ -7948,9 +9228,9 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" [[package]] name = "unreachable" @@ -8015,9 +9295,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom 0.2.15", "serde", @@ -8060,9 +9340,9 @@ checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "video-rs" @@ -8099,7 +9379,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e369bee1b05d510a7b4ed645f5faa90619e05437111783ea5848f28d97d3c2e" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", + "quote 1.0.37", ] [[package]] @@ -8143,34 +9423,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if 1.0.0", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -8180,38 +9461,38 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ - "quote 1.0.36", + "quote 1.0.37", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wayland-backend" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "269c04f203640d0da2092d1b8d89a2d081714ae3ac2f1b53e99f205740517198" +checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993" dependencies = [ "cc", "downcast-rs", @@ -8223,9 +9504,9 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.4" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08bd0f46c069d3382a36c8666c1b9ccef32b8b04f41667ca1fef06a1adcc2982" +checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943" dependencies = [ "bitflags 2.6.0", "rustix", @@ -8246,9 +9527,9 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.31.4" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09414bcf0fd8d9577d73e9ac4659ebc45bcc9cff1980a350543ad8e50ee263b2" +checksum = "6ef9489a8df197ebf3a8ce8a7a7f0a2320035c3743f3c1bd0bdbccf07ce64f95" dependencies = [ "rustix", "wayland-client", @@ -8257,9 +9538,9 @@ dependencies = [ [[package]] name = "wayland-protocols" -version = "0.31.2" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -8269,9 +9550,9 @@ dependencies = [ [[package]] name = "wayland-protocols-plasma" -version = "0.2.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +checksum = "f79f2d57c7fcc6ab4d602adba364bf59a5c24de57bd194486bf9b8360e06bfc4" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -8282,9 +9563,9 @@ dependencies = [ [[package]] name = "wayland-protocols-wlr" -version = "0.2.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -8295,20 +9576,20 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.3" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edf466fc49a4feb65a511ca403fec3601494d0dee85dbf37fff6fa0dd4eec3b6" +checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" dependencies = [ "proc-macro2 1.0.86", "quick-xml", - "quote 1.0.36", + "quote 1.0.37", ] [[package]] name = "wayland-sys" -version = "0.31.3" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a6754825230fa5b27bafaa28c30b3c9e72c55530581220cef401fa422c0fae7" +checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148" dependencies = [ "dlib", "log", @@ -8318,9 +9599,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -8362,17 +9643,16 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu" -version = "0.20.1" +version = "22.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e37c7b9921b75dfd26dd973fdcbce36f13dfa6e2dc82aece584e0ed48c355c" +checksum = "e1d1c4ba43f80542cf63a0a6ed3134629ae73e8ab51e4b765a67f3aa062eb433" dependencies = [ - "arrayvec 0.7.4", - "cfg-if 1.0.0", + "arrayvec 0.7.6", "cfg_aliases 0.1.1", "document-features", "js-sys", "log", - "naga 0.20.0", + "naga 22.1.0", "parking_lot 0.12.3", "profiling", "raw-window-handle", @@ -8389,20 +9669,19 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.21.1" +version = "22.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50819ab545b867d8a454d1d756b90cd5f15da1f2943334ca314af10583c9d39" +checksum = "0348c840d1051b8e86c3bcd31206080c5e71e5933dabd79be1ce732b0b2f089a" dependencies = [ - "arrayvec 0.7.4", - "bit-vec", + "arrayvec 0.7.6", + "bit-vec 0.7.0", "bitflags 2.6.0", "bytemuck", "cfg_aliases 0.1.1", - "codespan-reporting", "document-features", - "indexmap 2.2.6", + "indexmap 2.5.0", "log", - "naga 0.20.0", + "naga 22.1.0", "once_cell", "parking_lot 0.12.3", "profiling", @@ -8412,21 +9691,20 @@ dependencies = [ "serde", "smallvec 1.13.2", "thiserror", - "web-sys", "wgpu-hal", "wgpu-types", ] [[package]] name = "wgpu-hal" -version = "0.21.1" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "172e490a87295564f3fcc0f165798d87386f6231b04d4548bca458cbbfd63222" +checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f" dependencies = [ "android_system_properties", - "arrayvec 0.7.4", + "arrayvec 0.7.6", "ash", - "bit-set", + "bit-set 0.6.0", "bitflags 2.6.0", "block", "cfg_aliases 0.1.1", @@ -8441,10 +9719,10 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.4", + "libloading", "log", "metal", - "naga 0.20.0", + "naga 22.1.0", "ndk-sys 0.5.0+25.2.9519653", "objc", "once_cell", @@ -8464,9 +9742,9 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.20.0" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1353d9a46bff7f955a680577f34c69122628cc2076e1d6f3a9be6ef00ae793ef" +checksum = "bc9d91f0e2c4b51434dfa6db77846f2793149d8e73f800fa2e41f52b8eac3c5d" dependencies = [ "bitflags 2.6.0", "js-sys", @@ -8534,11 +9812,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -8579,6 +9857,16 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" +dependencies = [ + "windows-core 0.58.0", + "windows-targets 0.52.6", +] + [[package]] name = "windows-core" version = "0.52.0" @@ -8594,7 +9882,7 @@ version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" dependencies = [ - "windows-result", + "windows-result 0.1.2", "windows-targets 0.52.6", ] @@ -8606,7 +9894,20 @@ checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" dependencies = [ "windows-implement 0.57.0", "windows-interface 0.57.0", - "windows-result", + "windows-result 0.1.2", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +dependencies = [ + "windows-implement 0.58.0", + "windows-interface 0.58.0", + "windows-result 0.2.0", + "windows-strings", "windows-targets 0.52.6", ] @@ -8617,8 +9918,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -8628,8 +9929,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", +] + +[[package]] +name = "windows-implement" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +dependencies = [ + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -8639,8 +9951,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -8650,8 +9962,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", +] + +[[package]] +name = "windows-interface" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +dependencies = [ + "proc-macro2 1.0.86", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -8663,6 +9986,25 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result 0.2.0", + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.45.0" @@ -8690,6 +10032,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-targets" version = "0.42.2" @@ -8870,9 +10221,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" -version = "0.30.3" +version = "0.30.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f45a7b7e2de6af35448d7718dab6d95acec466eb3bb7a56f4d31d1af754004" +checksum = "0be9e76a1f1077e04a411f0b989cbd3c93339e1771cb41e71ac4aee95bfd2c67" dependencies = [ "ahash", "android-activity", @@ -8931,9 +10282,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.13" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -8977,7 +10328,7 @@ dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading 0.8.4", + "libloading", "once_cell", "rustix", "x11rb-protocol", @@ -8991,15 +10342,9 @@ checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "xcursor" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" - -[[package]] -name = "xi-unicode" -version = "0.3.0" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" +checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61" [[package]] name = "xkbcommon-dl" @@ -9022,9 +10367,9 @@ checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" [[package]] name = "xml-rs" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" +checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601" [[package]] name = "xmlparser" @@ -9032,6 +10377,18 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d78a7f29bb57edf63321d545d84f99360df71df36929a090bc067e1bcb65e34d" +[[package]] +name = "yazi" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" + +[[package]] +name = "zeno" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" + [[package]] name = "zerocopy" version = "0.3.2" @@ -9048,6 +10405,7 @@ version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive 0.7.35", ] @@ -9069,8 +10427,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 2.0.69", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -9103,9 +10461,9 @@ dependencies = [ [[package]] name = "zune-jpeg" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" dependencies = [ "zune-core", ] diff --git a/Cargo.toml b/Cargo.toml index a0f00f731..0f526d9ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,9 +24,9 @@ members = [ resolver = "2" [workspace.dependencies] -bevy = "0.14.0" -bevy_egui = "0.28.0" -bevy-inspector-egui = "0.25.0" +bevy = { git = "https://github.com/bevyengine/bevy", branch = "main" } +bevy_egui = { git = "https://github.com/tychedelia/bevy_egui", branch = "main" } +bevy-inspector-egui = { git = "https://github.com/tychedelia/bevy-inspector-egui", branch = "main" } image = "0.25" rayon = "1.10" bevy_common_assets = "0.11.0" @@ -34,4 +34,4 @@ serde = "1" serde_json = "1" toml = "0.8" serde_yaml = "0.9" -wgpu = "0.20" \ No newline at end of file +wgpu = "22.0" diff --git a/bevy_nannou_isf/Cargo.toml b/bevy_nannou_isf/Cargo.toml index 4a6fef37a..a0119ec95 100644 --- a/bevy_nannou_isf/Cargo.toml +++ b/bevy_nannou_isf/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] bevy = { workspace = true, features = ["shader_format_glsl"] } bevy_egui = { workspace = true } -bevy-inspector-egui = { workspace = true, features = ["bevy_render"] } +bevy-inspector-egui = { workspace = true } isf = "0.1.0" thiserror = "1" bytemuck = "1" From 714880dac514a0bc8f85ba1fd6b09a59312214d1 Mon Sep 17 00:00:00 2001 From: Charlotte McElwain Date: Sat, 31 Aug 2024 15:30:44 -0700 Subject: [PATCH 02/17] 0.15-dev --- Cargo.lock | 4 +- bevy_nannou_draw/src/draw/instanced.rs | 56 ++++++++++++++++++-------- nannou/src/app.rs | 40 ++++++++---------- nannou/src/window.rs | 35 ++++++++-------- nannou_core/Cargo.toml | 2 +- 5 files changed, 75 insertions(+), 62 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6c84cbd89..10c7c2229 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4467,7 +4467,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e05e7e6723e3455f4818c7b26e855439f7546cf617ef669d1adedb8669e5cb9" dependencies = [ "bytemuck", - "libm", "rand 0.8.5", "serde", ] @@ -4479,6 +4478,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94" dependencies = [ "bytemuck", + "libm", "rand 0.8.5", "serde", ] @@ -5977,7 +5977,7 @@ dependencies = [ name = "nannou_core" version = "0.19.0" dependencies = [ - "glam 0.27.0", + "glam 0.28.0", "num-traits", "rand 0.8.5", ] diff --git a/bevy_nannou_draw/src/draw/instanced.rs b/bevy_nannou_draw/src/draw/instanced.rs index 5fa760626..bdaca23bb 100644 --- a/bevy_nannou_draw/src/draw/instanced.rs +++ b/bevy_nannou_draw/src/draw/instanced.rs @@ -13,7 +13,7 @@ use bevy::{ prelude::*, render::{ extract_component::{ExtractComponent, ExtractComponentPlugin}, - mesh::{GpuBufferInfo, GpuMesh, MeshVertexBufferLayoutRef}, + mesh::{RenderMesh, MeshVertexBufferLayoutRef}, render_asset::RenderAssets, render_phase::{ AddRenderCommand, DrawFunctions, PhaseItem, PhaseItemExtraIndex, RenderCommand, @@ -25,6 +25,8 @@ use bevy::{ Render, RenderApp, RenderSet, }, }; +use bevy::render::mesh::allocator::MeshAllocator; +use bevy::render::mesh::RenderMeshBufferInfo; use bytemuck::{Pod, Zeroable}; use rayon::prelude::*; @@ -155,20 +157,19 @@ pub struct InstanceData { fn queue_instanced( transparent_3d_draw_functions: Res>, custom_pipeline: Res, - msaa: Res, mut pipelines: ResMut>, pipeline_cache: Res, - meshes: Res>, + meshes: Res>, render_mesh_instances: Res, material_meshes: Query>, mut transparent_render_phases: ResMut>, - mut views: Query<(Entity, &ExtractedView)>, + mut views: Query<(Entity, &ExtractedView, &Msaa)>, ) { let draw_custom = transparent_3d_draw_functions.read().id::(); - let msaa_key = MeshPipelineKey::from_msaa_samples(msaa.samples()); - for (view_entity, view) in &mut views { + for (view_entity, view, msaa) in &mut views { + let msaa_key = MeshPipelineKey::from_msaa_samples(msaa.samples()); let Some(transparent_phase) = transparent_render_phases.get_mut(&view_entity) else { continue; }; @@ -282,7 +283,11 @@ type DrawInstanced = ( struct DrawMeshInstanced; impl RenderCommand

for DrawMeshInstanced { - type Param = (SRes>, SRes); + type Param = ( + SRes>, + SRes, + SRes, + ); type ViewQuery = (); type ItemQuery = Read; @@ -291,33 +296,50 @@ impl RenderCommand

for DrawMeshInstanced { item: &P, _view: (), instance_buffer: Option<&'w InstanceBuffer>, - (meshes, render_mesh_instances): SystemParamItem<'w, '_, Self::Param>, + (meshes, render_mesh_instances, mesh_allocator): SystemParamItem<'w, '_, Self::Param>, pass: &mut TrackedRenderPass<'w>, ) -> RenderCommandResult { + // A borrow check workaround. + let mesh_allocator = mesh_allocator.into_inner(); + let Some(mesh_instance) = render_mesh_instances.render_mesh_queue_data(item.entity()) else { - return RenderCommandResult::Failure; + return RenderCommandResult::Skip; }; let Some(gpu_mesh) = meshes.into_inner().get(mesh_instance.mesh_asset_id) else { - return RenderCommandResult::Failure; + return RenderCommandResult::Skip; }; let Some(instance_buffer) = instance_buffer else { - return RenderCommandResult::Failure; + return RenderCommandResult::Skip; + }; + let Some(vertex_buffer_slice) = + mesh_allocator.mesh_vertex_slice(&mesh_instance.mesh_asset_id) + else { + return RenderCommandResult::Skip; }; - pass.set_vertex_buffer(0, gpu_mesh.vertex_buffer.slice(..)); + pass.set_vertex_buffer(0, vertex_buffer_slice.buffer.slice(..)); pass.set_vertex_buffer(1, instance_buffer.buffer.slice(..)); match &gpu_mesh.buffer_info { - GpuBufferInfo::Indexed { - buffer, + RenderMeshBufferInfo::Indexed { index_format, count, } => { - pass.set_index_buffer(buffer.slice(..), 0, *index_format); - pass.draw_indexed(0..*count, 0, 0..instance_buffer.length as u32); + let Some(index_buffer_slice) = + mesh_allocator.mesh_index_slice(&mesh_instance.mesh_asset_id) + else { + return RenderCommandResult::Skip; + }; + + pass.set_index_buffer(index_buffer_slice.buffer.slice(..), 0, *index_format); + pass.draw_indexed( + index_buffer_slice.range.start..(index_buffer_slice.range.start + count), + vertex_buffer_slice.range.start as i32, + 0..instance_buffer.length as u32, + ); } - GpuBufferInfo::NonIndexed => { + RenderMeshBufferInfo::NonIndexed => { pass.draw(0..gpu_mesh.vertex_count, 0..instance_buffer.length as u32); } } diff --git a/nannou/src/app.rs b/nannou/src/app.rs index a8c654d4a..0d90b5193 100644 --- a/nannou/src/app.rs +++ b/nannou/src/app.rs @@ -527,50 +527,42 @@ where } } -impl Reflect for ModelHolder +impl PartialReflect for ModelHolder where - M: Reflect + DynamicTypePath + Any + GetTypeRegistration + 'static, + M: PartialReflect + DynamicTypePath + Any + GetTypeRegistration + 'static, { fn get_represented_type_info(&self) -> Option<&'static TypeInfo> { self.0.get_represented_type_info() } - fn into_any(self: Box) -> Box { - Box::new(self.0).into_any() + fn into_partial_reflect(self: Box) -> Box { + Box::new(ModelHolder(self.0)) } - fn as_any(&self) -> &dyn Any { - self.0.as_any() + fn as_partial_reflect(&self) -> &dyn PartialReflect { + self.0.as_partial_reflect() } - fn as_any_mut(&mut self) -> &mut dyn Any { - self.0.as_any_mut() + fn as_partial_reflect_mut(&mut self) -> &mut dyn PartialReflect { + self.0.as_partial_reflect_mut() } - fn into_reflect(self: Box) -> Box { - Box::new(self.0).into_reflect() + fn try_into_reflect(self: Box) -> Result, Box> { + Box::new(self.0).try_into_reflect() } - fn as_reflect(&self) -> &dyn Reflect { - self.0.as_reflect() + fn try_as_reflect(&self) -> Option<&dyn Reflect> { + self.0.try_as_reflect() } - fn as_reflect_mut(&mut self) -> &mut dyn Reflect { - self.0.as_reflect_mut() + fn try_as_reflect_mut(&mut self) -> Option<&mut dyn Reflect> { + self.0.try_as_reflect_mut() } - fn apply(&mut self, value: &dyn Reflect) { - self.0.apply(value) - } - - fn try_apply(&mut self, value: &dyn Reflect) -> Result<(), ApplyError> { + fn try_apply(&mut self, value: &dyn PartialReflect) -> Result<(), ApplyError> { self.0.try_apply(value) } - fn set(&mut self, value: Box) -> Result<(), Box> { - self.0.set(value) - } - fn reflect_ref(&self) -> ReflectRef { self.0.reflect_ref() } @@ -583,7 +575,7 @@ where Box::new(self.0).reflect_owned() } - fn clone_value(&self) -> Box { + fn clone_value(&self) -> Box { self.0.clone_value() } } diff --git a/nannou/src/window.rs b/nannou/src/window.rs index ebbed08b1..0a0cd06c9 100644 --- a/nannou/src/window.rs +++ b/nannou/src/window.rs @@ -11,11 +11,10 @@ use std::path::{Path, PathBuf}; use bevy::input::mouse::MouseWheel; use bevy::prelude::*; use bevy::render::camera::RenderTarget; -use bevy::render::extract_component::{ExtractComponent, ExtractComponentPlugin}; -use bevy::render::renderer::{RenderDevice, RenderQueue}; -use bevy::render::view::screenshot::ScreenshotManager; +use bevy::render::view::cursor::CursorIcon; use bevy::render::view::RenderLayers; -use bevy::window::{Cursor, CursorGrabMode, PrimaryWindow, WindowLevel, WindowMode, WindowRef}; +use bevy::render::view::screenshot::{save_to_disk, Screenshot}; +use bevy::window::{CursorGrabMode, PrimaryWindow, WindowLevel, WindowMode, WindowRef}; use crate::app::RenderFnRes; use crate::frame::{Frame, FramePlugin}; @@ -773,7 +772,7 @@ impl<'a, 'w> Window<'a, 'w> { /// to fullscreen. pub fn set_fullscreen(&self, fullscreen: bool) { if fullscreen { - self.window_mut().mode = WindowMode::BorderlessFullscreen; + self.window_mut().mode = WindowMode::BorderlessFullscreen(MonitorSelection::Current); } else { self.window_mut().mode = WindowMode::Windowed; } @@ -845,8 +844,11 @@ impl<'a, 'w> Window<'a, 'w> { /// /// - **iOS:** Has no effect. /// - **Android:** Has no effect. - pub fn set_cursor_icon(&self, cursor: Cursor) { - self.window_mut().cursor = cursor; + pub fn set_cursor_icon(&self, cursor: CursorIcon) { + self.app + .component_world_mut() + .entity_mut(self.entity) + .insert(cursor); } /// Changes the position of the cursor in logical window coordinates. @@ -869,7 +871,7 @@ impl<'a, 'w> Window<'a, 'w> { /// - **iOS:** Always returns an Err. /// - **Web:** Has no effect. pub fn set_cursor_grab(&self, grab: bool) { - self.window_mut().cursor.grab_mode = if grab { + self.window_mut().cursor_options.grab_mode = if grab { CursorGrabMode::Locked } else { CursorGrabMode::None @@ -890,12 +892,12 @@ impl<'a, 'w> Window<'a, 'w> { /// /// This has no effect on **Android** or **iOS**. pub fn set_cursor_visible(&self, visible: bool) { - self.window_mut().cursor.visible = visible; + self.window_mut().cursor_options.visible = visible; } /// Attempts to determine whether or not the window is currently fullscreen. pub fn is_fullscreen(&self) -> bool { - self.window_mut().mode == WindowMode::Fullscreen + self.window_mut().mode == WindowMode::Fullscreen(MonitorSelection::Current) } /// The rectangle representing the position and dimensions of the window. @@ -912,14 +914,11 @@ impl<'a, 'w> Window<'a, 'w> { } /// Saves a screenshot of the window to the given path. - pub fn save_screenshot>(&mut self, path: P) { - let mut world = self.app.resource_world_mut(); - let mut screenshot_manager = world - .get_resource_mut::() - .expect("ScreenshotManager resource not found"); - screenshot_manager - .save_screenshot_to_disk(self.entity, path) - .expect("Failed to save screenshot"); + pub fn save_screenshot + 'static>(&mut self, path: P) { + let mut world = self.app.component_world_mut(); + world.spawn(Screenshot::window(self.entity)) + .observe(save_to_disk(path)); + } pub fn device(&self) -> std::cell::Ref { diff --git a/nannou_core/Cargo.toml b/nannou_core/Cargo.toml index cdcf4ddf0..33949627d 100644 --- a/nannou_core/Cargo.toml +++ b/nannou_core/Cargo.toml @@ -10,7 +10,7 @@ homepage = "https://nannou.cc" edition = "2018" [dependencies] -glam = { version = "0.27.0", default-features = false, features = ["rand"] } +glam = { version = "0.28.0", default-features = false, features = ["rand"] } # TODO: Awaiting `no-std` to be published. # noise = 0.6 num-traits = { version = "0.2.14", default-features = false } From f170d45bfe6a7b76d52952674405ad0912fd575b Mon Sep 17 00:00:00 2001 From: Charlotte McElwain Date: Sat, 31 Aug 2024 20:10:29 -0700 Subject: [PATCH 03/17] Fmt. --- bevy_nannou_draw/src/draw/instanced.rs | 7 +++---- nannou/src/window.rs | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/bevy_nannou_draw/src/draw/instanced.rs b/bevy_nannou_draw/src/draw/instanced.rs index bdaca23bb..9e47434a9 100644 --- a/bevy_nannou_draw/src/draw/instanced.rs +++ b/bevy_nannou_draw/src/draw/instanced.rs @@ -1,5 +1,7 @@ //! A shader that renders a mesh multiple times in one draw call. +use bevy::render::mesh::allocator::MeshAllocator; +use bevy::render::mesh::RenderMeshBufferInfo; use bevy::render::render_phase::ViewSortedRenderPhases; use bevy::{ core_pipeline::core_3d::Transparent3d, @@ -13,7 +15,7 @@ use bevy::{ prelude::*, render::{ extract_component::{ExtractComponent, ExtractComponentPlugin}, - mesh::{RenderMesh, MeshVertexBufferLayoutRef}, + mesh::{MeshVertexBufferLayoutRef, RenderMesh}, render_asset::RenderAssets, render_phase::{ AddRenderCommand, DrawFunctions, PhaseItem, PhaseItemExtraIndex, RenderCommand, @@ -25,8 +27,6 @@ use bevy::{ Render, RenderApp, RenderSet, }, }; -use bevy::render::mesh::allocator::MeshAllocator; -use bevy::render::mesh::RenderMeshBufferInfo; use bytemuck::{Pod, Zeroable}; use rayon::prelude::*; @@ -167,7 +167,6 @@ fn queue_instanced( ) { let draw_custom = transparent_3d_draw_functions.read().id::(); - for (view_entity, view, msaa) in &mut views { let msaa_key = MeshPipelineKey::from_msaa_samples(msaa.samples()); let Some(transparent_phase) = transparent_render_phases.get_mut(&view_entity) else { diff --git a/nannou/src/window.rs b/nannou/src/window.rs index 0a0cd06c9..624d0c50d 100644 --- a/nannou/src/window.rs +++ b/nannou/src/window.rs @@ -12,8 +12,8 @@ use bevy::input::mouse::MouseWheel; use bevy::prelude::*; use bevy::render::camera::RenderTarget; use bevy::render::view::cursor::CursorIcon; -use bevy::render::view::RenderLayers; use bevy::render::view::screenshot::{save_to_disk, Screenshot}; +use bevy::render::view::RenderLayers; use bevy::window::{CursorGrabMode, PrimaryWindow, WindowLevel, WindowMode, WindowRef}; use crate::app::RenderFnRes; @@ -916,9 +916,9 @@ impl<'a, 'w> Window<'a, 'w> { /// Saves a screenshot of the window to the given path. pub fn save_screenshot + 'static>(&mut self, path: P) { let mut world = self.app.component_world_mut(); - world.spawn(Screenshot::window(self.entity)) + world + .spawn(Screenshot::window(self.entity)) .observe(save_to_disk(path)); - } pub fn device(&self) -> std::cell::Ref { From 941d613f3ac44d6cd0e77ca7ec056ec498386a9b Mon Sep 17 00:00:00 2001 From: Charlotte McElwain Date: Sat, 31 Aug 2024 20:22:36 -0700 Subject: [PATCH 04/17] Nix. --- default.nix | 3 +++ flake.lock | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/default.nix b/default.nix index e139e11f2..74a235f41 100644 --- a/default.nix +++ b/default.nix @@ -25,6 +25,9 @@ rustPlatform.buildRustPackage rec { lockFile = ./Cargo.lock; outputHashes = { "skeptic-0.13.8" = "sha256-LLVrpuyQsMdbp8OYcHN0nq+uKC8xgJzpNy+gyXxTYbo="; + "bevy-0.15.0-dev" = "sha256-vy/JzyAWkXrsFw2L5XioetGFzRqebe/3CfnhEDHFos4="; + "bevy-inspector-egui-0.24.0" = "sha256-SmWKXNRvcgDdsyB8mzjUwxGucm6XbXtHzDOk8SJ+2yY="; + "bevy_egui-0.29.0" = "sha256-3UiUBpDhpud42ZcDwPHhSzmnlXkd9rH14lqXeRHdLlU="; }; }; diff --git a/flake.lock b/flake.lock index 9c64b98b4..8491e1930 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1722185531, - "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "type": "github" }, "original": { From 0b243c8451ae7422fd725458eeaa69a8280bb591 Mon Sep 17 00:00:00 2001 From: Charlotte McElwain Date: Sat, 31 Aug 2024 21:05:53 -0700 Subject: [PATCH 05/17] Lockfile. --- Cargo.lock | 154 ++++++++++++++++++++++++++--------------------------- 1 file changed, 77 insertions(+), 77 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 10c7c2229..67dec971e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -624,7 +624,7 @@ dependencies = [ [[package]] name = "bevy" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_internal 0.15.0-dev", ] @@ -686,7 +686,7 @@ dependencies = [ [[package]] name = "bevy_a11y" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "accesskit 0.16.0", "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -698,7 +698,7 @@ dependencies = [ [[package]] name = "bevy_a11y" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "accesskit 0.16.0", "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -710,7 +710,7 @@ dependencies = [ [[package]] name = "bevy_animation" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -757,7 +757,7 @@ dependencies = [ [[package]] name = "bevy_app" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -775,7 +775,7 @@ dependencies = [ [[package]] name = "bevy_app" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -825,7 +825,7 @@ dependencies = [ [[package]] name = "bevy_asset" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "async-broadcast", "async-fs", @@ -859,7 +859,7 @@ dependencies = [ [[package]] name = "bevy_asset" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "async-broadcast", "async-fs", @@ -904,7 +904,7 @@ dependencies = [ [[package]] name = "bevy_asset_macros" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "proc-macro2 1.0.86", @@ -915,7 +915,7 @@ dependencies = [ [[package]] name = "bevy_asset_macros" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "proc-macro2 1.0.86", @@ -926,7 +926,7 @@ dependencies = [ [[package]] name = "bevy_audio" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -944,7 +944,7 @@ dependencies = [ [[package]] name = "bevy_color" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -958,7 +958,7 @@ dependencies = [ [[package]] name = "bevy_color" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -1000,7 +1000,7 @@ dependencies = [ [[package]] name = "bevy_core" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -1013,7 +1013,7 @@ dependencies = [ [[package]] name = "bevy_core" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -1026,7 +1026,7 @@ dependencies = [ [[package]] name = "bevy_core_pipeline" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -1050,7 +1050,7 @@ dependencies = [ [[package]] name = "bevy_core_pipeline" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -1085,7 +1085,7 @@ dependencies = [ [[package]] name = "bevy_derive" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "quote 1.0.37", @@ -1095,7 +1095,7 @@ dependencies = [ [[package]] name = "bevy_derive" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "quote 1.0.37", @@ -1120,7 +1120,7 @@ dependencies = [ [[package]] name = "bevy_diagnostic" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -1135,7 +1135,7 @@ dependencies = [ [[package]] name = "bevy_diagnostic" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -1169,7 +1169,7 @@ dependencies = [ [[package]] name = "bevy_ecs" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "arrayvec 0.7.6", "bevy_ecs_macros 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -1189,7 +1189,7 @@ dependencies = [ [[package]] name = "bevy_ecs" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_ecs_macros 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bevy_ptr 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -1220,7 +1220,7 @@ dependencies = [ [[package]] name = "bevy_ecs_macros" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "proc-macro2 1.0.86", @@ -1231,7 +1231,7 @@ dependencies = [ [[package]] name = "bevy_ecs_macros" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "proc-macro2 1.0.86", @@ -1286,7 +1286,7 @@ dependencies = [ [[package]] name = "bevy_encase_derive" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "encase_derive_impl 0.8.0", @@ -1295,7 +1295,7 @@ dependencies = [ [[package]] name = "bevy_encase_derive" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "encase_derive_impl 0.8.0", @@ -1304,7 +1304,7 @@ dependencies = [ [[package]] name = "bevy_gilrs" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -1318,7 +1318,7 @@ dependencies = [ [[package]] name = "bevy_gizmos" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -1340,7 +1340,7 @@ dependencies = [ [[package]] name = "bevy_gizmos_macros" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "proc-macro2 1.0.86", @@ -1351,7 +1351,7 @@ dependencies = [ [[package]] name = "bevy_gltf" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "base64 0.22.1", "bevy_animation", @@ -1395,7 +1395,7 @@ dependencies = [ [[package]] name = "bevy_hierarchy" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -1408,7 +1408,7 @@ dependencies = [ [[package]] name = "bevy_hierarchy" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -1436,7 +1436,7 @@ dependencies = [ [[package]] name = "bevy_input" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -1450,7 +1450,7 @@ dependencies = [ [[package]] name = "bevy_input" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -1490,7 +1490,7 @@ dependencies = [ [[package]] name = "bevy_internal" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_a11y 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_animation", @@ -1546,7 +1546,7 @@ dependencies = [ [[package]] name = "bevy_log" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "android_log-sys", "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -1560,7 +1560,7 @@ dependencies = [ [[package]] name = "bevy_log" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "android_log-sys", "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -1586,7 +1586,7 @@ dependencies = [ [[package]] name = "bevy_macro_utils" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "proc-macro2 1.0.86", "quote 1.0.37", @@ -1597,7 +1597,7 @@ dependencies = [ [[package]] name = "bevy_macro_utils" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "proc-macro2 1.0.86", "quote 1.0.37", @@ -1622,7 +1622,7 @@ dependencies = [ [[package]] name = "bevy_math" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "glam 0.28.0", @@ -1637,7 +1637,7 @@ dependencies = [ [[package]] name = "bevy_math" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "glam 0.28.0", @@ -1652,7 +1652,7 @@ dependencies = [ [[package]] name = "bevy_mikktspace" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "glam 0.28.0", ] @@ -1660,7 +1660,7 @@ dependencies = [ [[package]] name = "bevy_mikktspace" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "glam 0.28.0", ] @@ -1716,7 +1716,7 @@ dependencies = [ [[package]] name = "bevy_pbr" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -1742,7 +1742,7 @@ dependencies = [ [[package]] name = "bevy_pbr" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -1768,7 +1768,7 @@ dependencies = [ [[package]] name = "bevy_picking" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -1795,12 +1795,12 @@ checksum = "7ed72afbb6249a6803a3ed7bd2f68ff080d9392f550475e050b34c1e1c1e3e8f" [[package]] name = "bevy_ptr" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" [[package]] name = "bevy_ptr" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" [[package]] name = "bevy_reflect" @@ -1824,7 +1824,7 @@ dependencies = [ [[package]] name = "bevy_reflect" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_ptr 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_reflect_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -1843,7 +1843,7 @@ dependencies = [ [[package]] name = "bevy_reflect" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_ptr 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bevy_reflect_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -1874,7 +1874,7 @@ dependencies = [ [[package]] name = "bevy_reflect_derive" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "proc-macro2 1.0.86", @@ -1886,7 +1886,7 @@ dependencies = [ [[package]] name = "bevy_reflect_derive" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "proc-macro2 1.0.86", @@ -1898,7 +1898,7 @@ dependencies = [ [[package]] name = "bevy_render" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "async-channel", "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -1947,7 +1947,7 @@ dependencies = [ [[package]] name = "bevy_render" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "async-channel", "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -1994,7 +1994,7 @@ dependencies = [ [[package]] name = "bevy_render_macros" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "proc-macro2 1.0.86", @@ -2005,7 +2005,7 @@ dependencies = [ [[package]] name = "bevy_render_macros" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "proc-macro2 1.0.86", @@ -2016,7 +2016,7 @@ dependencies = [ [[package]] name = "bevy_scene" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -2035,7 +2035,7 @@ dependencies = [ [[package]] name = "bevy_sprite" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -2063,7 +2063,7 @@ dependencies = [ [[package]] name = "bevy_state" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -2076,7 +2076,7 @@ dependencies = [ [[package]] name = "bevy_state_macros" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "proc-macro2 1.0.86", @@ -2098,7 +2098,7 @@ dependencies = [ [[package]] name = "bevy_tasks" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "async-channel", "async-executor", @@ -2112,7 +2112,7 @@ dependencies = [ [[package]] name = "bevy_tasks" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "async-executor", "futures-channel", @@ -2124,7 +2124,7 @@ dependencies = [ [[package]] name = "bevy_text" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -2162,7 +2162,7 @@ dependencies = [ [[package]] name = "bevy_time" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -2175,7 +2175,7 @@ dependencies = [ [[package]] name = "bevy_time" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -2202,7 +2202,7 @@ dependencies = [ [[package]] name = "bevy_transform" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -2215,7 +2215,7 @@ dependencies = [ [[package]] name = "bevy_transform" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -2228,7 +2228,7 @@ dependencies = [ [[package]] name = "bevy_ui" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_a11y 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -2273,7 +2273,7 @@ dependencies = [ [[package]] name = "bevy_utils" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "ahash", "bevy_utils_proc_macros 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -2287,7 +2287,7 @@ dependencies = [ [[package]] name = "bevy_utils" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "ahash", "bevy_utils_proc_macros 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -2312,7 +2312,7 @@ dependencies = [ [[package]] name = "bevy_utils_proc_macros" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "proc-macro2 1.0.86", "quote 1.0.37", @@ -2322,7 +2322,7 @@ dependencies = [ [[package]] name = "bevy_utils_proc_macros" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "proc-macro2 1.0.86", "quote 1.0.37", @@ -2348,7 +2348,7 @@ dependencies = [ [[package]] name = "bevy_window" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_a11y 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -2363,7 +2363,7 @@ dependencies = [ [[package]] name = "bevy_window" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "bevy_a11y 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -2406,7 +2406,7 @@ dependencies = [ [[package]] name = "bevy_winit" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "accesskit_winit 0.22.0", "approx 0.5.1", @@ -2433,7 +2433,7 @@ dependencies = [ [[package]] name = "bevy_winit" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#4bea611a434128873598b547b37e3f253865ba38" +source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" dependencies = [ "accesskit_winit 0.22.0", "approx 0.5.1", From 884af444f17439e8250cf4c8b1ca379ba6ec3c7f Mon Sep 17 00:00:00 2001 From: Charlotte McElwain Date: Sat, 31 Aug 2024 21:22:43 -0700 Subject: [PATCH 06/17] Monitors. --- nannou/src/app.rs | 23 ++++++++++++++--------- nannou/src/window.rs | 8 ++++++++ 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/nannou/src/app.rs b/nannou/src/app.rs index 0d90b5193..0e913dcf5 100644 --- a/nannou/src/app.rs +++ b/nannou/src/app.rs @@ -31,9 +31,10 @@ use bevy::reflect::{ ApplyError, DynamicTypePath, GetTypeRegistration, ReflectMut, ReflectOwned, ReflectRef, TypeInfo, }; -use bevy::render::extract_resource::{extract_resource, ExtractResource}; -use bevy::render::render_graph::ViewNodeRunner; -use bevy::window::{ExitCondition, PrimaryWindow, WindowClosed, WindowFocused, WindowResized}; +use bevy::window::{ + ExitCondition, Monitor, PrimaryMonitor, PrimaryWindow, WindowClosed, WindowFocused, + WindowResized, +}; use bevy::winit::{UpdateMode, WinitEvent, WinitSettings}; #[cfg(feature = "egui")] use bevy_egui::EguiContext; @@ -715,17 +716,21 @@ impl<'w> App<'w> { } /// Returns the list of all the monitors available on the system. - pub fn available_monitors(&self) -> Vec<()> { - // Bevy doesn't expose this right now but could be nice - todo!() + pub fn available_monitors(&self) -> Vec<(Entity, Monitor)> { + let mut monitor_q = self.component_world().query::<(Entity, &Monitor)>(); + monitor_q + .iter(&self.component_world()) + .collect() } /// Returns the primary monitor of the system. /// May return None if none can be detected. For example, this can happen when running on Linux /// with Wayland. - pub fn primary_monitor(&self) -> Option<()> { - // Bevy doesn't expose this right now but could be nice - todo!() + pub fn primary_monitor(&self) -> Option { + let mut monitor_q = self + .component_world() + .query_filtered::>(); + monitor_q.get_single(&self.component_world()).ok() } pub fn new_light<'a>(&'a self) -> light::Builder<'a, 'w> { diff --git a/nannou/src/window.rs b/nannou/src/window.rs index 624d0c50d..3d4d1a8d1 100644 --- a/nannou/src/window.rs +++ b/nannou/src/window.rs @@ -584,6 +584,14 @@ where }) } + /// Move the window to the center of the given monitor. + pub fn monitor(mut self, monitor: MonitorSelection) -> Self { + self.map_window(|mut w| { + w.position = WindowPosition::Centered(monitor); + w + }) + } + /// Requests maximized mode. pub fn maximized(self, maximized: bool) -> Self { self.map_window(|mut w| { From faac9391a0fa7208251e151024ccac7bc983c78c Mon Sep 17 00:00:00 2001 From: Charlotte McElwain Date: Sun, 1 Sep 2024 10:20:14 -0700 Subject: [PATCH 07/17] Fixup prelude. --- bevy_nannou/src/lib.rs | 6 +++++- nannou/src/app.rs | 5 +++-- nannou/src/camera.rs | 3 +-- nannou/src/light.rs | 3 +-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/bevy_nannou/src/lib.rs b/bevy_nannou/src/lib.rs index 2657bff1a..fe8c56cac 100644 --- a/bevy_nannou/src/lib.rs +++ b/bevy_nannou/src/lib.rs @@ -5,7 +5,11 @@ pub mod prelude { pub use bevy::color::*; pub use bevy::core_pipeline::bloom::*; pub use bevy::input::mouse::MouseWheel; - pub use bevy::prelude::*; + pub use bevy::prelude::{ + default, light_consts, ClearColorConfig, Entity, Handle, Image, KeyCode, + MonitorSelection, MouseButton, OrthographicProjection, TouchInput, Vec3, Window, WindowResizeConstraints, + info, warn, error, debug, trace, + }; pub use bevy::render::render_asset::*; pub use bevy::render::render_resource::*; pub use bevy::winit::UpdateMode; diff --git a/nannou/src/app.rs b/nannou/src/app.rs index 0e913dcf5..fb359e79d 100644 --- a/nannou/src/app.rs +++ b/nannou/src/app.rs @@ -717,9 +717,10 @@ impl<'w> App<'w> { /// Returns the list of all the monitors available on the system. pub fn available_monitors(&self) -> Vec<(Entity, Monitor)> { - let mut monitor_q = self.component_world().query::<(Entity, &Monitor)>(); + let mut monitor_q = self.component_world_mut().query::<(Entity, &Monitor)>(); monitor_q .iter(&self.component_world()) + .map(|(entity, monitor)| (entity, monitor.clone())) .collect() } @@ -728,7 +729,7 @@ impl<'w> App<'w> { /// with Wayland. pub fn primary_monitor(&self) -> Option { let mut monitor_q = self - .component_world() + .component_world_mut() .query_filtered::>(); monitor_q.get_single(&self.component_world()).ok() } diff --git a/nannou/src/camera.rs b/nannou/src/camera.rs index 3b6e758e5..ccf0d09ae 100644 --- a/nannou/src/camera.rs +++ b/nannou/src/camera.rs @@ -1,10 +1,9 @@ use crate::prelude::bevy_render::camera::RenderTarget; -use crate::prelude::Camera3dBundle; use crate::App; use bevy::core_pipeline::bloom::BloomSettings; use bevy::core_pipeline::tonemapping::Tonemapping; use bevy::math::UVec2; -use bevy::prelude::{Camera3d, PerspectiveProjection, Projection, Transform, Vec2}; +use bevy::prelude::{Camera3d, Camera3dBundle, Projection, Transform, Vec2}; use bevy::render::camera; use bevy::render::view::RenderLayers; use bevy::window::WindowRef; diff --git a/nannou/src/light.rs b/nannou/src/light.rs index 946b29c4f..aa1ec8d12 100644 --- a/nannou/src/light.rs +++ b/nannou/src/light.rs @@ -1,12 +1,11 @@ use bevy::core_pipeline::bloom::BloomSettings; -use bevy::pbr::DirectionalLight; +use bevy::pbr::{DirectionalLight, DirectionalLightBundle}; use bevy::prelude::{Color, Transform, Vec2}; use bevy::render::camera; use bevy::render::view::RenderLayers; use bevy_nannou::prelude::{default, Entity, Vec3}; -use crate::prelude::DirectionalLightBundle; use crate::App; pub struct Light<'a, 'w> { From 2bf9be9b903b300d1f6fd60d8997e12d0eab5e4f Mon Sep 17 00:00:00 2001 From: Charlotte McElwain Date: Sun, 1 Sep 2024 10:27:04 -0700 Subject: [PATCH 08/17] Fmt. --- bevy_nannou/src/lib.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bevy_nannou/src/lib.rs b/bevy_nannou/src/lib.rs index fe8c56cac..6f921fb1d 100644 --- a/bevy_nannou/src/lib.rs +++ b/bevy_nannou/src/lib.rs @@ -6,9 +6,9 @@ pub mod prelude { pub use bevy::core_pipeline::bloom::*; pub use bevy::input::mouse::MouseWheel; pub use bevy::prelude::{ - default, light_consts, ClearColorConfig, Entity, Handle, Image, KeyCode, - MonitorSelection, MouseButton, OrthographicProjection, TouchInput, Vec3, Window, WindowResizeConstraints, - info, warn, error, debug, trace, + debug, default, error, info, light_consts, trace, warn, ClearColorConfig, Entity, Handle, + Image, KeyCode, MonitorSelection, MouseButton, OrthographicProjection, TouchInput, Vec3, + Window, WindowResizeConstraints, }; pub use bevy::render::render_asset::*; pub use bevy::render::render_resource::*; From 94d406b66f1c2796451332a8f1f328a23ef1b788 Mon Sep 17 00:00:00 2001 From: Charlotte McElwain Date: Sun, 1 Sep 2024 10:34:52 -0700 Subject: [PATCH 09/17] Nix. --- Cargo.lock | 154 ++++++++++++++++++++++++++-------------------------- default.nix | 2 +- 2 files changed, 78 insertions(+), 78 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 67dec971e..eb05d78dc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -624,7 +624,7 @@ dependencies = [ [[package]] name = "bevy" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_internal 0.15.0-dev", ] @@ -686,7 +686,7 @@ dependencies = [ [[package]] name = "bevy_a11y" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "accesskit 0.16.0", "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -698,7 +698,7 @@ dependencies = [ [[package]] name = "bevy_a11y" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "accesskit 0.16.0", "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -710,7 +710,7 @@ dependencies = [ [[package]] name = "bevy_animation" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -757,7 +757,7 @@ dependencies = [ [[package]] name = "bevy_app" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -775,7 +775,7 @@ dependencies = [ [[package]] name = "bevy_app" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -825,7 +825,7 @@ dependencies = [ [[package]] name = "bevy_asset" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "async-broadcast", "async-fs", @@ -859,7 +859,7 @@ dependencies = [ [[package]] name = "bevy_asset" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "async-broadcast", "async-fs", @@ -904,7 +904,7 @@ dependencies = [ [[package]] name = "bevy_asset_macros" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "proc-macro2 1.0.86", @@ -915,7 +915,7 @@ dependencies = [ [[package]] name = "bevy_asset_macros" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "proc-macro2 1.0.86", @@ -926,7 +926,7 @@ dependencies = [ [[package]] name = "bevy_audio" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -944,7 +944,7 @@ dependencies = [ [[package]] name = "bevy_color" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -958,7 +958,7 @@ dependencies = [ [[package]] name = "bevy_color" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -1000,7 +1000,7 @@ dependencies = [ [[package]] name = "bevy_core" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -1013,7 +1013,7 @@ dependencies = [ [[package]] name = "bevy_core" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -1026,7 +1026,7 @@ dependencies = [ [[package]] name = "bevy_core_pipeline" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -1050,7 +1050,7 @@ dependencies = [ [[package]] name = "bevy_core_pipeline" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -1085,7 +1085,7 @@ dependencies = [ [[package]] name = "bevy_derive" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "quote 1.0.37", @@ -1095,7 +1095,7 @@ dependencies = [ [[package]] name = "bevy_derive" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "quote 1.0.37", @@ -1120,7 +1120,7 @@ dependencies = [ [[package]] name = "bevy_diagnostic" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -1135,7 +1135,7 @@ dependencies = [ [[package]] name = "bevy_diagnostic" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -1169,7 +1169,7 @@ dependencies = [ [[package]] name = "bevy_ecs" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "arrayvec 0.7.6", "bevy_ecs_macros 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -1189,7 +1189,7 @@ dependencies = [ [[package]] name = "bevy_ecs" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_ecs_macros 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bevy_ptr 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -1220,7 +1220,7 @@ dependencies = [ [[package]] name = "bevy_ecs_macros" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "proc-macro2 1.0.86", @@ -1231,7 +1231,7 @@ dependencies = [ [[package]] name = "bevy_ecs_macros" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "proc-macro2 1.0.86", @@ -1286,7 +1286,7 @@ dependencies = [ [[package]] name = "bevy_encase_derive" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "encase_derive_impl 0.8.0", @@ -1295,7 +1295,7 @@ dependencies = [ [[package]] name = "bevy_encase_derive" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "encase_derive_impl 0.8.0", @@ -1304,7 +1304,7 @@ dependencies = [ [[package]] name = "bevy_gilrs" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -1318,7 +1318,7 @@ dependencies = [ [[package]] name = "bevy_gizmos" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -1340,7 +1340,7 @@ dependencies = [ [[package]] name = "bevy_gizmos_macros" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "proc-macro2 1.0.86", @@ -1351,7 +1351,7 @@ dependencies = [ [[package]] name = "bevy_gltf" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "base64 0.22.1", "bevy_animation", @@ -1395,7 +1395,7 @@ dependencies = [ [[package]] name = "bevy_hierarchy" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -1408,7 +1408,7 @@ dependencies = [ [[package]] name = "bevy_hierarchy" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -1436,7 +1436,7 @@ dependencies = [ [[package]] name = "bevy_input" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -1450,7 +1450,7 @@ dependencies = [ [[package]] name = "bevy_input" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -1490,7 +1490,7 @@ dependencies = [ [[package]] name = "bevy_internal" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_a11y 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_animation", @@ -1546,7 +1546,7 @@ dependencies = [ [[package]] name = "bevy_log" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "android_log-sys", "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -1560,7 +1560,7 @@ dependencies = [ [[package]] name = "bevy_log" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "android_log-sys", "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -1586,7 +1586,7 @@ dependencies = [ [[package]] name = "bevy_macro_utils" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "proc-macro2 1.0.86", "quote 1.0.37", @@ -1597,7 +1597,7 @@ dependencies = [ [[package]] name = "bevy_macro_utils" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "proc-macro2 1.0.86", "quote 1.0.37", @@ -1622,7 +1622,7 @@ dependencies = [ [[package]] name = "bevy_math" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "glam 0.28.0", @@ -1637,7 +1637,7 @@ dependencies = [ [[package]] name = "bevy_math" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "glam 0.28.0", @@ -1652,7 +1652,7 @@ dependencies = [ [[package]] name = "bevy_mikktspace" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "glam 0.28.0", ] @@ -1660,7 +1660,7 @@ dependencies = [ [[package]] name = "bevy_mikktspace" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "glam 0.28.0", ] @@ -1716,7 +1716,7 @@ dependencies = [ [[package]] name = "bevy_pbr" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -1742,7 +1742,7 @@ dependencies = [ [[package]] name = "bevy_pbr" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -1768,7 +1768,7 @@ dependencies = [ [[package]] name = "bevy_picking" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -1795,12 +1795,12 @@ checksum = "7ed72afbb6249a6803a3ed7bd2f68ff080d9392f550475e050b34c1e1c1e3e8f" [[package]] name = "bevy_ptr" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" [[package]] name = "bevy_ptr" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" [[package]] name = "bevy_reflect" @@ -1824,7 +1824,7 @@ dependencies = [ [[package]] name = "bevy_reflect" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_ptr 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_reflect_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -1843,7 +1843,7 @@ dependencies = [ [[package]] name = "bevy_reflect" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_ptr 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bevy_reflect_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -1874,7 +1874,7 @@ dependencies = [ [[package]] name = "bevy_reflect_derive" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "proc-macro2 1.0.86", @@ -1886,7 +1886,7 @@ dependencies = [ [[package]] name = "bevy_reflect_derive" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "proc-macro2 1.0.86", @@ -1898,7 +1898,7 @@ dependencies = [ [[package]] name = "bevy_render" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "async-channel", "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -1947,7 +1947,7 @@ dependencies = [ [[package]] name = "bevy_render" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "async-channel", "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -1994,7 +1994,7 @@ dependencies = [ [[package]] name = "bevy_render_macros" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "proc-macro2 1.0.86", @@ -2005,7 +2005,7 @@ dependencies = [ [[package]] name = "bevy_render_macros" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "proc-macro2 1.0.86", @@ -2016,7 +2016,7 @@ dependencies = [ [[package]] name = "bevy_scene" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -2035,7 +2035,7 @@ dependencies = [ [[package]] name = "bevy_sprite" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -2063,7 +2063,7 @@ dependencies = [ [[package]] name = "bevy_state" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -2076,7 +2076,7 @@ dependencies = [ [[package]] name = "bevy_state_macros" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "proc-macro2 1.0.86", @@ -2098,7 +2098,7 @@ dependencies = [ [[package]] name = "bevy_tasks" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "async-channel", "async-executor", @@ -2112,7 +2112,7 @@ dependencies = [ [[package]] name = "bevy_tasks" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "async-executor", "futures-channel", @@ -2124,7 +2124,7 @@ dependencies = [ [[package]] name = "bevy_text" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -2162,7 +2162,7 @@ dependencies = [ [[package]] name = "bevy_time" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -2175,7 +2175,7 @@ dependencies = [ [[package]] name = "bevy_time" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -2202,7 +2202,7 @@ dependencies = [ [[package]] name = "bevy_transform" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -2215,7 +2215,7 @@ dependencies = [ [[package]] name = "bevy_transform" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -2228,7 +2228,7 @@ dependencies = [ [[package]] name = "bevy_ui" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_a11y 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -2273,7 +2273,7 @@ dependencies = [ [[package]] name = "bevy_utils" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "ahash", "bevy_utils_proc_macros 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -2287,7 +2287,7 @@ dependencies = [ [[package]] name = "bevy_utils" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "ahash", "bevy_utils_proc_macros 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -2312,7 +2312,7 @@ dependencies = [ [[package]] name = "bevy_utils_proc_macros" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "proc-macro2 1.0.86", "quote 1.0.37", @@ -2322,7 +2322,7 @@ dependencies = [ [[package]] name = "bevy_utils_proc_macros" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "proc-macro2 1.0.86", "quote 1.0.37", @@ -2348,7 +2348,7 @@ dependencies = [ [[package]] name = "bevy_window" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_a11y 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", @@ -2363,7 +2363,7 @@ dependencies = [ [[package]] name = "bevy_window" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "bevy_a11y 0.15.0-dev (git+https://github.com/bevyengine/bevy)", "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", @@ -2406,7 +2406,7 @@ dependencies = [ [[package]] name = "bevy_winit" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "accesskit_winit 0.22.0", "approx 0.5.1", @@ -2433,7 +2433,7 @@ dependencies = [ [[package]] name = "bevy_winit" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#f0560b8e78528afd70ca913cbebf2ed459fa2716" +source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" dependencies = [ "accesskit_winit 0.22.0", "approx 0.5.1", diff --git a/default.nix b/default.nix index 74a235f41..4eace552d 100644 --- a/default.nix +++ b/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { lockFile = ./Cargo.lock; outputHashes = { "skeptic-0.13.8" = "sha256-LLVrpuyQsMdbp8OYcHN0nq+uKC8xgJzpNy+gyXxTYbo="; - "bevy-0.15.0-dev" = "sha256-vy/JzyAWkXrsFw2L5XioetGFzRqebe/3CfnhEDHFos4="; + "bevy-0.15.0-dev" = "sha256-OFDC0s4EKPRhitwF2QliZmWALT5gyiL/+woW1cbU/NU="; "bevy-inspector-egui-0.24.0" = "sha256-SmWKXNRvcgDdsyB8mzjUwxGucm6XbXtHzDOk8SJ+2yY="; "bevy_egui-0.29.0" = "sha256-3UiUBpDhpud42ZcDwPHhSzmnlXkd9rH14lqXeRHdLlU="; }; From 0ae2f399eba44b286f074c534b681f45427ab7c0 Mon Sep 17 00:00:00 2001 From: Charlotte McElwain Date: Thu, 5 Sep 2024 18:26:01 -0700 Subject: [PATCH 10/17] Nix. --- Cargo.lock | 1293 +++++++++++++++------------------------------------ default.nix | 4 +- flake.lock | 6 +- 3 files changed, 386 insertions(+), 917 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index eb05d78dc..6606df29e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -624,36 +624,36 @@ dependencies = [ [[package]] name = "bevy" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ "bevy_internal 0.15.0-dev", ] [[package]] name = "bevy-inspector-egui" -version = "0.24.0" -source = "git+https://github.com/tychedelia/bevy-inspector-egui?branch=main#c2efce18beb32ce9e89d0ed0a591985e683d2b6d" +version = "0.25.2" +source = "git+https://github.com/tychedelia/bevy-inspector-egui?branch=main#1a4e9a31cb5f4a242697a19a2f03765e463edb66" dependencies = [ "bevy-inspector-egui-derive", - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_core_pipeline 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_app 0.15.0-dev", + "bevy_asset 0.15.0-dev", + "bevy_color", + "bevy_core 0.15.0-dev", + "bevy_core_pipeline", + "bevy_ecs 0.15.0-dev", "bevy_egui 0.29.0 (git+https://github.com/tychedelia/bevy_egui)", - "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_log 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_pbr 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_time 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_window 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_hierarchy 0.15.0-dev", + "bevy_log 0.15.0-dev", + "bevy_math 0.15.0-dev", + "bevy_pbr", + "bevy_reflect 0.15.0-dev", + "bevy_render", + "bevy_state", + "bevy_time 0.15.0-dev", + "bevy_utils 0.15.0-dev", + "bevy_window 0.15.0-dev", "bytemuck", - "egui 0.27.2", - "egui-dropdown", + "egui", "fuzzy-matcher", "image 0.24.9", "once_cell", @@ -663,8 +663,8 @@ dependencies = [ [[package]] name = "bevy-inspector-egui-derive" -version = "0.24.0" -source = "git+https://github.com/tychedelia/bevy-inspector-egui?branch=main#c2efce18beb32ce9e89d0ed0a591985e683d2b6d" +version = "0.25.1" +source = "git+https://github.com/tychedelia/bevy-inspector-egui?branch=main#1a4e9a31cb5f4a242697a19a2f03765e463edb66" dependencies = [ "proc-macro2 1.0.86", "quote 1.0.37", @@ -686,46 +686,34 @@ dependencies = [ [[package]] name = "bevy_a11y" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "accesskit 0.16.0", - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", -] - -[[package]] -name = "bevy_a11y" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ "accesskit 0.16.0", - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_app 0.15.0-dev", + "bevy_derive 0.15.0-dev", + "bevy_ecs 0.15.0-dev", + "bevy_reflect 0.15.0-dev", ] [[package]] name = "bevy_animation" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_log 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_time 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" +dependencies = [ + "bevy_app 0.15.0-dev", + "bevy_asset 0.15.0-dev", + "bevy_color", + "bevy_core 0.15.0-dev", + "bevy_derive 0.15.0-dev", + "bevy_ecs 0.15.0-dev", + "bevy_hierarchy 0.15.0-dev", + "bevy_log 0.15.0-dev", + "bevy_math 0.15.0-dev", + "bevy_reflect 0.15.0-dev", + "bevy_render", + "bevy_time 0.15.0-dev", + "bevy_transform 0.15.0-dev", + "bevy_utils 0.15.0-dev", "blake3", "fixedbitset 0.5.7", "petgraph 0.6.5", @@ -757,31 +745,13 @@ dependencies = [ [[package]] name = "bevy_app" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "console_error_panic_hook", - "ctrlc", - "downcast-rs", - "thiserror", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "bevy_app" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ - "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_derive 0.15.0-dev", + "bevy_ecs 0.15.0-dev", + "bevy_reflect 0.15.0-dev", + "bevy_tasks 0.15.0-dev", + "bevy_utils 0.15.0-dev", "console_error_panic_hook", "ctrlc", "downcast-rs", @@ -825,19 +795,19 @@ dependencies = [ [[package]] name = "bevy_asset" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ "async-broadcast", "async-fs", "async-lock", "atomicow", - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_asset_macros 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_winit 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_app 0.15.0-dev", + "bevy_asset_macros 0.15.0-dev", + "bevy_ecs 0.15.0-dev", + "bevy_reflect 0.15.0-dev", + "bevy_tasks 0.15.0-dev", + "bevy_utils 0.15.0-dev", + "bevy_winit 0.15.0-dev", "blake3", "crossbeam-channel", "downcast-rs", @@ -856,39 +826,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "bevy_asset" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "async-broadcast", - "async-fs", - "async-lock", - "atomicow", - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_asset_macros 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_winit 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "blake3", - "crossbeam-channel", - "downcast-rs", - "futures-io", - "futures-lite", - "js-sys", - "parking_lot 0.12.3", - "ron", - "serde", - "stackfuture", - "thiserror", - "uuid 1.10.0", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "bevy_asset_macros" version = "0.14.1" @@ -904,20 +841,9 @@ dependencies = [ [[package]] name = "bevy_asset_macros" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", -] - -[[package]] -name = "bevy_asset_macros" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ - "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_macro_utils 0.15.0-dev", "proc-macro2 1.0.86", "quote 1.0.37", "syn 2.0.77", @@ -926,17 +852,17 @@ dependencies = [ [[package]] name = "bevy_audio" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" +dependencies = [ + "bevy_app 0.15.0-dev", + "bevy_asset 0.15.0-dev", + "bevy_derive 0.15.0-dev", + "bevy_ecs 0.15.0-dev", + "bevy_hierarchy 0.15.0-dev", + "bevy_math 0.15.0-dev", + "bevy_reflect 0.15.0-dev", + "bevy_transform 0.15.0-dev", + "bevy_utils 0.15.0-dev", "cpal 0.15.3", "rodio", ] @@ -944,24 +870,10 @@ dependencies = [ [[package]] name = "bevy_color" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ - "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bytemuck", - "encase", - "serde", - "thiserror", - "wgpu-types", -] - -[[package]] -name = "bevy_color" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_math 0.15.0-dev", + "bevy_reflect 0.15.0-dev", "bytemuck", "encase", "serde", @@ -1000,69 +912,32 @@ dependencies = [ [[package]] name = "bevy_core" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "uuid 1.10.0", -] - -[[package]] -name = "bevy_core" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_app 0.15.0-dev", + "bevy_ecs 0.15.0-dev", + "bevy_reflect 0.15.0-dev", + "bevy_tasks 0.15.0-dev", + "bevy_utils 0.15.0-dev", "uuid 1.10.0", ] [[package]] name = "bevy_core_pipeline" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bitflags 2.6.0", - "nonmax", - "radsort", - "serde", - "smallvec 1.13.2", - "thiserror", -] - -[[package]] -name = "bevy_core_pipeline" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" +dependencies = [ + "bevy_app 0.15.0-dev", + "bevy_asset 0.15.0-dev", + "bevy_color", + "bevy_core 0.15.0-dev", + "bevy_derive 0.15.0-dev", + "bevy_ecs 0.15.0-dev", + "bevy_math 0.15.0-dev", + "bevy_reflect 0.15.0-dev", + "bevy_render", + "bevy_transform 0.15.0-dev", + "bevy_utils 0.15.0-dev", "bitflags 2.6.0", "nonmax", "radsort", @@ -1085,19 +960,9 @@ dependencies = [ [[package]] name = "bevy_derive" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "quote 1.0.37", - "syn 2.0.77", -] - -[[package]] -name = "bevy_derive" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ - "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_macro_utils 0.15.0-dev", "quote 1.0.37", "syn 2.0.77", ] @@ -1120,32 +985,18 @@ dependencies = [ [[package]] name = "bevy_diagnostic" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_time 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" +dependencies = [ + "bevy_app 0.15.0-dev", + "bevy_core 0.15.0-dev", + "bevy_ecs 0.15.0-dev", + "bevy_tasks 0.15.0-dev", + "bevy_time 0.15.0-dev", + "bevy_utils 0.15.0-dev", "const-fnv1a-hash", "sysinfo", ] -[[package]] -name = "bevy_diagnostic" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_time 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "const-fnv1a-hash", -] - [[package]] name = "bevy_ecs" version = "0.14.1" @@ -1169,33 +1020,14 @@ dependencies = [ [[package]] name = "bevy_ecs" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ "arrayvec 0.7.6", - "bevy_ecs_macros 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ptr 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bitflags 2.6.0", - "concurrent-queue", - "fixedbitset 0.5.7", - "nonmax", - "petgraph 0.6.5", - "serde", - "thiserror", -] - -[[package]] -name = "bevy_ecs" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_ecs_macros 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ptr 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_ecs_macros 0.15.0-dev", + "bevy_ptr 0.15.0-dev", + "bevy_reflect 0.15.0-dev", + "bevy_tasks 0.15.0-dev", + "bevy_utils 0.15.0-dev", "bitflags 2.6.0", "concurrent-queue", "fixedbitset 0.5.7", @@ -1220,20 +1052,9 @@ dependencies = [ [[package]] name = "bevy_ecs_macros" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ - "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", -] - -[[package]] -name = "bevy_ecs_macros" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_macro_utils 0.15.0-dev", "proc-macro2 1.0.86", "quote 1.0.37", "syn 2.0.77", @@ -1249,7 +1070,7 @@ dependencies = [ "bytemuck", "console_log", "crossbeam-channel", - "egui 0.28.1", + "egui", "js-sys", "log", "thread_local", @@ -1271,7 +1092,7 @@ dependencies = [ "bytemuck", "console_log", "crossbeam-channel", - "egui 0.28.1", + "egui", "js-sys", "log", "thread_local", @@ -1286,31 +1107,22 @@ dependencies = [ [[package]] name = "bevy_encase_derive" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "encase_derive_impl 0.8.0", -] - -[[package]] -name = "bevy_encase_derive" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ - "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_macro_utils 0.15.0-dev", "encase_derive_impl 0.8.0", ] [[package]] name = "bevy_gilrs" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_input 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_time 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_app 0.15.0-dev", + "bevy_ecs 0.15.0-dev", + "bevy_input 0.15.0-dev", + "bevy_time 0.15.0-dev", + "bevy_utils 0.15.0-dev", "gilrs", "thiserror", ] @@ -1318,31 +1130,31 @@ dependencies = [ [[package]] name = "bevy_gizmos" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_core_pipeline 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_app 0.15.0-dev", + "bevy_asset 0.15.0-dev", + "bevy_color", + "bevy_core_pipeline", + "bevy_ecs 0.15.0-dev", "bevy_gizmos_macros", - "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_pbr 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_math 0.15.0-dev", + "bevy_pbr", + "bevy_reflect 0.15.0-dev", + "bevy_render", "bevy_sprite", - "bevy_time 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_time 0.15.0-dev", + "bevy_transform 0.15.0-dev", + "bevy_utils 0.15.0-dev", "bytemuck", ] [[package]] name = "bevy_gizmos_macros" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ - "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_macro_utils 0.15.0-dev", "proc-macro2 1.0.86", "quote 1.0.37", "syn 2.0.77", @@ -1351,25 +1163,25 @@ dependencies = [ [[package]] name = "bevy_gltf" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ "base64 0.22.1", "bevy_animation", - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_core_pipeline 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_pbr 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_app 0.15.0-dev", + "bevy_asset 0.15.0-dev", + "bevy_color", + "bevy_core 0.15.0-dev", + "bevy_core_pipeline", + "bevy_ecs 0.15.0-dev", + "bevy_hierarchy 0.15.0-dev", + "bevy_math 0.15.0-dev", + "bevy_pbr", + "bevy_reflect 0.15.0-dev", + "bevy_render", "bevy_scene", - "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_tasks 0.15.0-dev", + "bevy_transform 0.15.0-dev", + "bevy_utils 0.15.0-dev", "gltf", "percent-encoding 2.3.1", "serde", @@ -1395,26 +1207,13 @@ dependencies = [ [[package]] name = "bevy_hierarchy" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "smallvec 1.13.2", -] - -[[package]] -name = "bevy_hierarchy" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_app 0.15.0-dev", + "bevy_core 0.15.0-dev", + "bevy_ecs 0.15.0-dev", + "bevy_reflect 0.15.0-dev", + "bevy_utils 0.15.0-dev", "smallvec 1.13.2", ] @@ -1436,27 +1235,13 @@ dependencies = [ [[package]] name = "bevy_input" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "smol_str", - "thiserror", -] - -[[package]] -name = "bevy_input" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_app 0.15.0-dev", + "bevy_ecs 0.15.0-dev", + "bevy_math 0.15.0-dev", + "bevy_reflect 0.15.0-dev", + "bevy_utils 0.15.0-dev", "smol_str", "thiserror", ] @@ -1490,42 +1275,42 @@ dependencies = [ [[package]] name = "bevy_internal" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ - "bevy_a11y 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_a11y 0.15.0-dev", "bevy_animation", - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_app 0.15.0-dev", + "bevy_asset 0.15.0-dev", "bevy_audio", - "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_core_pipeline 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_diagnostic 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_color", + "bevy_core 0.15.0-dev", + "bevy_core_pipeline", + "bevy_derive 0.15.0-dev", + "bevy_diagnostic 0.15.0-dev", + "bevy_ecs 0.15.0-dev", "bevy_gilrs", "bevy_gizmos", "bevy_gltf", - "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_input 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_log 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_pbr 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_hierarchy 0.15.0-dev", + "bevy_input 0.15.0-dev", + "bevy_log 0.15.0-dev", + "bevy_math 0.15.0-dev", + "bevy_pbr", "bevy_picking", - "bevy_ptr 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ptr 0.15.0-dev", + "bevy_reflect 0.15.0-dev", + "bevy_render", "bevy_scene", "bevy_sprite", "bevy_state", - "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_tasks 0.15.0-dev", "bevy_text", - "bevy_time 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_time 0.15.0-dev", + "bevy_transform 0.15.0-dev", "bevy_ui", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_window 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_winit 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_utils 0.15.0-dev", + "bevy_window 0.15.0-dev", + "bevy_winit 0.15.0-dev", ] [[package]] @@ -1546,26 +1331,12 @@ dependencies = [ [[package]] name = "bevy_log" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ "android_log-sys", - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "tracing-log", - "tracing-subscriber", - "tracing-wasm", -] - -[[package]] -name = "bevy_log" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "android_log-sys", - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_app 0.15.0-dev", + "bevy_ecs 0.15.0-dev", + "bevy_utils 0.15.0-dev", "tracing-log", "tracing-subscriber", "tracing-wasm", @@ -1586,18 +1357,7 @@ dependencies = [ [[package]] name = "bevy_macro_utils" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", - "toml_edit 0.22.20", -] - -[[package]] -name = "bevy_macro_utils" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ "proc-macro2 1.0.86", "quote 1.0.37", @@ -1622,24 +1382,9 @@ dependencies = [ [[package]] name = "bevy_math" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "glam 0.28.0", - "itertools 0.13.0", - "rand 0.8.5", - "rand_distr", - "serde", - "smallvec 1.13.2", - "thiserror", -] - -[[package]] -name = "bevy_math" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_reflect 0.15.0-dev", "glam 0.28.0", "itertools 0.13.0", "rand 0.8.5", @@ -1652,15 +1397,7 @@ dependencies = [ [[package]] name = "bevy_mikktspace" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "glam 0.28.0", -] - -[[package]] -name = "bevy_mikktspace" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ "glam 0.28.0", ] @@ -1716,46 +1453,20 @@ dependencies = [ [[package]] name = "bevy_pbr" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_core_pipeline 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_window 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bitflags 2.6.0", - "bytemuck", - "fixedbitset 0.5.7", - "nonmax", - "radsort", - "smallvec 1.13.2", - "static_assertions", -] - -[[package]] -name = "bevy_pbr" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_core_pipeline 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_window 0.15.0-dev (git+https://github.com/bevyengine/bevy)", +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" +dependencies = [ + "bevy_app 0.15.0-dev", + "bevy_asset 0.15.0-dev", + "bevy_color", + "bevy_core_pipeline", + "bevy_derive 0.15.0-dev", + "bevy_ecs 0.15.0-dev", + "bevy_math 0.15.0-dev", + "bevy_reflect 0.15.0-dev", + "bevy_render", + "bevy_transform 0.15.0-dev", + "bevy_utils 0.15.0-dev", + "bevy_window 0.15.0-dev", "bitflags 2.6.0", "bytemuck", "fixedbitset 0.5.7", @@ -1768,21 +1479,21 @@ dependencies = [ [[package]] name = "bevy_picking" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_input 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_time 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_window 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" +dependencies = [ + "bevy_app 0.15.0-dev", + "bevy_asset 0.15.0-dev", + "bevy_derive 0.15.0-dev", + "bevy_ecs 0.15.0-dev", + "bevy_hierarchy 0.15.0-dev", + "bevy_input 0.15.0-dev", + "bevy_math 0.15.0-dev", + "bevy_reflect 0.15.0-dev", + "bevy_render", + "bevy_time 0.15.0-dev", + "bevy_transform 0.15.0-dev", + "bevy_utils 0.15.0-dev", + "bevy_window 0.15.0-dev", "uuid 1.10.0", ] @@ -1795,12 +1506,7 @@ checksum = "7ed72afbb6249a6803a3ed7bd2f68ff080d9392f550475e050b34c1e1c1e3e8f" [[package]] name = "bevy_ptr" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" - -[[package]] -name = "bevy_ptr" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" [[package]] name = "bevy_reflect" @@ -1824,11 +1530,11 @@ dependencies = [ [[package]] name = "bevy_reflect" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ - "bevy_ptr 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_reflect_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_ptr 0.15.0-dev", + "bevy_reflect_derive 0.15.0-dev", + "bevy_utils 0.15.0-dev", "downcast-rs", "erased-serde", "glam 0.28.0", @@ -1840,24 +1546,6 @@ dependencies = [ "uuid 1.10.0", ] -[[package]] -name = "bevy_reflect" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_ptr 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "downcast-rs", - "erased-serde", - "glam 0.28.0", - "serde", - "smallvec 1.13.2", - "smol_str", - "thiserror", - "uuid 1.10.0", -] - [[package]] name = "bevy_reflect_derive" version = "0.14.1" @@ -1874,21 +1562,9 @@ dependencies = [ [[package]] name = "bevy_reflect_derive" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ - "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", - "uuid 1.10.0", -] - -[[package]] -name = "bevy_reflect_derive" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_macro_utils 0.15.0-dev", "proc-macro2 1.0.86", "quote 1.0.37", "syn 2.0.77", @@ -1898,28 +1574,28 @@ dependencies = [ [[package]] name = "bevy_render" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ "async-channel", - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_diagnostic 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_encase_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_mikktspace 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_render_macros 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_time 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_window 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_winit 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_app 0.15.0-dev", + "bevy_asset 0.15.0-dev", + "bevy_color", + "bevy_core 0.15.0-dev", + "bevy_derive 0.15.0-dev", + "bevy_diagnostic 0.15.0-dev", + "bevy_ecs 0.15.0-dev", + "bevy_encase_derive", + "bevy_hierarchy 0.15.0-dev", + "bevy_math 0.15.0-dev", + "bevy_mikktspace", + "bevy_reflect 0.15.0-dev", + "bevy_render_macros", + "bevy_tasks 0.15.0-dev", + "bevy_time 0.15.0-dev", + "bevy_transform 0.15.0-dev", + "bevy_utils 0.15.0-dev", + "bevy_window 0.15.0-dev", + "bevy_winit 0.15.0-dev", "bitflags 2.6.0", "bytemuck", "codespan-reporting", @@ -1944,70 +1620,12 @@ dependencies = [ "wgpu", ] -[[package]] -name = "bevy_render" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "async-channel", - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_core 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_diagnostic 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_encase_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_mikktspace 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_render_macros 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_time 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_window 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_winit 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bitflags 2.6.0", - "bytemuck", - "codespan-reporting", - "downcast-rs", - "encase", - "futures-lite", - "hexasphere", - "image 0.25.2", - "js-sys", - "naga 22.1.0", - "naga_oil", - "nonmax", - "offset-allocator", - "send_wrapper", - "serde", - "smallvec 1.13.2", - "thiserror", - "wasm-bindgen", - "web-sys", - "wgpu", -] - -[[package]] -name = "bevy_render_macros" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", -] - [[package]] name = "bevy_render_macros" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ - "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_macro_utils 0.15.0-dev", "proc-macro2 1.0.86", "quote 1.0.37", "syn 2.0.77", @@ -2016,17 +1634,17 @@ dependencies = [ [[package]] name = "bevy_scene" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" +dependencies = [ + "bevy_app 0.15.0-dev", + "bevy_asset 0.15.0-dev", + "bevy_derive 0.15.0-dev", + "bevy_ecs 0.15.0-dev", + "bevy_hierarchy 0.15.0-dev", + "bevy_reflect 0.15.0-dev", + "bevy_render", + "bevy_transform 0.15.0-dev", + "bevy_utils 0.15.0-dev", "serde", "thiserror", "uuid 1.10.0", @@ -2035,21 +1653,21 @@ dependencies = [ [[package]] name = "bevy_sprite" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_core_pipeline 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" +dependencies = [ + "bevy_app 0.15.0-dev", + "bevy_asset 0.15.0-dev", + "bevy_color", + "bevy_core_pipeline", + "bevy_derive 0.15.0-dev", + "bevy_ecs 0.15.0-dev", + "bevy_math 0.15.0-dev", "bevy_picking", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_window 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_reflect 0.15.0-dev", + "bevy_render", + "bevy_transform 0.15.0-dev", + "bevy_utils 0.15.0-dev", + "bevy_window 0.15.0-dev", "bitflags 2.6.0", "bytemuck", "fixedbitset 0.5.7", @@ -2063,22 +1681,22 @@ dependencies = [ [[package]] name = "bevy_state" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_app 0.15.0-dev", + "bevy_ecs 0.15.0-dev", + "bevy_hierarchy 0.15.0-dev", + "bevy_reflect 0.15.0-dev", "bevy_state_macros", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_utils 0.15.0-dev", ] [[package]] name = "bevy_state_macros" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ - "bevy_macro_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_macro_utils 0.15.0-dev", "proc-macro2 1.0.86", "quote 1.0.37", "syn 2.0.77", @@ -2098,7 +1716,7 @@ dependencies = [ [[package]] name = "bevy_tasks" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ "async-channel", "async-executor", @@ -2109,35 +1727,23 @@ dependencies = [ "wasm-bindgen-futures", ] -[[package]] -name = "bevy_tasks" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "async-executor", - "futures-channel", - "futures-lite", - "pin-project", - "wasm-bindgen-futures", -] - [[package]] name = "bevy_text" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" +dependencies = [ + "bevy_app 0.15.0-dev", + "bevy_asset 0.15.0-dev", + "bevy_color", + "bevy_derive 0.15.0-dev", + "bevy_ecs 0.15.0-dev", + "bevy_math 0.15.0-dev", + "bevy_reflect 0.15.0-dev", + "bevy_render", "bevy_sprite", - "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_window 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_transform 0.15.0-dev", + "bevy_utils 0.15.0-dev", + "bevy_window 0.15.0-dev", "cosmic-text", "serde", "sys-locale", @@ -2162,25 +1768,12 @@ dependencies = [ [[package]] name = "bevy_time" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "crossbeam-channel", - "thiserror", -] - -[[package]] -name = "bevy_time" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_app 0.15.0-dev", + "bevy_ecs 0.15.0-dev", + "bevy_reflect 0.15.0-dev", + "bevy_utils 0.15.0-dev", "crossbeam-channel", "thiserror", ] @@ -2202,52 +1795,39 @@ dependencies = [ [[package]] name = "bevy_transform" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "thiserror", -] - -[[package]] -name = "bevy_transform" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_app 0.15.0-dev", + "bevy_ecs 0.15.0-dev", + "bevy_hierarchy 0.15.0-dev", + "bevy_math 0.15.0-dev", + "bevy_reflect 0.15.0-dev", "thiserror", ] [[package]] name = "bevy_ui" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_a11y 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_asset 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_color 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_core_pipeline 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_input 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" +dependencies = [ + "bevy_a11y 0.15.0-dev", + "bevy_app 0.15.0-dev", + "bevy_asset 0.15.0-dev", + "bevy_color", + "bevy_core_pipeline", + "bevy_derive 0.15.0-dev", + "bevy_ecs 0.15.0-dev", + "bevy_hierarchy 0.15.0-dev", + "bevy_input 0.15.0-dev", + "bevy_math 0.15.0-dev", "bevy_picking", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_render 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_reflect 0.15.0-dev", + "bevy_render", "bevy_sprite", "bevy_text", - "bevy_transform 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_window 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", + "bevy_transform 0.15.0-dev", + "bevy_utils 0.15.0-dev", + "bevy_window 0.15.0-dev", "bytemuck", "nonmax", "smallvec 1.13.2", @@ -2273,24 +1853,10 @@ dependencies = [ [[package]] name = "bevy_utils" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ "ahash", - "bevy_utils_proc_macros 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "getrandom 0.2.15", - "hashbrown 0.14.5", - "thread_local", - "tracing", - "web-time", -] - -[[package]] -name = "bevy_utils" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "ahash", - "bevy_utils_proc_macros 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_utils_proc_macros 0.15.0-dev", "getrandom 0.2.15", "hashbrown 0.14.5", "thread_local", @@ -2312,17 +1878,7 @@ dependencies = [ [[package]] name = "bevy_utils_proc_macros" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", -] - -[[package]] -name = "bevy_utils_proc_macros" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ "proc-macro2 1.0.86", "quote 1.0.37", @@ -2348,29 +1904,15 @@ dependencies = [ [[package]] name = "bevy_window" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_a11y 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "raw-window-handle", - "smol_str", -] - -[[package]] -name = "bevy_window" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "bevy_a11y 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" +dependencies = [ + "bevy_a11y 0.15.0-dev", + "bevy_app 0.15.0-dev", + "bevy_ecs 0.15.0-dev", + "bevy_input 0.15.0-dev", + "bevy_math 0.15.0-dev", + "bevy_reflect 0.15.0-dev", + "bevy_utils 0.15.0-dev", "raw-window-handle", "smol_str", ] @@ -2406,49 +1948,22 @@ dependencies = [ [[package]] name = "bevy_winit" version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy?branch=main#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" -dependencies = [ - "accesskit_winit 0.22.0", - "approx 0.5.1", - "bevy_a11y 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_input 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_log 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "bevy_window 0.15.0-dev (git+https://github.com/bevyengine/bevy?branch=main)", - "cfg-if 1.0.0", - "crossbeam-channel", - "raw-window-handle", - "wasm-bindgen", - "web-sys", - "winit", -] - -[[package]] -name = "bevy_winit" -version = "0.15.0-dev" -source = "git+https://github.com/bevyengine/bevy#41474226c3b8efa1c4515a3a39e79dcb127ea5c6" +source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ "accesskit_winit 0.22.0", "approx 0.5.1", - "bevy_a11y 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_app 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_derive 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_ecs 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_hierarchy 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_input 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_log 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_math 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_reflect 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_tasks 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_utils 0.15.0-dev (git+https://github.com/bevyengine/bevy)", - "bevy_window 0.15.0-dev (git+https://github.com/bevyengine/bevy)", + "bevy_a11y 0.15.0-dev", + "bevy_app 0.15.0-dev", + "bevy_derive 0.15.0-dev", + "bevy_ecs 0.15.0-dev", + "bevy_hierarchy 0.15.0-dev", + "bevy_input 0.15.0-dev", + "bevy_log 0.15.0-dev", + "bevy_math 0.15.0-dev", + "bevy_reflect 0.15.0-dev", + "bevy_tasks 0.15.0-dev", + "bevy_utils 0.15.0-dev", + "bevy_window 0.15.0-dev", "cfg-if 1.0.0", "crossbeam-channel", "raw-window-handle", @@ -2845,9 +2360,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.15" +version = "1.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b" dependencies = [ "jobserver", "libc", @@ -3603,12 +3118,6 @@ version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" -[[package]] -name = "ecolor" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20930a432bbd57a6d55e07976089708d4893f3d556cf42a0d79e9e321fa73b10" - [[package]] name = "ecolor" version = "0.28.1" @@ -3616,18 +3125,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e6b451ff1143f6de0f33fc7f1b68fecfd2c7de06e104de96c4514de3f5396f8" dependencies = [ "bytemuck", - "emath 0.28.1", -] - -[[package]] -name = "egui" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "584c5d1bf9a67b25778a3323af222dbe1a1feb532190e103901187f92c7fe29a" -dependencies = [ - "ahash", - "epaint 0.27.2", - "nohash-hasher", + "emath", ] [[package]] @@ -3637,32 +3135,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20c97e70a2768de630f161bb5392cbd3874fcf72868f14df0e002e82e06cb798" dependencies = [ "ahash", - "emath 0.28.1", - "epaint 0.28.1", + "emath", + "epaint", "nohash-hasher", ] -[[package]] -name = "egui-dropdown" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240e9423d44c6fd18a72208b442b1101ac871f9636c06d30cc6555d125f57db0" -dependencies = [ - "egui 0.27.2", -] - [[package]] name = "either" version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" -[[package]] -name = "emath" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c3a552cfca14630702449d35f41c84a0d15963273771c6059175a803620f3f" - [[package]] name = "emath" version = "0.28.1" @@ -3737,20 +3220,6 @@ dependencies = [ "termcolor", ] -[[package]] -name = "epaint" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b381f8b149657a4acf837095351839f32cd5c4aec1817fc4df84e18d76334176" -dependencies = [ - "ab_glyph", - "ahash", - "ecolor 0.27.2", - "emath 0.27.2", - "nohash-hasher", - "parking_lot 0.12.3", -] - [[package]] name = "epaint" version = "0.28.1" @@ -3760,8 +3229,8 @@ dependencies = [ "ab_glyph", "ahash", "bytemuck", - "ecolor 0.28.1", - "emath 0.28.1", + "ecolor", + "emath", "nohash-hasher", "parking_lot 0.12.3", ] @@ -7290,9 +6759,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quick-xml" -version = "0.34.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" +checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" dependencies = [ "memchr", ] @@ -7967,9 +7436,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.35" +version = "0.38.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" +checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36" dependencies = [ "bitflags 2.6.0", "errno", @@ -8179,9 +7648,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa 1.0.11", "memchr", @@ -9490,9 +8959,9 @@ checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wayland-backend" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993" +checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" dependencies = [ "cc", "downcast-rs", @@ -9504,9 +8973,9 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.5" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943" +checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d" dependencies = [ "bitflags 2.6.0", "rustix", @@ -9527,9 +8996,9 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.31.5" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef9489a8df197ebf3a8ce8a7a7f0a2320035c3743f3c1bd0bdbccf07ce64f95" +checksum = "3a94697e66e76c85923b0d28a0c251e8f0666f58fc47d316c0f4da6da75d37cb" dependencies = [ "rustix", "wayland-client", @@ -9538,9 +9007,9 @@ dependencies = [ [[package]] name = "wayland-protocols" -version = "0.32.3" +version = "0.32.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa" +checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -9550,9 +9019,9 @@ dependencies = [ [[package]] name = "wayland-protocols-plasma" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79f2d57c7fcc6ab4d602adba364bf59a5c24de57bd194486bf9b8360e06bfc4" +checksum = "8a0a41a6875e585172495f7a96dfa42ca7e0213868f4f15c313f7c33221a7eff" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -9563,9 +9032,9 @@ dependencies = [ [[package]] name = "wayland-protocols-wlr" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953" +checksum = "dad87b5fd1b1d3ca2f792df8f686a2a11e3fe1077b71096f7a175ab699f89109" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -9576,9 +9045,9 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.4" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" +checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" dependencies = [ "proc-macro2 1.0.86", "quick-xml", @@ -9587,9 +9056,9 @@ dependencies = [ [[package]] name = "wayland-sys" -version = "0.31.4" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148" +checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09" dependencies = [ "dlib", "log", diff --git a/default.nix b/default.nix index 4eace552d..b47d9025e 100644 --- a/default.nix +++ b/default.nix @@ -25,8 +25,8 @@ rustPlatform.buildRustPackage rec { lockFile = ./Cargo.lock; outputHashes = { "skeptic-0.13.8" = "sha256-LLVrpuyQsMdbp8OYcHN0nq+uKC8xgJzpNy+gyXxTYbo="; - "bevy-0.15.0-dev" = "sha256-OFDC0s4EKPRhitwF2QliZmWALT5gyiL/+woW1cbU/NU="; - "bevy-inspector-egui-0.24.0" = "sha256-SmWKXNRvcgDdsyB8mzjUwxGucm6XbXtHzDOk8SJ+2yY="; + "bevy-0.15.0-dev" = "sha256-hVXJdAZLxsmLGt7ZDPg7vmsimz5j8GZhW5lKR93+Kzs="; + "bevy-inspector-egui-0.25.2" = "sha256-yjzmnHAxkejNtW8+cOV85IiGRM0614D7WtiauE6KWMA="; "bevy_egui-0.29.0" = "sha256-3UiUBpDhpud42ZcDwPHhSzmnlXkd9rH14lqXeRHdLlU="; }; }; diff --git a/flake.lock b/flake.lock index 8491e1930..32979ead0 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "lastModified": 1725432240, + "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "rev": "ad416d066ca1222956472ab7d0555a6946746a80", "type": "github" }, "original": { From 6b6288b2f099a47cd98f4adc0e1183ebb32f8dfb Mon Sep 17 00:00:00 2001 From: Charlotte McElwain Date: Thu, 5 Sep 2024 18:33:38 -0700 Subject: [PATCH 11/17] Upgrade. --- nannou/src/app.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nannou/src/app.rs b/nannou/src/app.rs index fb359e79d..c35be3b24 100644 --- a/nannou/src/app.rs +++ b/nannou/src/app.rs @@ -33,9 +33,9 @@ use bevy::reflect::{ }; use bevy::window::{ ExitCondition, Monitor, PrimaryMonitor, PrimaryWindow, WindowClosed, WindowFocused, - WindowResized, + WindowResized, WindowEvent }; -use bevy::winit::{UpdateMode, WinitEvent, WinitSettings}; +use bevy::winit::{UpdateMode, WinitSettings}; #[cfg(feature = "egui")] use bevy_egui::EguiContext; #[cfg(feature = "egui")] @@ -98,7 +98,7 @@ impl Clone for View { } /// A nannou `App` builder. -pub struct Builder { +pub struct Builder { app: bevy::app::App, model: ModelFn, config: Config, @@ -110,7 +110,7 @@ pub struct Builder { } /// A nannou `Sketch` builder. -pub struct SketchBuilder { +pub struct SketchBuilder { builder: Builder<(), E>, } From 5f95242c721d2dc40748df486e76f425ec537286 Mon Sep 17 00:00:00 2001 From: Charlotte McElwain Date: Thu, 5 Sep 2024 18:35:03 -0700 Subject: [PATCH 12/17] Fmt. --- nannou/src/app.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nannou/src/app.rs b/nannou/src/app.rs index c35be3b24..825e5fe34 100644 --- a/nannou/src/app.rs +++ b/nannou/src/app.rs @@ -32,8 +32,8 @@ use bevy::reflect::{ TypeInfo, }; use bevy::window::{ - ExitCondition, Monitor, PrimaryMonitor, PrimaryWindow, WindowClosed, WindowFocused, - WindowResized, WindowEvent + ExitCondition, Monitor, PrimaryMonitor, PrimaryWindow, WindowClosed, WindowEvent, + WindowFocused, WindowResized, }; use bevy::winit::{UpdateMode, WinitSettings}; #[cfg(feature = "egui")] From 829acb2490e6d44562160dffa8769f70516bb6a3 Mon Sep 17 00:00:00 2001 From: Charlotte McElwain Date: Thu, 5 Sep 2024 18:42:56 -0700 Subject: [PATCH 13/17] Rebase. --- Cargo.lock | 1195 ++++++++++++++++++---------------------- nannou_wgpu/Cargo.toml | 3 +- 2 files changed, 543 insertions(+), 655 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6606df29e..7d724904f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -145,12 +145,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "adler2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" - [[package]] name = "adler32" version = "1.2.0" @@ -214,13 +208,12 @@ dependencies = [ [[package]] name = "alsa" -version = "0.9.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43" +checksum = "37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce" dependencies = [ "alsa-sys", "bitflags 2.6.0", - "cfg-if 1.0.0", "libc", ] @@ -251,7 +244,7 @@ dependencies = [ "ndk 0.9.0", "ndk-context", "ndk-sys 0.6.0+11769913", - "num_enum 0.7.3", + "num_enum 0.7.2", "thiserror", ] @@ -346,15 +339,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] name = "arrayref" -version = "0.3.8" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" @@ -373,18 +366,12 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "arrayvec" -version = "0.7.6" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -<<<<<<< HEAD checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" dependencies = [ "serde", ] -||||||| parent of a76e8ed (0.15-dev) -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -======= -checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" ->>>>>>> a76e8ed (0.15-dev) [[package]] name = "as-raw-xcb-connection" @@ -445,9 +432,9 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.13.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" dependencies = [ "async-task", "concurrent-queue", @@ -544,7 +531,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" dependencies = [ "anyhow", - "arrayvec 0.7.6", + "arrayvec 0.7.4", "log", "nom 7.1.3", "num-rational 0.4.2", @@ -557,7 +544,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" dependencies = [ - "arrayvec 0.7.6", + "arrayvec 0.7.4", ] [[package]] @@ -614,11 +601,11 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bevy" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ece0d8dde51890fb52dcba5b04fd1c657617a4022908c327b2d6e83d173a32" +checksum = "8e938630e9f472b1899c78ef84aa907081b23bad8333140e2295c620485b6ee7" dependencies = [ - "bevy_internal 0.14.1", + "bevy_internal 0.14.0", ] [[package]] @@ -667,20 +654,20 @@ version = "0.25.1" source = "git+https://github.com/tychedelia/bevy-inspector-egui?branch=main#1a4e9a31cb5f4a242697a19a2f03765e463edb66" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] name = "bevy_a11y" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d84e0ae7155afa21c4926fb8b89ebe0cbd66239ac817fdb834025327c4089b" +checksum = "3e613f0e7d5a92637e59744f7185e374c9a59654ecc6d7575adcec9581db1363" dependencies = [ "accesskit 0.14.0", - "bevy_app 0.14.1", - "bevy_derive 0.14.1", - "bevy_ecs 0.14.1", + "bevy_app 0.14.0", + "bevy_derive 0.14.0", + "bevy_ecs 0.14.0", ] [[package]] @@ -721,20 +708,20 @@ dependencies = [ "serde", "thiserror", "thread_local", - "uuid 1.10.0", + "uuid 1.9.1", ] [[package]] name = "bevy_app" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0af99549f5de61cc91c8c23303b13aa07f97b73fbace39695dee0a0a32cec9d4" +checksum = "6f548e9dab7d10c5f99e3b504c758c4bf87aa67df9bcb9cc8b317a0271770e72" dependencies = [ - "bevy_derive 0.14.1", - "bevy_ecs 0.14.1", - "bevy_reflect 0.14.1", - "bevy_tasks 0.14.1", - "bevy_utils 0.14.1", + "bevy_derive 0.14.0", + "bevy_ecs 0.14.0", + "bevy_reflect 0.14.0", + "bevy_tasks 0.14.0", + "bevy_utils 0.14.0", "console_error_panic_hook", "downcast-rs", "thiserror", @@ -762,20 +749,20 @@ dependencies = [ [[package]] name = "bevy_asset" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6533d17f13b44ea4fb5177f83b0900269ed13c0fd45772ccffd19a69980647ec" +checksum = "f9d198e4c3419215de2ad981d4e734bbfab46469b7575e3b7150c912b9ec5175" dependencies = [ "async-broadcast", "async-fs", "async-lock", - "bevy_app 0.14.1", - "bevy_asset_macros 0.14.1", - "bevy_ecs 0.14.1", - "bevy_reflect 0.14.1", - "bevy_tasks 0.14.1", - "bevy_utils 0.14.1", - "bevy_winit 0.14.1", + "bevy_app 0.14.0", + "bevy_asset_macros 0.14.0", + "bevy_ecs 0.14.0", + "bevy_reflect 0.14.0", + "bevy_tasks 0.14.0", + "bevy_utils 0.14.0", + "bevy_winit 0.14.0", "blake3", "crossbeam-channel", "downcast-rs", @@ -786,7 +773,7 @@ dependencies = [ "ron", "serde", "thiserror", - "uuid 1.10.0", + "uuid 1.9.1", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -820,7 +807,7 @@ dependencies = [ "serde", "stackfuture", "thiserror", - "uuid 1.10.0", + "uuid 1.9.1", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -828,14 +815,14 @@ dependencies = [ [[package]] name = "bevy_asset_macros" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b0e132a89e254c0f5c8bc8deebb0f2490f5662f4aa2215a6996701446d6a7b" +checksum = "11b2cbeba287a4b44e116c33dbaf37dce80a9d84477b2bb35ff459999d6c9e1b" dependencies = [ - "bevy_macro_utils 0.14.1", + "bevy_macro_utils 0.14.0", "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -845,8 +832,8 @@ source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad dependencies = [ "bevy_macro_utils 0.15.0-dev", "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -888,25 +875,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f631ce2863f3b6f1af3fa24143363b9fbd21c44218caad495a17b83e6968256" dependencies = [ "anyhow", - "bevy 0.14.1", + "bevy 0.14.0", "serde", "serde_json", "thiserror", - "toml 0.8.19", + "toml 0.8.14", ] [[package]] name = "bevy_core" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccc7118a2865267136afb5e6a2c0aed30994e522f298b2ba0b088878e6ddf59" +checksum = "6ddeed5ebf2fa75a4d4f32e2da9c60f11037e36252695059a151c6685cd3d72b" dependencies = [ - "bevy_app 0.14.1", - "bevy_ecs 0.14.1", - "bevy_reflect 0.14.1", - "bevy_tasks 0.14.1", - "bevy_utils 0.14.1", - "uuid 1.10.0", + "bevy_app 0.14.0", + "bevy_ecs 0.14.0", + "bevy_reflect 0.14.0", + "bevy_tasks 0.14.0", + "bevy_utils 0.14.0", + "uuid 1.9.1", ] [[package]] @@ -919,7 +906,7 @@ dependencies = [ "bevy_reflect 0.15.0-dev", "bevy_tasks 0.15.0-dev", "bevy_utils 0.15.0-dev", - "uuid 1.10.0", + "uuid 1.9.1", ] [[package]] @@ -948,13 +935,13 @@ dependencies = [ [[package]] name = "bevy_derive" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8675f337f374b2b8ae90539982b947d171f9adb302d00c032b823bd5231f8978" +checksum = "c8a8173bad3ed53fa158806b1beda147263337d6ef71a093780dd141b74386b1" dependencies = [ - "bevy_macro_utils 0.14.1", - "quote 1.0.37", - "syn 2.0.77", + "bevy_macro_utils 0.14.0", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -963,22 +950,22 @@ version = "0.15.0-dev" source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ "bevy_macro_utils 0.15.0-dev", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] name = "bevy_diagnostic" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdcc1d7ba5797e4285a7867227134d4cabaaf8cabfb7cdc42eb697d3b3db0460" +checksum = "0b7f82011fd70048be282526a99756d54bf00e874edafa9664ba0dc247678f03" dependencies = [ - "bevy_app 0.14.1", - "bevy_core 0.14.1", - "bevy_ecs 0.14.1", - "bevy_tasks 0.14.1", - "bevy_time 0.14.1", - "bevy_utils 0.14.1", + "bevy_app 0.14.0", + "bevy_core 0.14.0", + "bevy_ecs 0.14.0", + "bevy_tasks 0.14.0", + "bevy_time 0.14.0", + "bevy_utils 0.14.0", "const-fnv1a-hash", ] @@ -999,21 +986,20 @@ dependencies = [ [[package]] name = "bevy_ecs" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a3eed7f144811946ebfa1c740da9e3bcd6dd2dd4da844eda085249d29bc9fef" +checksum = "2c77fdc3a7230eff2fcebe4bd17c155bd238c660a0089d0f98c39ba0d461b923" dependencies = [ - "bevy_ecs_macros 0.14.1", - "bevy_ptr 0.14.1", - "bevy_reflect 0.14.1", - "bevy_tasks 0.14.1", - "bevy_utils 0.14.1", + "bevy_ecs_macros 0.14.0", + "bevy_ptr 0.14.0", + "bevy_reflect 0.14.0", + "bevy_tasks 0.14.0", + "bevy_utils 0.14.0", "bitflags 2.6.0", "concurrent-queue", "fixedbitset 0.5.7", "nonmax", "petgraph 0.6.5", - "serde", "thiserror", ] @@ -1022,7 +1008,7 @@ name = "bevy_ecs" version = "0.15.0-dev" source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ - "arrayvec 0.7.6", + "arrayvec 0.7.4", "bevy_ecs_macros 0.15.0-dev", "bevy_ptr 0.15.0-dev", "bevy_reflect 0.15.0-dev", @@ -1039,14 +1025,14 @@ dependencies = [ [[package]] name = "bevy_ecs_macros" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d523630f2eb9fde6727e6c5ea48fa708079c5345da21ffeb1a4bd8ca761830da" +checksum = "9272b511958525306cd141726d3ca59740f79fc0707c439b55a007bcc3497308" dependencies = [ - "bevy_macro_utils 0.14.1", + "bevy_macro_utils 0.14.0", "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -1056,8 +1042,8 @@ source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad dependencies = [ "bevy_macro_utils 0.15.0-dev", "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -1156,8 +1142,8 @@ source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad dependencies = [ "bevy_macro_utils 0.15.0-dev", "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -1192,15 +1178,15 @@ dependencies = [ [[package]] name = "bevy_hierarchy" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb332d2789442ca1577c765977bafefea1dcd4db29479713ec8c6932dfb82cdb" +checksum = "802eca6f341d19ade790ccfaba7044be4d823b708087eb5ac4c1f74e4ea0916a" dependencies = [ - "bevy_app 0.14.1", - "bevy_core 0.14.1", - "bevy_ecs 0.14.1", - "bevy_reflect 0.14.1", - "bevy_utils 0.14.1", + "bevy_app 0.14.0", + "bevy_core 0.14.0", + "bevy_ecs 0.14.0", + "bevy_reflect 0.14.0", + "bevy_utils 0.14.0", "smallvec 1.13.2", ] @@ -1219,15 +1205,15 @@ dependencies = [ [[package]] name = "bevy_input" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9ce5f27a8729b473205b01927cd6a5c4898a004cb8fcffa7c896e19ba999d98" +checksum = "2d050f1433f48ca23f1ea078734ebff119a3f76eb7d221725ab0f1fd9f81230b" dependencies = [ - "bevy_app 0.14.1", - "bevy_ecs 0.14.1", - "bevy_math 0.14.1", - "bevy_reflect 0.14.1", - "bevy_utils 0.14.1", + "bevy_app 0.14.0", + "bevy_ecs 0.14.0", + "bevy_math 0.14.0", + "bevy_reflect 0.14.0", + "bevy_utils 0.14.0", "smol_str", "thiserror", ] @@ -1248,28 +1234,28 @@ dependencies = [ [[package]] name = "bevy_internal" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2463102e46d7d67440dbfe3bc97d34bf529c93191c4f4bb41395f4982062ff3" -dependencies = [ - "bevy_a11y 0.14.1", - "bevy_app 0.14.1", - "bevy_asset 0.14.1", - "bevy_core 0.14.1", - "bevy_derive 0.14.1", - "bevy_diagnostic 0.14.1", - "bevy_ecs 0.14.1", - "bevy_hierarchy 0.14.1", - "bevy_input 0.14.1", - "bevy_log 0.14.1", - "bevy_math 0.14.1", - "bevy_ptr 0.14.1", - "bevy_reflect 0.14.1", - "bevy_tasks 0.14.1", - "bevy_time 0.14.1", - "bevy_transform 0.14.1", - "bevy_utils 0.14.1", - "bevy_window 0.14.1", +checksum = "8ddd2b23e44d3a1f8ae547cbee5b6661f8135cc456c5de206e8648789944e7a1" +dependencies = [ + "bevy_a11y 0.14.0", + "bevy_app 0.14.0", + "bevy_asset 0.14.0", + "bevy_core 0.14.0", + "bevy_derive 0.14.0", + "bevy_diagnostic 0.14.0", + "bevy_ecs 0.14.0", + "bevy_hierarchy 0.14.0", + "bevy_input 0.14.0", + "bevy_log 0.14.0", + "bevy_math 0.14.0", + "bevy_ptr 0.14.0", + "bevy_reflect 0.14.0", + "bevy_tasks 0.14.0", + "bevy_time 0.14.0", + "bevy_transform 0.14.0", + "bevy_utils 0.14.0", + "bevy_window 0.14.0", ] [[package]] @@ -1315,14 +1301,14 @@ dependencies = [ [[package]] name = "bevy_log" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f2c0c374af59007396793a51f747f6b10d74ca4acfb080ce0ade267118827b" +checksum = "bab641fd0de254915ab746165a07677465b2d89b72f5b49367d73b9197548a35" dependencies = [ "android_log-sys", - "bevy_app 0.14.1", - "bevy_ecs 0.14.1", - "bevy_utils 0.14.1", + "bevy_app 0.14.0", + "bevy_ecs 0.14.0", + "bevy_utils 0.14.0", "tracing-log", "tracing-subscriber", "tracing-wasm", @@ -1344,14 +1330,14 @@ dependencies = [ [[package]] name = "bevy_macro_utils" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ec4a585ec2a6dedd4f4143c07219d120ae142121929f0d83e68d82a452cdc9b" +checksum = "c3ad860d35d74b35d4d6ae7f656d163b6f475aa2e64fc293ee86ac901977ddb7" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", - "toml_edit 0.22.20", + "quote 1.0.36", + "syn 2.0.69", + "toml_edit 0.22.14", ] [[package]] @@ -1360,21 +1346,20 @@ version = "0.15.0-dev" source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", - "toml_edit 0.22.20", + "quote 1.0.36", + "syn 2.0.69", + "toml_edit 0.22.14", ] [[package]] name = "bevy_math" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40253578fe83a5ffe5f4fcb4dfa196b7d9c50f36dc8efaa231a53344bf4b3e57" +checksum = "51bd6ce2174d3237d30e0ab5b2508480cc7593ca4d96ffb3a3095f9fc6bbc34c" dependencies = [ - "bevy_reflect 0.14.1", + "bevy_reflect 0.14.0", "glam 0.27.0", "rand 0.8.5", - "serde", "smallvec 1.13.2", "thiserror", ] @@ -1423,7 +1408,7 @@ dependencies = [ "num-traits", "rayon", "rusttype", - "uuid 1.10.0", + "uuid 1.9.1", ] [[package]] @@ -1494,14 +1479,14 @@ dependencies = [ "bevy_transform 0.15.0-dev", "bevy_utils 0.15.0-dev", "bevy_window 0.15.0-dev", - "uuid 1.10.0", + "uuid 1.9.1", ] [[package]] name = "bevy_ptr" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ed72afbb6249a6803a3ed7bd2f68ff080d9392f550475e050b34c1e1c1e3e8f" +checksum = "c115c97a5c8a263bd0aa7001b999772c744ac5ba797d07c86f25734ce381ea69" [[package]] name = "bevy_ptr" @@ -1510,13 +1495,13 @@ source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad [[package]] name = "bevy_reflect" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb37e8fc3c61d04da480c95cc8c303aa7781afed6be01dae333b336af493c38e" +checksum = "406ea0fce267169c2320c7302d97d09f605105686346762562c5f65960b5ca2f" dependencies = [ - "bevy_ptr 0.14.1", - "bevy_reflect_derive 0.14.1", - "bevy_utils 0.14.1", + "bevy_ptr 0.14.0", + "bevy_reflect_derive 0.14.0", + "bevy_utils 0.14.0", "downcast-rs", "erased-serde", "glam 0.27.0", @@ -1524,7 +1509,7 @@ dependencies = [ "smallvec 1.13.2", "smol_str", "thiserror", - "uuid 1.10.0", + "uuid 1.9.1", ] [[package]] @@ -1543,20 +1528,20 @@ dependencies = [ "smallvec 1.13.2", "smol_str", "thiserror", - "uuid 1.10.0", + "uuid 1.9.1", ] [[package]] name = "bevy_reflect_derive" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc00d5086f5bf534b4c2dbeba549a6b8d3223515f3cb5ba4fdaabe953ec6cea" +checksum = "0427fdb4425fc72cc96d45e550df83ace6347f0503840de116c76a40843ba751" dependencies = [ - "bevy_macro_utils 0.14.1", + "bevy_macro_utils 0.14.0", "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", - "uuid 1.10.0", + "quote 1.0.36", + "syn 2.0.69", + "uuid 1.9.1", ] [[package]] @@ -1566,9 +1551,9 @@ source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad dependencies = [ "bevy_macro_utils 0.15.0-dev", "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", - "uuid 1.10.0", + "quote 1.0.36", + "syn 2.0.69", + "uuid 1.9.1", ] [[package]] @@ -1627,8 +1612,8 @@ source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad dependencies = [ "bevy_macro_utils 0.15.0-dev", "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -1647,7 +1632,7 @@ dependencies = [ "bevy_utils 0.15.0-dev", "serde", "thiserror", - "uuid 1.10.0", + "uuid 1.9.1", ] [[package]] @@ -1698,15 +1683,15 @@ source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad dependencies = [ "bevy_macro_utils 0.15.0-dev", "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] name = "bevy_tasks" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f5414c3f49c96e02ceccf5fa12fb6cfbf8b271d2a820902d6f622e9c2fa681" +checksum = "5a8bfb8d484bdb1e9bec3789c75202adc5e608c4244347152e50fb31668a54f9" dependencies = [ "async-executor", "futures-lite", @@ -1753,14 +1738,14 @@ dependencies = [ [[package]] name = "bevy_time" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3fb18cfac62098e07786e422e84b4f45f469f27ccb5b572b409500bef465f33" +checksum = "a6c3d3d14ee8b0dbe4819fd516cc75509b61946134d78e0ee89ad3d1835ffe6c" dependencies = [ - "bevy_app 0.14.1", - "bevy_ecs 0.14.1", - "bevy_reflect 0.14.1", - "bevy_utils 0.14.1", + "bevy_app 0.14.0", + "bevy_ecs 0.14.0", + "bevy_reflect 0.14.0", + "bevy_utils 0.14.0", "crossbeam-channel", "thiserror", ] @@ -1780,15 +1765,15 @@ dependencies = [ [[package]] name = "bevy_transform" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ff09cea0dd0d4e6a3ed5f7dcbd4fbbcec07e518ceb64a4c8a75dedbe294ab60" +checksum = "97e8aa6b16be573277c6ceda30aebf1d78af7c6ede19b448dcb052fb8601d815" dependencies = [ - "bevy_app 0.14.1", - "bevy_ecs 0.14.1", - "bevy_hierarchy 0.14.1", - "bevy_math 0.14.1", - "bevy_reflect 0.14.1", + "bevy_app 0.14.0", + "bevy_ecs 0.14.0", + "bevy_hierarchy 0.14.0", + "bevy_math 0.14.0", + "bevy_reflect 0.14.0", "thiserror", ] @@ -1837,12 +1822,12 @@ dependencies = [ [[package]] name = "bevy_utils" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6efbe5a621b56cc4ffa41074929eca84107e242302496b9bb7550675e6bf2e7" +checksum = "7fab364910e8f5839578aba9cfda00a8388e9ebe352ceb8491a742ce6af9ec6e" dependencies = [ "ahash", - "bevy_utils_proc_macros 0.14.1", + "bevy_utils_proc_macros 0.14.0", "getrandom 0.2.15", "hashbrown 0.14.5", "thread_local", @@ -1866,13 +1851,13 @@ dependencies = [ [[package]] name = "bevy_utils_proc_macros" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36a1e91b4294cad2d08620ac062509395d4f65247b636946d6497eaeccf4dbfd" +checksum = "ad9db261ab33a046e1f54b35f885a44f21fcc80aa2bc9050319466b88fe58fe3" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -1881,22 +1866,22 @@ version = "0.15.0-dev" source = "git+https://github.com/bevyengine/bevy?branch=main#54aa45e62ff10cf03ad21986805ca4faa1e5a512" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] name = "bevy_window" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ba11880f05a3b267ecfa4149fe789b0c046c35fd8418dd8899fad3a4359c986" +checksum = "c9ea5777f933bf7ecaeb3af1a30845720ec730e007972ca7d4aba2d3512abe24" dependencies = [ - "bevy_a11y 0.14.1", - "bevy_app 0.14.1", - "bevy_ecs 0.14.1", - "bevy_math 0.14.1", - "bevy_reflect 0.14.1", - "bevy_utils 0.14.1", + "bevy_a11y 0.14.0", + "bevy_app 0.14.0", + "bevy_ecs 0.14.0", + "bevy_math 0.14.0", + "bevy_reflect 0.14.0", + "bevy_utils 0.14.0", "raw-window-handle", "smol_str", ] @@ -1919,24 +1904,24 @@ dependencies = [ [[package]] name = "bevy_winit" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5aeb4b2e3b1ece189fcf37ea2de625ceab93e6ac2a14d4b15b0393351e4c18b" +checksum = "f8c2213bbf14debe819ec8ad4913f233c596002d087bc6f1f20d533e2ebaf8c6" dependencies = [ "accesskit_winit 0.20.4", "approx 0.5.1", - "bevy_a11y 0.14.1", - "bevy_app 0.14.1", - "bevy_derive 0.14.1", - "bevy_ecs 0.14.1", - "bevy_hierarchy 0.14.1", - "bevy_input 0.14.1", - "bevy_log 0.14.1", - "bevy_math 0.14.1", - "bevy_reflect 0.14.1", - "bevy_tasks 0.14.1", - "bevy_utils 0.14.1", - "bevy_window 0.14.1", + "bevy_a11y 0.14.0", + "bevy_app 0.14.0", + "bevy_derive 0.14.0", + "bevy_ecs 0.14.0", + "bevy_hierarchy 0.14.0", + "bevy_input 0.14.0", + "bevy_log 0.14.0", + "bevy_math 0.14.0", + "bevy_reflect 0.14.0", + "bevy_tasks 0.14.0", + "bevy_utils 0.14.0", + "bevy_window 0.14.0", "cfg-if 1.0.0", "crossbeam-channel", "raw-window-handle", @@ -1987,11 +1972,11 @@ dependencies = [ "log", "prettyplease", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "regex", "rustc-hash", "shlex", - "syn 2.0.77", + "syn 2.0.69", "which", ] @@ -2066,18 +2051,18 @@ dependencies = [ [[package]] name = "bitstream-io" -version = "2.5.3" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452" +checksum = "415f8399438eb5e4b2f73ed3152a3448b98149dda642a957ee704e1daa5cf1d8" [[package]] name = "blake3" -version = "1.5.4" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" +checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" dependencies = [ "arrayref", - "arrayvec 0.7.6", + "arrayvec 0.7.4", "cc", "cfg-if 1.0.0", "constant_time_eq", @@ -2122,9 +2107,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.10.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", "serde", @@ -2132,9 +2117,9 @@ dependencies = [ [[package]] name = "built" -version = "0.7.4" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4" +checksum = "c6a6c0b39c38fd754ac338b00a88066436389c0f029da5d37d1e01091d9b7c17" [[package]] name = "bumpalo" @@ -2150,22 +2135,22 @@ checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" [[package]] name = "bytemuck" -version = "1.17.1" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.7.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" +checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -2193,9 +2178,9 @@ dependencies = [ [[package]] name = "bytes" -version = "1.7.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "bytesize" @@ -2241,9 +2226,9 @@ dependencies = [ [[package]] name = "calloop" -version = "0.13.0" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" +checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ "bitflags 2.6.0", "log", @@ -2255,9 +2240,9 @@ dependencies = [ [[package]] name = "calloop-wayland-source" -version = "0.3.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" dependencies = [ "calloop", "rustix", @@ -2267,9 +2252,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.9" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" +checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" dependencies = [ "serde", ] @@ -2360,13 +2345,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.16" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b" +checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" dependencies = [ "jobserver", "libc", - "shlex", + "once_cell", ] [[package]] @@ -2466,9 +2451,9 @@ checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688" [[package]] name = "clipboard-win" -version = "5.4.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" +checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" dependencies = [ "error-code", ] @@ -2525,7 +2510,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] @@ -2548,7 +2533,7 @@ version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ - "bytes 1.7.1", + "bytes 1.6.0", "memchr", ] @@ -2607,9 +2592,9 @@ checksum = "32b13ea120a812beba79e34316b3942a857c86ec1593cb34f27bb28272ce2cca" [[package]] name = "const_panic" -version = "0.2.9" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7782af8f90fe69a4bb41e460abe1727d493403d8b2cc43201a3a3e906b24379f" +checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b" [[package]] name = "const_soft_float" @@ -2619,9 +2604,9 @@ checksum = "87ca1caa64ef4ed453e68bb3db612e51cf1b2f5b871337f0fcab1c8f87cc3dff" [[package]] name = "constant_time_eq" -version = "0.3.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "constgebra" @@ -2685,7 +2670,7 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6", "libc", ] @@ -2697,9 +2682,9 @@ checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" [[package]] name = "core-foundation-sys" -version = "0.8.7" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" @@ -2742,7 +2727,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" dependencies = [ "bitflags 1.3.2", - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6", "coreaudio-sys", ] @@ -2786,7 +2771,7 @@ checksum = "74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116" dependencies = [ "alsa 0.6.0", "asio-sys", - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6", "coreaudio-rs 0.10.0", "jni 0.19.0", "js-sys", @@ -2811,8 +2796,8 @@ version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779" dependencies = [ - "alsa 0.9.1", - "core-foundation-sys 0.8.7", + "alsa 0.9.0", + "core-foundation-sys 0.8.6", "coreaudio-rs 0.11.3", "dasp_sample", "jni 0.21.1", @@ -2979,9 +2964,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.74+curl-8.9.0" +version = "0.4.73+curl-8.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8af10b986114528fcdc4b63b6f5f021b7057618411046a4de2ba0f0149a097bf" +checksum = "450ab250ecf17227c39afb9a2dd9261dc0035cb80f2612472fc0c4aac2dcb84d" dependencies = [ "cc", "libc", @@ -3029,7 +3014,7 @@ dependencies = [ "fnv", "ident_case", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "strsim 0.10.0", "syn 1.0.109", ] @@ -3041,7 +3026,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] @@ -3183,8 +3168,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd31dbbd9743684d339f907a87fe212cb7b51d75b9e8e74181fe363199ee9b47" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -3194,8 +3179,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b36f2ddfca91251bed7f931f24b192e4eaf0a0e0fa70cf81cfb1416a1973620e" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -3298,9 +3283,9 @@ dependencies = [ [[package]] name = "euclid" -version = "0.22.11" +version = "0.22.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48" +checksum = "e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20" dependencies = [ "num-traits", ] @@ -3359,7 +3344,7 @@ dependencies = [ "pitch_calc", "ringbuf", "time_calc", - "tokio 1.40.0", + "tokio 1.38.0", "walkdir", ] @@ -3396,16 +3381,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", "synstructure", ] [[package]] name = "fastrand" -version = "2.1.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" @@ -3418,9 +3403,9 @@ dependencies = [ [[package]] name = "ffmpeg-next" -version = "7.0.4" +version = "7.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19a340e3d664ad5f530147cd6d4a86ece739a829fe2d81c369389ef903bd96f6" +checksum = "ddfce5242643c8a57b5a44b7e933ccbde85f9508d1379e578e97eee4a9d4334b" dependencies = [ "bitflags 2.6.0", "ffmpeg-sys-next", @@ -3429,9 +3414,9 @@ dependencies = [ [[package]] name = "ffmpeg-sys-next" -version = "7.0.2" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db1b7546e70609ead8c06b2b4c618a1ba352364675f81608f431dd4f321fe3f1" +checksum = "972a460dd8e901b737ce0482bf71a837e1751e3dd7c8f8b0a4ead808e7f174a5" dependencies = [ "bindgen", "cc", @@ -3452,14 +3437,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.25" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if 1.0.0", "libc", - "libredox 0.1.3", - "windows-sys 0.59.0", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", ] [[package]] @@ -3488,13 +3473,13 @@ checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "libz-sys", - "miniz_oxide 0.8.0", + "miniz_oxide 0.7.4", ] [[package]] @@ -3585,8 +3570,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -3735,8 +3720,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -3853,22 +3838,22 @@ dependencies = [ [[package]] name = "gilrs" -version = "0.10.9" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb8c78963a8856a5b10015c9349176ff5edbc8095384d52aada467a848bc03a" +checksum = "3f226b8f4d9bc7da93de8efd8747c6b1086409ca3f4b6d51e9a7f5461a9183fe" dependencies = [ "fnv", "gilrs-core", "log", - "uuid 1.10.0", + "uuid 1.9.1", "vec_map", ] [[package]] name = "gilrs-core" -version = "0.5.15" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732dadc05170599ddec9a89653f10d7a2af54da9181b3fa6e2bd49907ec8f7e4" +checksum = "b922f294d9f062af517ea0bd0a036ddcf11c2842211c2f9c71a3ceee859e10b6" dependencies = [ "core-foundation 0.9.4", "inotify 0.10.2", @@ -3878,11 +3863,11 @@ dependencies = [ "libudev-sys", "log", "nix 0.29.0", - "uuid 1.10.0", + "uuid 1.9.1", "vec_map", "wasm-bindgen", "web-sys", - "windows 0.58.0", + "windows 0.57.0", ] [[package]] @@ -4003,8 +3988,8 @@ checksum = "14070e711538afba5d6c807edb74bcb84e5dbb9211a3bf5dea0dfab5b24f4c51" dependencies = [ "inflections", "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -4092,7 +4077,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" dependencies = [ - "euclid 0.22.11", + "euclid 0.22.10", "svg_fmt", ] @@ -4337,7 +4322,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", @@ -4488,12 +4473,12 @@ dependencies = [ [[package]] name = "image-webp" -version = "0.1.3" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" +checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d" dependencies = [ "byteorder-lite", - "quick-error 2.0.1", + "thiserror", ] [[package]] @@ -4508,7 +4493,7 @@ version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4419f022e55cc63d5bbd6b44b71e1d226b9c9480a47824c706e9d54e5c40c5eb" dependencies = [ - "arrayvec 0.7.6", + "arrayvec 0.7.4", ] [[package]] @@ -4523,9 +4508,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.5.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -4585,8 +4570,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -4595,7 +4580,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "617ee6cf8e3f66f3b4ea67a4058564628cde41901316e19f559e14c7c72c5e7b" dependencies = [ - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6", "mach2", ] @@ -4687,9 +4672,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.32" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -4711,9 +4696,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -4825,9 +4810,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.158" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libflate" @@ -4868,9 +4853,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.5" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if 1.0.0", "windows-targets 0.52.6", @@ -4903,17 +4888,6 @@ dependencies = [ "redox_syscall 0.4.1", ] -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags 2.6.0", - "libc", - "redox_syscall 0.5.3", -] - [[package]] name = "libssh2-sys" version = "0.2.23" @@ -4940,9 +4914,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.20" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" +checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" dependencies = [ "cc", "libc", @@ -5039,8 +5013,8 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edecfb8d234a2b0be031ab02ebcdd9f3b9ee418fb35e265f7a540a48d197bff9" dependencies = [ - "arrayvec 0.7.6", - "euclid 0.22.11", + "arrayvec 0.7.4", + "euclid 0.22.10", "num-traits", ] @@ -5114,6 +5088,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" dependencies = [ "cfg-if 1.0.0", + "rayon", ] [[package]] @@ -5231,15 +5206,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "miniz_oxide" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" -dependencies = [ - "adler2", -] - [[package]] name = "mio" version = "0.6.23" @@ -5271,18 +5237,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "mio" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.52.0", -] - [[package]] name = "miow" version = "0.2.2" @@ -5334,7 +5288,7 @@ checksum = "ae585df4b6514cf8842ac0f1ab4992edc975892704835b549cf818dc0191249e" dependencies = [ "bit-set 0.5.3", "bitflags 2.6.0", - "indexmap 2.5.0", + "indexmap 2.2.6", "log", "num-traits", "pp-rs", @@ -5349,28 +5303,22 @@ version = "22.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bd5a652b6faf21496f2cfd88fc49989c8db0825d1f6746b1a71a6ede24a63ad" dependencies = [ - "arrayvec 0.7.6", + "arrayvec 0.7.4", "bit-set 0.6.0", "bitflags 2.6.0", "cfg_aliases 0.1.1", "codespan-reporting", "hexf-parse", - "indexmap 2.5.0", + "indexmap 2.2.6", "log", -<<<<<<< HEAD - "num-traits", "petgraph 0.6.5", -||||||| parent of a76e8ed (0.15-dev) - "num-traits", -======= ->>>>>>> a76e8ed (0.15-dev) "pp-rs", "rustc-hash", "serde", "spirv 0.3.0+sdk-1.3.268.0", "termcolor", "thiserror", - "unicode-xid 0.2.5", + "unicode-xid 0.2.4", ] [[package]] @@ -5382,7 +5330,7 @@ dependencies = [ "bit-set 0.5.3", "codespan-reporting", "data-encoding", - "indexmap 2.5.0", + "indexmap 2.2.6", "naga 22.1.0", "once_cell", "regex", @@ -5426,8 +5374,8 @@ dependencies = [ "rusttype", "serde", "serde_json", - "tokio 1.40.0", - "toml 0.8.19", + "tokio 1.38.0", + "toml 0.8.14", "walkdir", "web-sys", "wgpu", @@ -5492,7 +5440,7 @@ name = "nannou_wgpu" version = "0.19.0" dependencies = [ "futures 0.3.30", - "image 0.25.1", + "image 0.25.2", "instant", "num_cpus", "tokio 1.38.0", @@ -5546,7 +5494,7 @@ dependencies = [ "jni-sys", "log", "ndk-sys 0.5.0+25.2.9519653", - "num_enum 0.7.3", + "num_enum 0.7.2", "thiserror", ] @@ -5560,7 +5508,7 @@ dependencies = [ "jni-sys", "log", "ndk-sys 0.6.0+11769913", - "num_enum 0.7.3", + "num_enum 0.7.2", "raw-window-handle", "thiserror", ] @@ -5595,7 +5543,7 @@ dependencies = [ "darling", "proc-macro-crate 1.3.1", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] @@ -5839,7 +5787,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] @@ -5850,8 +5798,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -5939,11 +5887,11 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ - "num_enum_derive 0.7.3", + "num_enum_derive 0.7.2", ] [[package]] @@ -5954,20 +5902,20 @@ checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", ] [[package]] name = "num_enum_derive" -version = "0.7.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 3.2.0", + "proc-macro-crate 3.1.0", "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -6184,9 +6132,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.4" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] @@ -6282,9 +6230,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.66" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ "bitflags 2.6.0", "cfg-if 1.0.0", @@ -6302,8 +6250,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -6314,9 +6262,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -6330,7 +6278,7 @@ version = "0.3.47" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" dependencies = [ - "libredox 0.0.2", + "libredox", ] [[package]] @@ -6354,7 +6302,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" dependencies = [ - "ttf-parser 0.24.1", + "ttf-parser 0.24.0", ] [[package]] @@ -6432,7 +6380,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.5.3", + "redox_syscall 0.5.2", "smallvec 1.13.2", "windows-targets 0.52.6", ] @@ -6490,7 +6438,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset 0.4.2", - "indexmap 2.5.0", + "indexmap 2.2.6", "serde", "serde_derive", ] @@ -6529,8 +6477,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -6547,9 +6495,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.4" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", "fastrand", @@ -6606,9 +6554,9 @@ checksum = "b18befed8bc2b61abc79a457295e7e838417326da1586050b919414073977f19" [[package]] name = "polling" -version = "3.7.3" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ "cfg-if 1.0.0", "concurrent-queue", @@ -6616,7 +6564,7 @@ dependencies = [ "pin-project-lite", "rustix", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -6625,17 +6573,14 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb458bb7f6e250e6eb79d5026badc10a3ebb8f9a15d1fff0f13d17c71f4d6dee" dependencies = [ - "unicode-xid 0.2.5", + "unicode-xid 0.2.4", ] [[package]] name = "ppv-lite86" -version = "0.2.20" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" -dependencies = [ - "zerocopy 0.7.35", -] +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "presser" @@ -6651,12 +6596,12 @@ checksum = "f0f73cdaf19b52e6143685c3606206e114a4dfa969d6b14ec3894c88eb38bd4b" [[package]] name = "prettyplease" -version = "0.2.22" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2 1.0.86", - "syn 2.0.77", + "syn 2.0.69", ] [[package]] @@ -6671,11 +6616,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.2.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "toml_edit 0.22.20", + "toml_edit 0.21.1", ] [[package]] @@ -6711,8 +6656,8 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -6759,9 +6704,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quick-xml" -version = "0.36.1" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" +checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" dependencies = [ "memchr", ] @@ -6777,18 +6722,18 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2 1.0.86", ] [[package]] name = "radsort" -version = "0.1.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "019b4b213425016d7d84a153c4c73afb0946fbb4840e4eece7ba8848b9d6da22" +checksum = "17fd96390ed3feda12e1dfe2645ed587e0bea749e319333f104a33ff62f77a0b" [[package]] name = "rand" @@ -7038,7 +6983,7 @@ checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" dependencies = [ "arbitrary", "arg_enum_proc_macro", - "arrayvec 0.7.6", + "arrayvec 0.7.4", "av1-grain", "bitstream-io", "built", @@ -7067,15 +7012,16 @@ dependencies = [ [[package]] name = "ravif" -version = "0.11.10" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f0bfd976333248de2078d350bfdf182ff96e168a24d23d2436cef320dd4bdd" +checksum = "67376f469e7e7840d0040bbf4b9b3334005bb167f814621326e4c7ab8cd6e944" dependencies = [ "avif-serialize", "imgref", "loop9", "quick-error 2.0.1", "rav1e", + "rayon", "rgb", ] @@ -7171,18 +7117,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ "bitflags 2.6.0", ] [[package]] name = "regex" -version = "1.10.6" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -7286,9 +7232,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.50" +version = "0.8.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" +checksum = "a7439be6844e40133eda024efd85bf07f59d0dd2f59b10c00dd6cfb92cc5c741" dependencies = [ "bytemuck", ] @@ -7436,9 +7382,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.36" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.6.0", "errno", @@ -7488,9 +7434,9 @@ dependencies = [ [[package]] name = "ruzstd" -version = "0.7.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c8b8f3d26bd9f945e5cbae77f7cdfbf37af9a66956f1115eb4516e45df519f4" +checksum = "5022b253619b1ba797f243056276bed8ed1a73b0f5a7ce7225d524067644bf8f" dependencies = [ "byteorder", "twox-hash", @@ -7546,9 +7492,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sctk-adwaita" -version = "0.10.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec" +checksum = "7555fcb4f753d095d734fdefebb0ad8c98478a21db500492d87c55913d3b0086" dependencies = [ "ab_glyph", "log", @@ -7559,24 +7505,24 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.11.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ "bitflags 2.6.0", "core-foundation 0.9.4", - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6", "libc", "security-framework-sys", ] [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6", "libc", ] @@ -7619,22 +7565,22 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.209" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -7648,21 +7594,20 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa 1.0.11", - "memchr", "ryu", "serde", ] [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -7729,7 +7674,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" dependencies = [ - "quote 1.0.37", + "quote 1.0.36", ] [[package]] @@ -7814,9 +7759,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay-client-toolkit" -version = "0.19.2" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" +checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" dependencies = [ "bitflags 2.6.0", "calloop", @@ -8011,18 +7956,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.77" +version = "2.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "201fcda3845c23e8212cd466bfebf0bd20694490fc0356ae8e428e0824a915a6" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "unicode-ident", ] @@ -8033,9 +7978,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", "syn 1.0.109", - "unicode-xid 0.2.5", + "unicode-xid 0.2.4", ] [[package]] @@ -8053,7 +7998,7 @@ version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be" dependencies = [ - "core-foundation-sys 0.8.7", + "core-foundation-sys 0.8.6", "libc", "memchr", "ntapi", @@ -8069,17 +8014,17 @@ dependencies = [ "cfg-expr", "heck", "pkg-config", - "toml 0.8.19", + "toml 0.8.14", "version-compare", ] [[package]] name = "taffy" -version = "0.5.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cb893bff0f80ae17d3a57e030622a967b8dbc90e38284d9b4b1442e23873c94" +checksum = "e8b61630cba2afd2c851821add2e1bb1b7851a2436e839ab73b56558b009035e" dependencies = [ - "arrayvec 0.7.6", + "arrayvec 0.7.4", "grid", "num-traits", "serde", @@ -8104,21 +8049,20 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.16" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tempfile" -version = "3.12.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if 1.0.0", "fastrand", - "once_cell", "rustix", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -8155,8 +8099,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -8220,7 +8164,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" dependencies = [ "arrayref", - "arrayvec 0.7.6", + "arrayvec 0.7.4", "bytemuck", "cfg-if 1.0.0", "log", @@ -8240,9 +8184,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.8.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +checksum = "ce6b6a2fb3a985e99cebfaefa9faa3024743da73304ca1c683a36429613d3d22" dependencies = [ "tinyvec_macros", ] @@ -8274,20 +8218,21 @@ dependencies = [ [[package]] name = "tokio" -version = "1.40.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", - "bytes 1.7.1", + "bytes 1.6.0", "libc", - "mio 1.0.2", + "mio 0.8.11", + "num_cpus", "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] @@ -8334,13 +8279,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -8426,21 +8371,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.19" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.20", + "toml_edit 0.22.14", ] [[package]] name = "toml_datetime" -version = "0.6.8" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] @@ -8462,22 +8407,33 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.2.6", "toml_datetime", "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.22.20" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.2.6", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +dependencies = [ + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.18", + "winnow 0.6.13", ] [[package]] @@ -8498,8 +8454,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -8591,9 +8547,9 @@ checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" [[package]] name = "ttf-parser" -version = "0.24.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" +checksum = "8686b91785aff82828ed725225925b33b4fde44c4bb15876e5f7c832724c420a" [[package]] name = "twox-hash" @@ -8607,9 +8563,9 @@ dependencies = [ [[package]] name = "typeid" -version = "1.0.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e" +checksum = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf" [[package]] name = "typenum" @@ -8697,9 +8653,9 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" [[package]] name = "unicode-xid" -version = "0.2.5" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "unreachable" @@ -8764,9 +8720,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.10.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" dependencies = [ "getrandom 0.2.15", "serde", @@ -8809,9 +8765,9 @@ checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" -version = "0.9.5" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "video-rs" @@ -8848,7 +8804,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e369bee1b05d510a7b4ed645f5faa90619e05437111783ea5848f28d97d3c2e" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", + "quote 1.0.36", ] [[package]] @@ -8892,35 +8848,34 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if 1.0.0", - "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -8930,38 +8885,38 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ - "quote 1.0.37", + "quote 1.0.36", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wayland-backend" -version = "0.3.7" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" +checksum = "269c04f203640d0da2092d1b8d89a2d081714ae3ac2f1b53e99f205740517198" dependencies = [ "cc", "downcast-rs", @@ -8973,9 +8928,9 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.6" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d" +checksum = "08bd0f46c069d3382a36c8666c1b9ccef32b8b04f41667ca1fef06a1adcc2982" dependencies = [ "bitflags 2.6.0", "rustix", @@ -8996,9 +8951,9 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.31.6" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a94697e66e76c85923b0d28a0c251e8f0666f58fc47d316c0f4da6da75d37cb" +checksum = "09414bcf0fd8d9577d73e9ac4659ebc45bcc9cff1980a350543ad8e50ee263b2" dependencies = [ "rustix", "wayland-client", @@ -9007,9 +8962,9 @@ dependencies = [ [[package]] name = "wayland-protocols" -version = "0.32.4" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -9019,9 +8974,9 @@ dependencies = [ [[package]] name = "wayland-protocols-plasma" -version = "0.3.4" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0a41a6875e585172495f7a96dfa42ca7e0213868f4f15c313f7c33221a7eff" +checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -9032,9 +8987,9 @@ dependencies = [ [[package]] name = "wayland-protocols-wlr" -version = "0.3.4" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad87b5fd1b1d3ca2f792df8f686a2a11e3fe1077b71096f7a175ab699f89109" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" dependencies = [ "bitflags 2.6.0", "wayland-backend", @@ -9045,20 +9000,20 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.5" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" +checksum = "edf466fc49a4feb65a511ca403fec3601494d0dee85dbf37fff6fa0dd4eec3b6" dependencies = [ "proc-macro2 1.0.86", "quick-xml", - "quote 1.0.37", + "quote 1.0.36", ] [[package]] name = "wayland-sys" -version = "0.31.5" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09" +checksum = "4a6754825230fa5b27bafaa28c30b3c9e72c55530581220cef401fa422c0fae7" dependencies = [ "dlib", "log", @@ -9068,9 +9023,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -9116,7 +9071,7 @@ version = "22.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d1c4ba43f80542cf63a0a6ed3134629ae73e8ab51e4b765a67f3aa062eb433" dependencies = [ - "arrayvec 0.7.6", + "arrayvec 0.7.4", "cfg_aliases 0.1.1", "document-features", "js-sys", @@ -9142,20 +9097,19 @@ version = "22.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0348c840d1051b8e86c3bcd31206080c5e71e5933dabd79be1ce732b0b2f089a" dependencies = [ - "arrayvec 0.7.6", + "arrayvec 0.7.4", "bit-vec 0.7.0", "bitflags 2.6.0", "bytemuck", "cfg_aliases 0.1.1", "document-features", - "indexmap 2.5.0", + "indexmap 2.2.6", "log", "naga 22.1.0", "once_cell", "parking_lot 0.12.3", "profiling", "raw-window-handle", - "ron", "rustc-hash", "serde", "smallvec 1.13.2", @@ -9171,7 +9125,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f" dependencies = [ "android_system_properties", - "arrayvec 0.7.6", + "arrayvec 0.7.4", "ash", "bit-set 0.6.0", "bitflags 2.6.0", @@ -9281,11 +9235,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.9" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -9326,16 +9280,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" -dependencies = [ - "windows-core 0.58.0", - "windows-targets 0.52.6", -] - [[package]] name = "windows-core" version = "0.52.0" @@ -9351,7 +9295,7 @@ version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" dependencies = [ - "windows-result 0.1.2", + "windows-result", "windows-targets 0.52.6", ] @@ -9363,20 +9307,7 @@ checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" dependencies = [ "windows-implement 0.57.0", "windows-interface 0.57.0", - "windows-result 0.1.2", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-core" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" -dependencies = [ - "windows-implement 0.58.0", - "windows-interface 0.58.0", - "windows-result 0.2.0", - "windows-strings", + "windows-result", "windows-targets 0.52.6", ] @@ -9387,8 +9318,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -9398,19 +9329,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", -] - -[[package]] -name = "windows-implement" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -9420,8 +9340,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -9431,19 +9351,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", -] - -[[package]] -name = "windows-interface" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -9455,25 +9364,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-result" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-strings" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" -dependencies = [ - "windows-result 0.2.0", - "windows-targets 0.52.6", -] - [[package]] name = "windows-sys" version = "0.45.0" @@ -9690,9 +9580,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" -version = "0.30.5" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0be9e76a1f1077e04a411f0b989cbd3c93339e1771cb41e71ac4aee95bfd2c67" +checksum = "49f45a7b7e2de6af35448d7718dab6d95acec466eb3bb7a56f4d31d1af754004" dependencies = [ "ahash", "android-activity", @@ -9751,9 +9641,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.18" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] @@ -9811,9 +9701,9 @@ checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "xcursor" -version = "0.3.8" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61" +checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" [[package]] name = "xkbcommon-dl" @@ -9836,9 +9726,9 @@ checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" [[package]] name = "xml-rs" -version = "0.8.21" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" [[package]] name = "xmlparser" @@ -9874,7 +9764,6 @@ version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ - "byteorder", "zerocopy-derive 0.7.35", ] @@ -9896,8 +9785,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2 1.0.86", - "quote 1.0.37", - "syn 2.0.77", + "quote 1.0.36", + "syn 2.0.69", ] [[package]] @@ -9930,9 +9819,9 @@ dependencies = [ [[package]] name = "zune-jpeg" -version = "0.4.13" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" +checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" dependencies = [ "zune-core", ] diff --git a/nannou_wgpu/Cargo.toml b/nannou_wgpu/Cargo.toml index 20eabb77d..c27594b7a 100644 --- a/nannou_wgpu/Cargo.toml +++ b/nannou_wgpu/Cargo.toml @@ -26,8 +26,7 @@ capturer = ["image", "instant", "num_cpus"] replay = ["wgpu/replay"] serde = ["wgpu/serde"] spirv = ["wgpu/spirv"] -trace = ["wgpu/trace"] webgl = ["wgpu/webgl"] [package.metadata.docs.rs] -features = ["capturer", "image", "replay", "serde", "spirv", "trace", "webgl"] +features = ["capturer", "image", "replay", "serde", "spirv", "webgl"] From 33d727ae4cd7c30268f0127bcca10c657bf72c73 Mon Sep 17 00:00:00 2001 From: Charlotte McElwain Date: Thu, 5 Sep 2024 19:10:32 -0700 Subject: [PATCH 14/17] 0.15-dev --- bevy_nannou_isf/src/asset.rs | 2 +- bevy_nannou_isf/src/inputs.rs | 181 ++++++++++++--------- bevy_nannou_isf/src/render.rs | 5 +- bevy_nannou_video/src/asset.rs | 2 +- nannou/src/app.rs | 36 +++- nannou/src/window.rs | 16 +- nannou_wgpu/src/lib.rs | 2 + nannou_wgpu/src/render_pipeline_builder.rs | 1 + 8 files changed, 157 insertions(+), 88 deletions(-) diff --git a/bevy_nannou_isf/src/asset.rs b/bevy_nannou_isf/src/asset.rs index b78fe0145..b0e698a3f 100644 --- a/bevy_nannou_isf/src/asset.rs +++ b/bevy_nannou_isf/src/asset.rs @@ -59,7 +59,7 @@ impl AssetLoader for IsfLoader { async fn load<'a>( &'a self, - reader: &'a mut Reader<'_>, + reader: &'a mut dyn Reader, settings: &'a Self::Settings, load_context: &'a mut LoadContext<'_>, ) -> Result { diff --git a/bevy_nannou_isf/src/inputs.rs b/bevy_nannou_isf/src/inputs.rs index 6cf3f4c5f..4b44395c7 100644 --- a/bevy_nannou_isf/src/inputs.rs +++ b/bevy_nannou_isf/src/inputs.rs @@ -205,59 +205,59 @@ impl GetTypeRegistration for IsfInputs { } impl Struct for IsfInputs { - fn field(&self, name: &str) -> Option<&dyn Reflect> { + fn field(&self, name: &str) -> Option<&dyn PartialReflect> { self.get(name).map(|v| match v { - IsfInputValue::Event(b) => b as &dyn Reflect, - IsfInputValue::Bool(b) => b as &dyn Reflect, - IsfInputValue::Long(l) => l as &dyn Reflect, - IsfInputValue::Float(f) => f as &dyn Reflect, - IsfInputValue::Point2d(v) => v as &dyn Reflect, - IsfInputValue::Color(c) => c as &dyn Reflect, - IsfInputValue::Image(h) => h as &dyn Reflect, - IsfInputValue::Audio(a) => a as &dyn Reflect, - IsfInputValue::AudioFft(a) => a as &dyn Reflect, + IsfInputValue::Event(b) => b as &dyn PartialReflect, + IsfInputValue::Bool(b) => b as &dyn PartialReflect, + IsfInputValue::Long(l) => l as &dyn PartialReflect, + IsfInputValue::Float(f) => f as &dyn PartialReflect, + IsfInputValue::Point2d(v) => v as &dyn PartialReflect, + IsfInputValue::Color(c) => c as &dyn PartialReflect, + IsfInputValue::Image(h) => h as &dyn PartialReflect, + IsfInputValue::Audio(a) => a as &dyn PartialReflect, + IsfInputValue::AudioFft(a) => a as &dyn PartialReflect, }) } - fn field_mut(&mut self, name: &str) -> Option<&mut dyn Reflect> { + fn field_mut(&mut self, name: &str) -> Option<&mut dyn PartialReflect> { self.get_mut(name).map(|v| match v { - IsfInputValue::Event(b) => b as &mut dyn Reflect, - IsfInputValue::Bool(b) => b as &mut dyn Reflect, - IsfInputValue::Long(l) => l as &mut dyn Reflect, - IsfInputValue::Float(f) => f as &mut dyn Reflect, - IsfInputValue::Point2d(v) => v as &mut dyn Reflect, - IsfInputValue::Color(c) => c as &mut dyn Reflect, - IsfInputValue::Image(h) => h as &mut dyn Reflect, - IsfInputValue::Audio(a) => a as &mut dyn Reflect, - IsfInputValue::AudioFft(a) => a as &mut dyn Reflect, + IsfInputValue::Event(b) => b as &mut dyn PartialReflect, + IsfInputValue::Bool(b) => b as &mut dyn PartialReflect, + IsfInputValue::Long(l) => l as &mut dyn PartialReflect, + IsfInputValue::Float(f) => f as &mut dyn PartialReflect, + IsfInputValue::Point2d(v) => v as &mut dyn PartialReflect, + IsfInputValue::Color(c) => c as &mut dyn PartialReflect, + IsfInputValue::Image(h) => h as &mut dyn PartialReflect, + IsfInputValue::Audio(a) => a as &mut dyn PartialReflect, + IsfInputValue::AudioFft(a) => a as &mut dyn PartialReflect, }) } - fn field_at(&self, index: usize) -> Option<&dyn Reflect> { + fn field_at(&self, index: usize) -> Option<&dyn PartialReflect> { self.values().nth(index).map(|v| match v { - IsfInputValue::Event(b) => b as &dyn Reflect, - IsfInputValue::Bool(b) => b as &dyn Reflect, - IsfInputValue::Long(l) => l as &dyn Reflect, - IsfInputValue::Float(f) => f as &dyn Reflect, - IsfInputValue::Point2d(v) => v as &dyn Reflect, - IsfInputValue::Color(c) => c as &dyn Reflect, - IsfInputValue::Image(h) => h as &dyn Reflect, - IsfInputValue::Audio(a) => a as &dyn Reflect, - IsfInputValue::AudioFft(a) => a as &dyn Reflect, + IsfInputValue::Event(b) => b as &dyn PartialReflect, + IsfInputValue::Bool(b) => b as &dyn PartialReflect, + IsfInputValue::Long(l) => l as &dyn PartialReflect, + IsfInputValue::Float(f) => f as &dyn PartialReflect, + IsfInputValue::Point2d(v) => v as &dyn PartialReflect, + IsfInputValue::Color(c) => c as &dyn PartialReflect, + IsfInputValue::Image(h) => h as &dyn PartialReflect, + IsfInputValue::Audio(a) => a as &dyn PartialReflect, + IsfInputValue::AudioFft(a) => a as &dyn PartialReflect, }) } - fn field_at_mut(&mut self, index: usize) -> Option<&mut dyn Reflect> { + fn field_at_mut(&mut self, index: usize) -> Option<&mut dyn PartialReflect> { self.values_mut().nth(index).map(|v| match v { - IsfInputValue::Event(b) => b as &mut dyn Reflect, - IsfInputValue::Bool(b) => b as &mut dyn Reflect, - IsfInputValue::Long(l) => l as &mut dyn Reflect, - IsfInputValue::Float(f) => f as &mut dyn Reflect, - IsfInputValue::Point2d(v) => v as &mut dyn Reflect, - IsfInputValue::Color(c) => c as &mut dyn Reflect, - IsfInputValue::Image(h) => h as &mut dyn Reflect, - IsfInputValue::Audio(a) => a as &mut dyn Reflect, - IsfInputValue::AudioFft(a) => a as &mut dyn Reflect, + IsfInputValue::Event(b) => b as &mut dyn PartialReflect, + IsfInputValue::Bool(b) => b as &mut dyn PartialReflect, + IsfInputValue::Long(l) => l as &mut dyn PartialReflect, + IsfInputValue::Float(f) => f as &mut dyn PartialReflect, + IsfInputValue::Point2d(v) => v as &mut dyn PartialReflect, + IsfInputValue::Color(c) => c as &mut dyn PartialReflect, + IsfInputValue::Image(h) => h as &mut dyn PartialReflect, + IsfInputValue::Audio(a) => a as &mut dyn PartialReflect, + IsfInputValue::AudioFft(a) => a as &mut dyn PartialReflect, }) } @@ -282,43 +282,13 @@ impl Struct for IsfInputs { } } -impl Reflect for IsfInputs { +impl PartialReflect for IsfInputs { #[inline] fn get_represented_type_info(&self) -> Option<&'static TypeInfo> { Some(Self::type_info()) } - #[inline] - fn into_any(self: Box) -> Box { - self - } - - #[inline] - fn as_any(&self) -> &dyn Any { - self - } - - #[inline] - fn as_any_mut(&mut self) -> &mut dyn Any { - self - } - - #[inline] - fn into_reflect(self: Box) -> Box { - self - } - - #[inline] - fn as_reflect(&self) -> &dyn Reflect { - self - } - - #[inline] - fn as_reflect_mut(&mut self) -> &mut dyn Reflect { - self - } - - fn try_apply(&mut self, value: &dyn Reflect) -> Result<(), ApplyError> { + fn try_apply(&mut self, value: &dyn PartialReflect) -> Result<(), ApplyError> { if let ReflectRef::Struct(struct_value) = value.reflect_ref() { for (i, value) in struct_value.iter_fields().enumerate() { let name = struct_value.name_at(i).unwrap(); @@ -335,12 +305,6 @@ impl Reflect for IsfInputs { Ok(()) } - #[inline] - fn set(&mut self, value: Box) -> Result<(), Box> { - *self = value.take()?; - Ok(()) - } - #[inline] fn reflect_kind(&self) -> ReflectKind { ReflectKind::Struct @@ -362,11 +326,11 @@ impl Reflect for IsfInputs { } #[inline] - fn clone_value(&self) -> Box { + fn clone_value(&self) -> Box { Box::new(self.clone_dynamic()) } - fn reflect_partial_eq(&self, value: &dyn Reflect) -> Option { + fn reflect_partial_eq(&self, value: &dyn PartialReflect) -> Option { struct_partial_eq(self, value) } @@ -385,10 +349,65 @@ impl Reflect for IsfInputs { fn is_dynamic(&self) -> bool { true } + + fn into_partial_reflect(self: Box) -> Box { + self + } + + fn as_partial_reflect(&self) -> &dyn PartialReflect { + self + } + + fn as_partial_reflect_mut(&mut self) -> &mut dyn PartialReflect { + self + } + + fn try_into_reflect(self: Box) -> Result, Box> { + Ok(self) + } + + fn try_as_reflect(&self) -> Option<&dyn Reflect> { + Some(self) + } + + fn try_as_reflect_mut(&mut self) -> Option<&mut dyn Reflect> { + Some(self) + } +} + +impl Reflect for IsfInputs { + fn into_any(self: Box) -> Box { + self + } + + fn as_any(&self) -> &dyn Any { + self + } + + fn as_any_mut(&mut self) -> &mut dyn Any { + self + } + + fn into_reflect(self: Box) -> Box { + self + } + + fn as_reflect(&self) -> &dyn Reflect { + self + } + + fn as_reflect_mut(&mut self) -> &mut dyn Reflect { + self + } + + fn set(&mut self, value: Box) -> Result<(), Box> { + *self = value.take()?; + Ok(()) + } } #[inline] -pub fn struct_partial_eq(a: &IsfInputs, b: &dyn Reflect) -> Option { +pub fn struct_partial_eq(a: &IsfInputs, b: &dyn PartialReflect) -> Option { let ReflectRef::Struct(struct_value) = b.reflect_ref() else { return Some(false); }; diff --git a/bevy_nannou_isf/src/render.rs b/bevy_nannou_isf/src/render.rs index f766ca1d9..725e1f97b 100644 --- a/bevy_nannou_isf/src/render.rs +++ b/bevy_nannou_isf/src/render.rs @@ -194,13 +194,12 @@ fn queue_isf( pipeline_cache: Res, mut isf_pipeline: ResMut, isf_assets: Res>, - msaa: Res, isf_inputs: Res, isf_render_targets: Res, mut specialized_render_pipelines: ResMut>, - views: Query<(Entity, &ExtractedView, &Handle)>, + views: Query<(Entity, &ExtractedView, &Handle, &Msaa)>, ) { - for (view_entity, extracted_view, isf) in views.iter() { + for (view_entity, extracted_view, isf, msaa) in views.iter() { let isf = isf_assets.get(isf).unwrap(); // Prepare any new layouts diff --git a/bevy_nannou_video/src/asset.rs b/bevy_nannou_video/src/asset.rs index 37700e0f3..0fe78e76a 100644 --- a/bevy_nannou_video/src/asset.rs +++ b/bevy_nannou_video/src/asset.rs @@ -110,7 +110,7 @@ impl AssetLoader for VideoLoader { async fn load<'a>( &'a self, - _reader: &'a mut Reader<'_>, + _reader: &'a mut dyn Reader, settings: &'a Self::Settings, load_context: &'a mut LoadContext<'_>, ) -> Result { diff --git a/nannou/src/app.rs b/nannou/src/app.rs index 825e5fe34..aeedd0db8 100644 --- a/nannou/src/app.rs +++ b/nannou/src/app.rs @@ -31,6 +31,8 @@ use bevy::reflect::{ ApplyError, DynamicTypePath, GetTypeRegistration, ReflectMut, ReflectOwned, ReflectRef, TypeInfo, }; +use bevy::render::extract_resource::ExtractResource; +use bevy::render::render_graph::ViewNodeRunner; use bevy::window::{ ExitCondition, Monitor, PrimaryMonitor, PrimaryWindow, WindowClosed, WindowEvent, WindowFocused, WindowResized, @@ -448,7 +450,7 @@ where #[cfg(feature = "egui")] pub fn model_ui(mut self) -> Self { self.app - .add_plugins((ResourceInspectorPlugin::>::default(),)); + .add_plugins(ResourceInspectorPlugin::>::default()); self } } @@ -581,6 +583,38 @@ where } } +impl Reflect for ModelHolder +where + M: Reflect + DynamicTypePath + Any + GetTypeRegistration + 'static, { + fn into_any(self: Box) -> Box { + Box::new(self.0).into_any() + } + + fn as_any(&self) -> &dyn Any { + self.0.as_any() + } + + fn as_any_mut(&mut self) -> &mut dyn Any { + self.0.as_any_mut() + } + + fn into_reflect(self: Box) -> Box { + Box::new(self.0).into_reflect() + } + + fn as_reflect(&self) -> &dyn Reflect { + self.0.as_reflect() + } + + fn as_reflect_mut(&mut self) -> &mut dyn Reflect { + self.0.as_reflect_mut() + } + + fn set(&mut self, value: Box) -> Result<(), Box> { + self.0.set(value) + } +} + impl<'w> App<'w> { pub const DEFAULT_EXIT_ON_ESCAPE: bool = true; pub const DEFAULT_FULLSCREEN_ON_SHORTCUT: bool = true; diff --git a/nannou/src/window.rs b/nannou/src/window.rs index 3d4d1a8d1..a20d2d9e5 100644 --- a/nannou/src/window.rs +++ b/nannou/src/window.rs @@ -11,6 +11,8 @@ use std::path::{Path, PathBuf}; use bevy::input::mouse::MouseWheel; use bevy::prelude::*; use bevy::render::camera::RenderTarget; +use bevy::render::extract_component::ExtractComponent; +use bevy::render::renderer::{RenderDevice, RenderQueue}; use bevy::render::view::cursor::CursorIcon; use bevy::render::view::screenshot::{save_to_disk, Screenshot}; use bevy::render::view::RenderLayers; @@ -942,7 +944,19 @@ impl<'a, 'w> Window<'a, 'w> { } pub fn msaa_samples(&self) -> u32 { - self.app.resource_world().resource::().samples() + let mut msaa_q = self + .app + .component_world_mut() + .query_filtered::<(&Camera, &Msaa), With>(); + for (camera, msaa) in msaa_q.iter(&*self.app.component_world()) { + if let RenderTarget::Window(WindowRef::Entity(entity)) = camera.target { + if entity == self.entity { + return msaa.samples(); + } + } + } + + panic!("No camera found for window"); } } diff --git a/nannou_wgpu/src/lib.rs b/nannou_wgpu/src/lib.rs index 37c7d92a5..1f6687b4c 100644 --- a/nannou_wgpu/src/lib.rs +++ b/nannou_wgpu/src/lib.rs @@ -89,6 +89,7 @@ pub use wgpu::{ PUSH_CONSTANT_ALIGNMENT, QUERY_RESOLVE_BUFFER_ALIGNMENT, QUERY_SET_MAX_QUERIES, QUERY_SIZE, VERTEX_STRIDE_ALIGNMENT, }; +use wgpu::MemoryHints; /// The default power preference used for requesting the WGPU adapter. pub const DEFAULT_POWER_PREFERENCE: PowerPreference = PowerPreference::HighPerformance; @@ -131,6 +132,7 @@ pub fn default_device_descriptor() -> DeviceDescriptor<'static> { label: Some("nannou_device"), required_features, required_limits, + memory_hints: MemoryHints::default(), } } diff --git a/nannou_wgpu/src/render_pipeline_builder.rs b/nannou_wgpu/src/render_pipeline_builder.rs index c4a0cef2c..156ec4401 100644 --- a/nannou_wgpu/src/render_pipeline_builder.rs +++ b/nannou_wgpu/src/render_pipeline_builder.rs @@ -562,6 +562,7 @@ fn build( multisample, fragment, multiview: None, + cache: None, }; device.create_render_pipeline(&pipeline_desc) From 7d16d6893e673b61adc834fb3ad37158ed5d8f58 Mon Sep 17 00:00:00 2001 From: Charlotte McElwain Date: Thu, 5 Sep 2024 19:10:48 -0700 Subject: [PATCH 15/17] Fmt. --- nannou/src/app.rs | 3 ++- nannou_wgpu/src/lib.rs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nannou/src/app.rs b/nannou/src/app.rs index aeedd0db8..3f16d4632 100644 --- a/nannou/src/app.rs +++ b/nannou/src/app.rs @@ -585,7 +585,8 @@ where impl Reflect for ModelHolder where - M: Reflect + DynamicTypePath + Any + GetTypeRegistration + 'static, { + M: Reflect + DynamicTypePath + Any + GetTypeRegistration + 'static, +{ fn into_any(self: Box) -> Box { Box::new(self.0).into_any() } diff --git a/nannou_wgpu/src/lib.rs b/nannou_wgpu/src/lib.rs index 1f6687b4c..efb95cd25 100644 --- a/nannou_wgpu/src/lib.rs +++ b/nannou_wgpu/src/lib.rs @@ -55,6 +55,7 @@ pub use self::texture::{ format_size_bytes as texture_format_size_bytes, Builder as TextureBuilder, Texture, TextureId, TextureView, TextureViewId, ToTextureView, }; +use wgpu::MemoryHints; #[doc(inline)] pub use wgpu::{ include_wgsl, @@ -89,7 +90,6 @@ pub use wgpu::{ PUSH_CONSTANT_ALIGNMENT, QUERY_RESOLVE_BUFFER_ALIGNMENT, QUERY_SET_MAX_QUERIES, QUERY_SIZE, VERTEX_STRIDE_ALIGNMENT, }; -use wgpu::MemoryHints; /// The default power preference used for requesting the WGPU adapter. pub const DEFAULT_POWER_PREFERENCE: PowerPreference = PowerPreference::HighPerformance; From eda391774276e9fd3a0c73d840679c749e7d44c6 Mon Sep 17 00:00:00 2001 From: Charlotte McElwain Date: Thu, 5 Sep 2024 19:12:39 -0700 Subject: [PATCH 16/17] Fix Isf. --- bevy_nannou/Cargo.toml | 2 +- bevy_nannou_isf/src/asset.rs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/bevy_nannou/Cargo.toml b/bevy_nannou/Cargo.toml index 9a73e61e5..a640098f4 100644 --- a/bevy_nannou/Cargo.toml +++ b/bevy_nannou/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -bevy = { workspace = true } +bevy = { workspace = true, features = ["jpeg"]} bevy_nannou_draw = { path = "../bevy_nannou_draw" } bevy_nannou_isf = { path = "../bevy_nannou_isf", optional = true } bevy_nannou_video = { path = "../bevy_nannou_video", optional = true } diff --git a/bevy_nannou_isf/src/asset.rs b/bevy_nannou_isf/src/asset.rs index b0e698a3f..46ed9804c 100644 --- a/bevy_nannou_isf/src/asset.rs +++ b/bevy_nannou_isf/src/asset.rs @@ -75,7 +75,6 @@ impl AssetLoader for IsfLoader { let isf = isf::parse(glsl_src).map_err(|e| IsfAssetLoaderError::Parse(e))?; let glsl = glsl_string_from_isf(&isf); let glsl = prefix_isf_glsl_str(&glsl, glsl_src.to_string()); - info!("GLSL: {}", glsl); let shader = Shader::from_glsl(glsl, ShaderStage::Fragment, file!()); let shader = load_context.add_labeled_asset(String::from("shader"), shader); From 8bf87f777c09e3a3bf2b5e28b6ef3f9dd0de0619 Mon Sep 17 00:00:00 2001 From: Charlotte McElwain Date: Thu, 5 Sep 2024 21:13:01 -0700 Subject: [PATCH 17/17] Examples. --- examples/wgpu/wgpu_compute_shader/wgpu_compute_shader.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/wgpu/wgpu_compute_shader/wgpu_compute_shader.rs b/examples/wgpu/wgpu_compute_shader/wgpu_compute_shader.rs index c3feab36e..7b743f3ba 100644 --- a/examples/wgpu/wgpu_compute_shader/wgpu_compute_shader.rs +++ b/examples/wgpu/wgpu_compute_shader/wgpu_compute_shader.rs @@ -292,6 +292,7 @@ fn create_compute_pipeline( module: &cs_mod, entry_point: "main", compilation_options: Default::default(), + cache: None, }; device.create_compute_pipeline(&desc) }