From fe55e3a406d840fc9ca0c02b2ae406edf7467276 Mon Sep 17 00:00:00 2001 From: Tim Jentzsch Date: Sat, 15 Jul 2023 14:19:43 +0200 Subject: [PATCH 01/24] Update Bevy dependency to 0.11 --- Cargo.lock | 1582 ++++++++++++++++++++++++++------- crates/bevy_plugin/Cargo.toml | 13 +- 2 files changed, 1255 insertions(+), 340 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7ec611d4..6d886a22 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -24,13 +24,28 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "704d532b1cd3d912bb37499c55a81ac748cc1afa737eedd100ba441acdd47d38" +[[package]] +name = "accesskit" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02c98a5d094590335462354da402d754fe2cb78f0e6ce5024611c28ed539c1de" + [[package]] name = "accesskit_consumer" version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48ba8b23cfca3944012ee2e5c71c02077a400e034c720eed6bd927cb6b4d1fd9" dependencies = [ - "accesskit", + "accesskit 0.10.1", +] + +[[package]] +name = "accesskit_consumer" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca541e0fdb600916d196a940228df99b86d804fd2e6ef13894d7814f2799db43" +dependencies = [ + "accesskit 0.11.0", ] [[package]] @@ -39,8 +54,20 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58d062544d6cc36f4213323b7cb3a0d74ddff4b0d2311ab5e7596f4278bb2cc9" dependencies = [ - "accesskit", - "accesskit_consumer", + "accesskit 0.10.1", + "accesskit_consumer 0.14.1", + "objc2", + "once_cell", +] + +[[package]] +name = "accesskit_macos" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4baea9413f0daf1cd4aab199bc09f8139cd726ce7673d523c27d186b8b878325" +dependencies = [ + "accesskit 0.11.0", + "accesskit_consumer 0.15.0", "objc2", "once_cell", ] @@ -51,8 +78,22 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aaf5b3c3828397ee832ba4a72fb1a4ace10f781e31885f774cbd531014059115" dependencies = [ - "accesskit", - "accesskit_consumer", + "accesskit 0.10.1", + "accesskit_consumer 0.14.1", + "arrayvec", + "once_cell", + "paste", + "windows 0.44.0", +] + +[[package]] +name = "accesskit_windows" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e11c7f177739f23bd19bb856e4a64fdd96eb8638ec0a6a6dde9a7019a9e91c53" +dependencies = [ + "accesskit 0.11.0", + "accesskit_consumer 0.15.0", "arrayvec", "once_cell", "paste", @@ -65,9 +106,21 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcb615217efc79c4bed3094c4ca76c4bc554751d1da16f3ed4ba0459b1e8f31" dependencies = [ - "accesskit", - "accesskit_macos", - "accesskit_windows", + "accesskit 0.10.1", + "accesskit_macos 0.6.2", + "accesskit_windows 0.13.2", + "winit", +] + +[[package]] +name = "accesskit_winit" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14f1bd64cd0b480cafb7bdd91eb489a1ff50f0f5702437b9efa32a25b8bb82a1" +dependencies = [ + "accesskit 0.11.0", + "accesskit_macos 0.7.1", + "accesskit_windows 0.14.0", "winit", ] @@ -116,6 +169,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ "cfg-if 1.0.0", + "getrandom", "once_cell", "version_check", ] @@ -129,6 +183,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + [[package]] name = "alsa" version = "0.7.0" @@ -136,7 +196,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8512c9117059663fb5606788fbca3619e2a91dac0e3fe516242eab1fa6be5e44" dependencies = [ "alsa-sys", - "bitflags", + "bitflags 1.3.2", "libc", "nix 0.24.3", ] @@ -158,7 +218,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c77a0045eda8b888c76ea473c2b0515ba6f471d318f8927c5c72240937035a6" dependencies = [ "android-properties", - "bitflags", + "bitflags 1.3.2", "cc", "jni-sys", "libc", @@ -181,6 +241,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e" +[[package]] +name = "android_log-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27f0fc03f560e1aebde41c2398b691cb98b5ea5996a6184a7a67bbbb77448969" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -313,7 +379,7 @@ version = "0.37.2+1.3.238" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28bf19c1f0a470be5fbf7522a308a05df06610252c5bcf5143e1b23f629a9a03" dependencies = [ - "libloading", + "libloading 0.7.4", ] [[package]] @@ -430,7 +496,16 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b93f906133305915d63f04108e6873c1b93a6605fe374b8f3391f6bda093e396" dependencies = [ - "bevy_internal", + "bevy_internal 0.10.1", +] + +[[package]] +name = "bevy" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04a90fe8e9c03fa2d30acf39a5178a48526df00c1ccea2fc43fa6d9ca4d8a168" +dependencies = [ + "bevy_internal 0.11.0", ] [[package]] @@ -440,20 +515,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7bda61dd72f879e8d4b0f57e94b86bd163bf558ac2e7ddea9ea075a47bdcd9af" dependencies = [ "bevy-inspector-egui-derive", - "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_core_pipeline", - "bevy_ecs", + "bevy_app 0.10.1", + "bevy_asset 0.10.1", + "bevy_core 0.10.1", + "bevy_core_pipeline 0.10.1", + "bevy_ecs 0.10.1", "bevy_egui", - "bevy_hierarchy", - "bevy_log", - "bevy_math", + "bevy_hierarchy 0.10.1", + "bevy_log 0.10.1", + "bevy_math 0.10.1", "bevy_pbr", - "bevy_reflect", - "bevy_render", - "bevy_utils", - "bevy_window", + "bevy_reflect 0.10.1", + "bevy_render 0.10.1", + "bevy_utils 0.10.1", + "bevy_window 0.10.1", "egui", "image", "once_cell", @@ -478,10 +553,22 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "037c4063f7dac1a5d596eb47f40782a04ca5838dc4274dbbadc90eb81efe5169" dependencies = [ - "accesskit", - "bevy_app", - "bevy_derive", - "bevy_ecs", + "accesskit 0.10.1", + "bevy_app 0.10.1", + "bevy_derive 0.10.1", + "bevy_ecs 0.10.1", +] + +[[package]] +name = "bevy_a11y" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f758f437d9d862bf10a8e3a0f76b426095c19a87d118c945dcb935358d856076" +dependencies = [ + "accesskit 0.11.0", + "bevy_app 0.11.0", + "bevy_derive 0.11.0", + "bevy_ecs 0.11.0", ] [[package]] @@ -490,16 +577,16 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0dc19f21846ebf8ba4d96617c2517b5119038774aa5dbbaf1bff122332b359c" dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_ecs", - "bevy_hierarchy", - "bevy_math", - "bevy_reflect", - "bevy_time", - "bevy_transform", - "bevy_utils", + "bevy_app 0.10.1", + "bevy_asset 0.10.1", + "bevy_core 0.10.1", + "bevy_ecs 0.10.1", + "bevy_hierarchy 0.10.1", + "bevy_math 0.10.1", + "bevy_reflect 0.10.1", + "bevy_time 0.10.1", + "bevy_transform 0.10.1", + "bevy_utils 0.10.1", ] [[package]] @@ -508,10 +595,26 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01db46963eb9486f7884121527ec69751d0e448f9e1d5329e80ea3424118a31a" dependencies = [ - "bevy_derive", - "bevy_ecs", - "bevy_reflect", - "bevy_utils", + "bevy_derive 0.10.1", + "bevy_ecs 0.10.1", + "bevy_reflect 0.10.1", + "bevy_utils 0.10.1", + "downcast-rs", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "bevy_app" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1817e8d5b1146ea9e7730a7264d3470394840e0754d15abded26473f867967a0" +dependencies = [ + "bevy_derive 0.11.0", + "bevy_ecs 0.11.0", + "bevy_reflect 0.11.0", + "bevy_tasks 0.11.0", + "bevy_utils 0.11.0", "downcast-rs", "wasm-bindgen", "web-sys", @@ -524,19 +627,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98609b4b0694a23bde0628aed626644967991f167aad9db2afb68dacb0017540" dependencies = [ "anyhow", - "bevy_app", - "bevy_diagnostic", - "bevy_ecs", - "bevy_log", - "bevy_reflect", - "bevy_tasks", - "bevy_utils", - "bevy_winit", + "bevy_app 0.10.1", + "bevy_diagnostic 0.10.1", + "bevy_ecs 0.10.1", + "bevy_log 0.10.1", + "bevy_reflect 0.10.1", + "bevy_tasks 0.10.1", + "bevy_utils 0.10.1", + "bevy_winit 0.10.1", "crossbeam-channel", "downcast-rs", "fastrand", "js-sys", - "notify", + "notify 5.2.0", + "parking_lot 0.12.1", + "serde", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "bevy_asset" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e12f951d4af2ad4ad230cd7bcb05248149c415eec17c34bf26731c4cd8b897f" +dependencies = [ + "anyhow", + "bevy_app 0.11.0", + "bevy_diagnostic 0.11.0", + "bevy_ecs 0.11.0", + "bevy_log 0.11.0", + "bevy_reflect 0.11.0", + "bevy_tasks 0.11.0", + "bevy_utils 0.11.0", + "bevy_winit 0.11.0", + "crossbeam-channel", + "downcast-rs", + "fastrand", + "js-sys", + "notify 6.0.1", "parking_lot 0.12.1", "serde", "thiserror", @@ -552,30 +683,65 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42b9f9b87b0d094268ce52bb75ff346ae0054573f7acc5d66bf032e2c88f748d" dependencies = [ "anyhow", - "bevy_app", - "bevy_asset", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_transform", - "bevy_utils", + "bevy_app 0.10.1", + "bevy_asset 0.10.1", + "bevy_ecs 0.10.1", + "bevy_math 0.10.1", + "bevy_reflect 0.10.1", + "bevy_transform 0.10.1", + "bevy_utils 0.10.1", "oboe", "parking_lot 0.12.1", "rodio", ] +[[package]] +name = "bevy_audio" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6bade3f5389f9463e150af874aebe672b5101df4268d28b0109a66f9cdce56e" +dependencies = [ + "anyhow", + "bevy_app 0.11.0", + "bevy_asset 0.11.0", + "bevy_derive 0.11.0", + "bevy_ecs 0.11.0", + "bevy_math 0.11.0", + "bevy_reflect 0.11.0", + "bevy_transform 0.11.0", + "bevy_utils 0.11.0", + "parking_lot 0.12.1", + "rodio", +] + [[package]] name = "bevy_core" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee53d7b4691b57207d72e996992c995a53f3e8d21ca7151ca3956d9ce7d232e" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_tasks", - "bevy_utils", + "bevy_app 0.10.1", + "bevy_ecs 0.10.1", + "bevy_math 0.10.1", + "bevy_reflect 0.10.1", + "bevy_tasks 0.10.1", + "bevy_utils 0.10.1", + "bytemuck", + "serde", +] + +[[package]] +name = "bevy_core" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "263b6a943ecba176c8390a1100615021f61a3b2d7a87e8eecf4009b6ed4457e0" +dependencies = [ + "bevy_app 0.11.0", + "bevy_ecs 0.11.0", + "bevy_math 0.11.0", + "bevy_reflect 0.11.0", + "bevy_tasks 0.11.0", + "bevy_utils 0.11.0", "bytemuck", "serde", ] @@ -586,16 +752,37 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "093ae5ced77251602ad6e43521e2acc1a5570bf85b80f232f1a7fdd43b50f8d8" dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_derive", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_render", - "bevy_transform", - "bevy_utils", - "bitflags", + "bevy_app 0.10.1", + "bevy_asset 0.10.1", + "bevy_derive 0.10.1", + "bevy_ecs 0.10.1", + "bevy_math 0.10.1", + "bevy_reflect 0.10.1", + "bevy_render 0.10.1", + "bevy_transform 0.10.1", + "bevy_utils 0.10.1", + "bitflags 1.3.2", + "radsort", + "serde", +] + +[[package]] +name = "bevy_core_pipeline" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50c70113b5c4106855b888f96d8574697eb9082713f976c9b6487c1f5ab28589" +dependencies = [ + "bevy_app 0.11.0", + "bevy_asset 0.11.0", + "bevy_core 0.11.0", + "bevy_derive 0.11.0", + "bevy_ecs 0.11.0", + "bevy_math 0.11.0", + "bevy_reflect 0.11.0", + "bevy_render 0.11.0", + "bevy_transform 0.11.0", + "bevy_utils 0.11.0", + "bitflags 2.3.3", "radsort", "serde", ] @@ -606,24 +793,50 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dff0add5ab4a6b2b7e86e18f9043bb48b6386faa3b56abaa0ed97a3d669a1992" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.10.1", "quote", "syn 1.0.109", ] +[[package]] +name = "bevy_derive" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1477347b17df781756ba0dfd677e2975e57e930752cd3cd42e6cdd8fdaa3223" +dependencies = [ + "bevy_macro_utils 0.11.0", + "quote", + "syn 2.0.15", +] + [[package]] name = "bevy_diagnostic" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64c778422643b0adee9e82abbd07e1e906eb9947c274a9b18e0f7fbf137d4c34" dependencies = [ - "bevy_app", - "bevy_core", - "bevy_ecs", - "bevy_log", - "bevy_time", - "bevy_utils", - "sysinfo", + "bevy_app 0.10.1", + "bevy_core 0.10.1", + "bevy_ecs 0.10.1", + "bevy_log 0.10.1", + "bevy_time 0.10.1", + "bevy_utils 0.10.1", + "sysinfo 0.28.4", +] + +[[package]] +name = "bevy_diagnostic" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37a594f970c261007cdd3edeccd61651c2cb4513de3d0b8b35d93f5d9c32c059" +dependencies = [ + "bevy_app 0.11.0", + "bevy_core 0.11.0", + "bevy_ecs 0.11.0", + "bevy_log 0.11.0", + "bevy_time 0.11.0", + "bevy_utils 0.11.0", + "sysinfo 0.29.4", ] [[package]] @@ -633,16 +846,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bed2f74687ccf13046c0f8e3b00dc61d7e656877b4a1380cf04635bb74d8e586" dependencies = [ "async-channel", - "bevy_ecs_macros", - "bevy_ptr", - "bevy_reflect", - "bevy_tasks", - "bevy_utils", + "bevy_ecs_macros 0.10.1", + "bevy_ptr 0.10.1", + "bevy_reflect 0.10.1", + "bevy_tasks 0.10.1", + "bevy_utils 0.10.1", + "downcast-rs", + "event-listener", + "fixedbitset", + "rustc-hash", + "serde", + "thread_local", +] + +[[package]] +name = "bevy_ecs" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "032c81ba7d919c1004b0abc33cc6c588c8f896a4d7c55a7c7aa1e46382242f43" +dependencies = [ + "async-channel", + "bevy_ecs_macros 0.11.0", + "bevy_ptr 0.11.0", + "bevy_reflect 0.11.0", + "bevy_tasks 0.11.0", + "bevy_utils 0.11.0", "downcast-rs", "event-listener", "fixedbitset", "rustc-hash", "serde", + "thiserror", "thread_local", ] @@ -652,19 +886,31 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a97fd126a0db7b30fb1833614b3a657b44ac88485741c33b2780e25de0f96d78" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.10.1", "proc-macro2", "quote", "syn 1.0.109", ] +[[package]] +name = "bevy_ecs_macros" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15ff7fcafdb8fe464ddd300b4860a76d5c6f9d684472e4bf21852d6f0ff3991" +dependencies = [ + "bevy_macro_utils 0.11.0", + "proc-macro2", + "quote", + "syn 2.0.15", +] + [[package]] name = "bevy_editor_pls" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6750134dae54c3799ecf6130d6590a33751fabd021d4b94300ae3da856dceff" dependencies = [ - "bevy", + "bevy 0.10.1", "bevy_editor_pls_core", "bevy_editor_pls_default_windows", "bevy_framepace", @@ -678,7 +924,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b460290aaf413da0668569e904da974f33ae8fecd11d9d14a36043fa2c44e000" dependencies = [ - "bevy", + "bevy 0.10.1", "bevy-inspector-egui", "egui_dock", "indexmap", @@ -690,7 +936,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d7d2fe16e2bd47f6b8e5bab2d7d8da4975616e28b041cba658283cf1c66ba1f" dependencies = [ - "bevy", + "bevy 0.10.1", "bevy-inspector-egui", "bevy_editor_pls_core", "bevy_mod_debugdump", @@ -707,7 +953,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5e269226c4a8fb659aa3161c19925650ebe2c23021ddf4dd9ed191cf708364f" dependencies = [ "arboard", - "bevy", + "bevy 0.10.1", "egui", "thread_local", "webbrowser", @@ -719,8 +965,18 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c086ebdc1f5522787d63772943277cc74a279445fb65db4d58c2c5330654648e" dependencies = [ - "bevy_macro_utils", - "encase_derive_impl", + "bevy_macro_utils 0.10.1", + "encase_derive_impl 0.5.0", +] + +[[package]] +name = "bevy_encase_derive" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdf808dbdc68a0c519e09026c627bda85250205a40ac02794866bff254d6b56" +dependencies = [ + "bevy_macro_utils 0.11.0", + "encase_derive_impl 0.6.1", ] [[package]] @@ -729,7 +985,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1825c5a485aa2a2ffd91cc1faa1f4d621c804a893ead88cafedbe1ed6c51d34" dependencies = [ - "bevy", + "bevy 0.10.1", "spin_sleep", ] @@ -739,10 +995,10 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f32eb07e8c9ea4be7195ccec10d8f9ad70200f3ae2e13adc4b84df9f50bb1c6" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_input", - "bevy_utils", + "bevy_app 0.10.1", + "bevy_ecs 0.10.1", + "bevy_input 0.10.1", + "bevy_utils 0.10.1", "gilrs", ] @@ -755,21 +1011,21 @@ dependencies = [ "anyhow", "base64 0.13.1", "bevy_animation", - "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_core_pipeline", - "bevy_ecs", - "bevy_hierarchy", - "bevy_log", - "bevy_math", + "bevy_app 0.10.1", + "bevy_asset 0.10.1", + "bevy_core 0.10.1", + "bevy_core_pipeline 0.10.1", + "bevy_ecs 0.10.1", + "bevy_hierarchy 0.10.1", + "bevy_log 0.10.1", + "bevy_math 0.10.1", "bevy_pbr", - "bevy_reflect", - "bevy_render", - "bevy_scene", - "bevy_tasks", - "bevy_transform", - "bevy_utils", + "bevy_reflect 0.10.1", + "bevy_render 0.10.1", + "bevy_scene 0.10.1", + "bevy_tasks 0.10.1", + "bevy_transform 0.10.1", + "bevy_utils 0.10.1", "gltf", "percent-encoding", "thiserror", @@ -781,12 +1037,27 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d04099865a13d1fd8bf3c044a80148cb3d23bfe8c3d5f082dda2ce091d85532" dependencies = [ - "bevy_app", - "bevy_core", - "bevy_ecs", - "bevy_log", - "bevy_reflect", - "bevy_utils", + "bevy_app 0.10.1", + "bevy_core 0.10.1", + "bevy_ecs 0.10.1", + "bevy_log 0.10.1", + "bevy_reflect 0.10.1", + "bevy_utils 0.10.1", + "smallvec", +] + +[[package]] +name = "bevy_hierarchy" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba41e1bb0c367b31e59b53ab858de56764c78bee87c121843c1ff033efa0086c" +dependencies = [ + "bevy_app 0.11.0", + "bevy_core 0.11.0", + "bevy_ecs 0.11.0", + "bevy_log 0.11.0", + "bevy_reflect 0.11.0", + "bevy_utils 0.11.0", "smallvec", ] @@ -796,11 +1067,26 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a15d40aa636bb656967ac16ca36066ab7a7bb9179e1b0390c5705e54208e8fd7" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_utils", + "bevy_app 0.10.1", + "bevy_ecs 0.10.1", + "bevy_math 0.10.1", + "bevy_reflect 0.10.1", + "bevy_utils 0.10.1", + "serde", + "thiserror", +] + +[[package]] +name = "bevy_input" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7221091c7b219a63a1f3f019512e8b72bed673230b97c3fcbca37ba566b1cffb" +dependencies = [ + "bevy_app 0.11.0", + "bevy_ecs 0.11.0", + "bevy_math 0.11.0", + "bevy_reflect 0.11.0", + "bevy_utils 0.11.0", "serde", "thiserror", ] @@ -811,36 +1097,67 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "862b11931c5874cb00778ffb715fc526ee49e52a493d3bcf50e8010f301858b3" dependencies = [ - "bevy_a11y", + "bevy_a11y 0.10.1", "bevy_animation", - "bevy_app", - "bevy_asset", - "bevy_audio", - "bevy_core", - "bevy_core_pipeline", - "bevy_derive", - "bevy_diagnostic", - "bevy_ecs", + "bevy_app 0.10.1", + "bevy_asset 0.10.1", + "bevy_audio 0.10.1", + "bevy_core 0.10.1", + "bevy_core_pipeline 0.10.1", + "bevy_derive 0.10.1", + "bevy_diagnostic 0.10.1", + "bevy_ecs 0.10.1", "bevy_gilrs", "bevy_gltf", - "bevy_hierarchy", - "bevy_input", - "bevy_log", - "bevy_math", + "bevy_hierarchy 0.10.1", + "bevy_input 0.10.1", + "bevy_log 0.10.1", + "bevy_math 0.10.1", "bevy_pbr", - "bevy_ptr", - "bevy_reflect", - "bevy_render", - "bevy_scene", + "bevy_ptr 0.10.1", + "bevy_reflect 0.10.1", + "bevy_render 0.10.1", + "bevy_scene 0.10.1", "bevy_sprite", - "bevy_tasks", + "bevy_tasks 0.10.1", "bevy_text", - "bevy_time", - "bevy_transform", + "bevy_time 0.10.1", + "bevy_transform 0.10.1", "bevy_ui", - "bevy_utils", - "bevy_window", - "bevy_winit", + "bevy_utils 0.10.1", + "bevy_window 0.10.1", + "bevy_winit 0.10.1", +] + +[[package]] +name = "bevy_internal" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f232e7bd2566abd05656789e3c6278a5ca2a24f1232dff525e5b0233a99a610" +dependencies = [ + "bevy_a11y 0.11.0", + "bevy_app 0.11.0", + "bevy_asset 0.11.0", + "bevy_audio 0.11.0", + "bevy_core 0.11.0", + "bevy_core_pipeline 0.11.0", + "bevy_derive 0.11.0", + "bevy_diagnostic 0.11.0", + "bevy_ecs 0.11.0", + "bevy_hierarchy 0.11.0", + "bevy_input 0.11.0", + "bevy_log 0.11.0", + "bevy_math 0.11.0", + "bevy_ptr 0.11.0", + "bevy_reflect 0.11.0", + "bevy_render 0.11.0", + "bevy_scene 0.11.0", + "bevy_tasks 0.11.0", + "bevy_time 0.11.0", + "bevy_transform 0.11.0", + "bevy_utils 0.11.0", + "bevy_window 0.11.0", + "bevy_winit 0.11.0", ] [[package]] @@ -849,10 +1166,26 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25980c90ceaad34d09a53291e72ca56fcc754a974cd4654fffcf5b68b283b7a7" dependencies = [ - "android_log-sys", - "bevy_app", - "bevy_ecs", - "bevy_utils", + "android_log-sys 0.2.0", + "bevy_app 0.10.1", + "bevy_ecs 0.10.1", + "bevy_utils 0.10.1", + "console_error_panic_hook", + "tracing-log", + "tracing-subscriber", + "tracing-wasm", +] + +[[package]] +name = "bevy_log" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487dfd1fc75fada8f3f2f4773addf3fbba53a2a91cb913616e6dc6c26dd62995" +dependencies = [ + "android_log-sys 0.3.0", + "bevy_app 0.11.0", + "bevy_ecs 0.11.0", + "bevy_utils 0.11.0", "console_error_panic_hook", "tracing-log", "tracing-subscriber", @@ -870,6 +1203,18 @@ dependencies = [ "toml_edit", ] +[[package]] +name = "bevy_macro_utils" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3868e555723249fde3786891f35893b3001b2be4efb51f431467cb7fc378cd" +dependencies = [ + "quote", + "rustc-hash", + "syn 2.0.15", + "toml_edit", +] + [[package]] name = "bevy_math" version = "0.10.1" @@ -880,6 +1225,16 @@ dependencies = [ "serde", ] +[[package]] +name = "bevy_math" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25088c6598fe0b8ded992c781dc49e613993c7a4e6a731c0f2ab0408add6afdb" +dependencies = [ + "glam 0.24.1", + "serde", +] + [[package]] name = "bevy_mikktspace" version = "0.10.1" @@ -889,16 +1244,25 @@ dependencies = [ "glam 0.23.0", ] +[[package]] +name = "bevy_mikktspace" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99dde80034660f7dbb473141c31f0a746acc7229f5a06ce769aba5f16fd592ab" +dependencies = [ + "glam 0.24.1", +] + [[package]] name = "bevy_mod_debugdump" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1e89dfbe148a165d3506eab7e7c0b5339ccc7f238a475def713026bc9e8c706" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_render", - "bevy_utils", + "bevy_app 0.10.1", + "bevy_ecs 0.10.1", + "bevy_render 0.10.1", + "bevy_utils 0.10.1", "once_cell", "petgraph", "pretty-type-name", @@ -910,18 +1274,18 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f507cef55812aa70c2ec2b30fb996eb285fa7497d974cf03f76ec49c77fbe27" dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_core_pipeline", - "bevy_derive", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_render", - "bevy_transform", - "bevy_utils", - "bevy_window", - "bitflags", + "bevy_app 0.10.1", + "bevy_asset 0.10.1", + "bevy_core_pipeline 0.10.1", + "bevy_derive 0.10.1", + "bevy_ecs 0.10.1", + "bevy_math 0.10.1", + "bevy_reflect 0.10.1", + "bevy_render 0.10.1", + "bevy_transform 0.10.1", + "bevy_utils 0.10.1", + "bevy_window 0.10.1", + "bitflags 1.3.2", "bytemuck", "radsort", ] @@ -932,16 +1296,22 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c4b88451d4c5a353bff67dbaa937b6886efd26ae114769c17f2b35099c7a4de" +[[package]] +name = "bevy_ptr" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c74fcf37593a0053f539c3b088f34f268cbefed031d8eb8ff0fb10d175160242" + [[package]] name = "bevy_reflect" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fc3979471890e336f3ba87961ef3ecd45c331cf2cb2f582c885e541af228b48" dependencies = [ - "bevy_math", - "bevy_ptr", - "bevy_reflect_derive", - "bevy_utils", + "bevy_math 0.10.1", + "bevy_ptr 0.10.1", + "bevy_reflect_derive 0.10.1", + "bevy_utils 0.10.1", "downcast-rs", "erased-serde", "glam 0.23.0", @@ -952,13 +1322,34 @@ dependencies = [ "thiserror", ] +[[package]] +name = "bevy_reflect" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "362492a6b66f676176705cc06017b012320fa260a9cf4baf3513387e9c05693e" +dependencies = [ + "bevy_math 0.11.0", + "bevy_ptr 0.11.0", + "bevy_reflect_derive 0.11.0", + "bevy_utils 0.11.0", + "downcast-rs", + "erased-serde", + "glam 0.24.1", + "once_cell", + "parking_lot 0.12.1", + "serde", + "smallvec", + "smol_str", + "thiserror", +] + [[package]] name = "bevy_reflect_derive" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bc7ea7c9bc2c531eb29ba5619976613d6680453ff5dd4a7fcd08848e8bec5ad" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.10.1", "bit-set", "proc-macro2", "quote", @@ -966,6 +1357,20 @@ dependencies = [ "uuid 1.3.3", ] +[[package]] +name = "bevy_reflect_derive" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e974d78eaf1b45e1b4146711b5c16e37c24234e12f3a52f5f2e28332c969d3c" +dependencies = [ + "bevy_macro_utils 0.11.0", + "bit-set", + "proc-macro2", + "quote", + "syn 2.0.15", + "uuid 1.3.3", +] + [[package]] name = "bevy_render" version = "0.10.1" @@ -974,32 +1379,32 @@ checksum = "ee1e126226f0a4d439bf82fe07c1104f894a6a365888e3eba7356f9647e77a83" dependencies = [ "anyhow", "async-channel", - "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_derive", - "bevy_ecs", - "bevy_encase_derive", - "bevy_hierarchy", - "bevy_log", - "bevy_math", - "bevy_mikktspace", - "bevy_reflect", - "bevy_render_macros", - "bevy_tasks", - "bevy_time", - "bevy_transform", - "bevy_utils", - "bevy_window", - "bitflags", + "bevy_app 0.10.1", + "bevy_asset 0.10.1", + "bevy_core 0.10.1", + "bevy_derive 0.10.1", + "bevy_ecs 0.10.1", + "bevy_encase_derive 0.10.1", + "bevy_hierarchy 0.10.1", + "bevy_log 0.10.1", + "bevy_math 0.10.1", + "bevy_mikktspace 0.10.1", + "bevy_reflect 0.10.1", + "bevy_render_macros 0.10.1", + "bevy_tasks 0.10.1", + "bevy_time 0.10.1", + "bevy_transform 0.10.1", + "bevy_utils 0.10.1", + "bevy_window 0.10.1", + "bitflags 1.3.2", "codespan-reporting", "downcast-rs", - "encase", + "encase 0.5.0", "futures-lite", - "hexasphere", + "hexasphere 8.1.0", "image", "ktx2", - "naga", + "naga 0.11.0", "once_cell", "parking_lot 0.12.1", "regex", @@ -1008,8 +1413,56 @@ dependencies = [ "smallvec", "thiserror", "thread_local", - "wgpu", - "wgpu-hal", + "wgpu 0.15.1", + "wgpu-hal 0.15.4", +] + +[[package]] +name = "bevy_render" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46e4b6a82c3a2be1c0d0cbecf62debb8251b72c0ae76285f66265aabc5bf2d37" +dependencies = [ + "anyhow", + "async-channel", + "bevy_app 0.11.0", + "bevy_asset 0.11.0", + "bevy_core 0.11.0", + "bevy_derive 0.11.0", + "bevy_ecs 0.11.0", + "bevy_encase_derive 0.11.0", + "bevy_hierarchy 0.11.0", + "bevy_log 0.11.0", + "bevy_math 0.11.0", + "bevy_mikktspace 0.11.0", + "bevy_reflect 0.11.0", + "bevy_render_macros 0.11.0", + "bevy_tasks 0.11.0", + "bevy_time 0.11.0", + "bevy_transform 0.11.0", + "bevy_utils 0.11.0", + "bevy_window 0.11.0", + "bitflags 2.3.3", + "bytemuck", + "codespan-reporting", + "downcast-rs", + "encase 0.6.1", + "futures-lite", + "hexasphere 9.1.0", + "image", + "js-sys", + "naga 0.12.3", + "naga_oil", + "parking_lot 0.12.1", + "regex", + "serde", + "smallvec", + "thiserror", + "thread_local", + "wasm-bindgen", + "web-sys", + "wgpu 0.16.2", + "wgpu-hal 0.16.2", ] [[package]] @@ -1018,12 +1471,24 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "652f8c4d9577c6e6a8b3dfd8a4ce331e8b6ecdbb99636a4b2701dec50104d6bc" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.10.1", "proc-macro2", "quote", "syn 1.0.109", ] +[[package]] +name = "bevy_render_macros" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07c4d937f966644f5e1e3c9157736acdd36286bcce06142ff9ad25cd71348c09" +dependencies = [ + "bevy_macro_utils 0.11.0", + "proc-macro2", + "quote", + "syn 2.0.15", +] + [[package]] name = "bevy_scene" version = "0.10.1" @@ -1031,15 +1496,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1de59637d27726251091120ce6f63917328ffd60aaccbda4d65a615873aff631" dependencies = [ "anyhow", - "bevy_app", - "bevy_asset", - "bevy_derive", - "bevy_ecs", - "bevy_hierarchy", - "bevy_reflect", - "bevy_render", - "bevy_transform", - "bevy_utils", + "bevy_app 0.10.1", + "bevy_asset 0.10.1", + "bevy_derive 0.10.1", + "bevy_ecs 0.10.1", + "bevy_hierarchy 0.10.1", + "bevy_reflect 0.10.1", + "bevy_render 0.10.1", + "bevy_transform 0.10.1", + "bevy_utils 0.10.1", + "ron", + "serde", + "thiserror", + "uuid 1.3.3", +] + +[[package]] +name = "bevy_scene" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1e00eb30e2053d9fff0802b2f557350b4e66bac58d531de30882048b4e3232" +dependencies = [ + "anyhow", + "bevy_app 0.11.0", + "bevy_asset 0.11.0", + "bevy_derive 0.11.0", + "bevy_ecs 0.11.0", + "bevy_hierarchy 0.11.0", + "bevy_reflect 0.11.0", + "bevy_render 0.11.0", + "bevy_transform 0.11.0", + "bevy_utils 0.11.0", "ron", "serde", "thiserror", @@ -1052,18 +1539,18 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c110358fe3651a5796fd1c07989635680738f5b5c7e9b8a463dd50d12bb78410" dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_core_pipeline", - "bevy_derive", - "bevy_ecs", - "bevy_log", - "bevy_math", - "bevy_reflect", - "bevy_render", - "bevy_transform", - "bevy_utils", - "bitflags", + "bevy_app 0.10.1", + "bevy_asset 0.10.1", + "bevy_core_pipeline 0.10.1", + "bevy_derive 0.10.1", + "bevy_ecs 0.10.1", + "bevy_log 0.10.1", + "bevy_math 0.10.1", + "bevy_reflect 0.10.1", + "bevy_render 0.10.1", + "bevy_transform 0.10.1", + "bevy_utils 0.10.1", + "bitflags 1.3.2", "bytemuck", "fixedbitset", "guillotiere", @@ -1077,7 +1564,7 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f873dd5be1022006f78f57cefb939e5f6bd106fda335da6170abb974e20ce28" dependencies = [ - "bevy", + "bevy 0.10.1", ] [[package]] @@ -1095,6 +1582,20 @@ dependencies = [ "wasm-bindgen-futures", ] +[[package]] +name = "bevy_tasks" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faab904296a3d6976bb8a12bc0f42f6c98fb6cd87a96244e0151d359f684ec2d" +dependencies = [ + "async-channel", + "async-executor", + "async-task", + "concurrent-queue", + "futures-lite", + "wasm-bindgen-futures", +] + [[package]] name = "bevy_text" version = "0.10.1" @@ -1103,16 +1604,16 @@ checksum = "995188f59dc06da3fc951e1f58a105cde2c817d5330ae67ddc0a140f46482f6b" dependencies = [ "ab_glyph", "anyhow", - "bevy_app", - "bevy_asset", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_render", + "bevy_app 0.10.1", + "bevy_asset 0.10.1", + "bevy_ecs 0.10.1", + "bevy_math 0.10.1", + "bevy_reflect 0.10.1", + "bevy_render 0.10.1", "bevy_sprite", - "bevy_transform", - "bevy_utils", - "bevy_window", + "bevy_transform 0.10.1", + "bevy_utils 0.10.1", + "bevy_window 0.10.1", "glyph_brush_layout", "serde", "thiserror", @@ -1124,10 +1625,25 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3edbd605df1bced312eb9888d6be3d5a5fcac3d4140038bbe3233d218399eef" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_reflect", - "bevy_utils", + "bevy_app 0.10.1", + "bevy_ecs 0.10.1", + "bevy_reflect 0.10.1", + "bevy_utils 0.10.1", + "crossbeam-channel", + "serde", + "thiserror", +] + +[[package]] +name = "bevy_time" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d09225ad2ffef14da000080143730b36ba225844ae479e4791cdb9d08066d06a" +dependencies = [ + "bevy_app 0.11.0", + "bevy_ecs 0.11.0", + "bevy_reflect 0.11.0", + "bevy_utils 0.11.0", "crossbeam-channel", "serde", "thiserror", @@ -1139,11 +1655,25 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24383dfb97d8a14b17721ecfdf58556eff5ea9a4b2a3d91accf2b472783880b0" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_hierarchy", - "bevy_math", - "bevy_reflect", + "bevy_app 0.10.1", + "bevy_ecs 0.10.1", + "bevy_hierarchy 0.10.1", + "bevy_math 0.10.1", + "bevy_reflect 0.10.1", + "serde", +] + +[[package]] +name = "bevy_transform" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da8a0cd3780e120e20be333cc48d41cb74620d798dc61bc18eb2a82d3545e184" +dependencies = [ + "bevy_app 0.11.0", + "bevy_ecs 0.11.0", + "bevy_hierarchy 0.11.0", + "bevy_math 0.11.0", + "bevy_reflect 0.11.0", "serde", ] @@ -1153,23 +1683,23 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb597aeed4e1bf5e6913879c3e22a7d50a843b822a7f71a4a80ebdfdf79e68d4" dependencies = [ - "bevy_a11y", - "bevy_app", - "bevy_asset", - "bevy_core_pipeline", - "bevy_derive", - "bevy_ecs", - "bevy_hierarchy", - "bevy_input", - "bevy_log", - "bevy_math", - "bevy_reflect", - "bevy_render", + "bevy_a11y 0.10.1", + "bevy_app 0.10.1", + "bevy_asset 0.10.1", + "bevy_core_pipeline 0.10.1", + "bevy_derive 0.10.1", + "bevy_ecs 0.10.1", + "bevy_hierarchy 0.10.1", + "bevy_input 0.10.1", + "bevy_log 0.10.1", + "bevy_math 0.10.1", + "bevy_reflect 0.10.1", + "bevy_render 0.10.1", "bevy_sprite", "bevy_text", - "bevy_transform", - "bevy_utils", - "bevy_window", + "bevy_transform 0.10.1", + "bevy_utils 0.10.1", + "bevy_window 0.10.1", "bytemuck", "serde", "smallvec", @@ -1184,7 +1714,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a88ebbca55d360d72e9fe78df0d22e25cd419933c9559e79dae2757f7c4d066" dependencies = [ "ahash 0.7.6", - "bevy_utils_proc_macros", + "bevy_utils_proc_macros 0.10.1", "getrandom", "hashbrown 0.12.3", "instant", @@ -1194,6 +1724,23 @@ dependencies = [ "uuid 1.3.3", ] +[[package]] +name = "bevy_utils" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10bfde141f0cdd15e07bca72f4439a9db80877c283738f581d061972ef483b1b" +dependencies = [ + "ahash 0.8.3", + "bevy_utils_proc_macros 0.11.0", + "getrandom", + "hashbrown 0.14.0", + "instant", + "petgraph", + "thiserror", + "tracing", + "uuid 1.3.3", +] + [[package]] name = "bevy_utils_proc_macros" version = "0.10.1" @@ -1205,41 +1752,93 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "bevy_utils_proc_macros" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e37f2e885b0e8af59dc19871c313d3cf2a2495db35bb4d4ae0a61b3f87d5401" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] + [[package]] name = "bevy_window" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad31234754268fbe12050290b0496e2296252a16995a38f94bfb9680a4f09fda" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_input", - "bevy_math", - "bevy_reflect", - "bevy_utils", + "bevy_app 0.10.1", + "bevy_ecs 0.10.1", + "bevy_input 0.10.1", + "bevy_math 0.10.1", + "bevy_reflect 0.10.1", + "bevy_utils 0.10.1", + "raw-window-handle", + "serde", +] + +[[package]] +name = "bevy_window" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0528832361e3d942df287c90537ef6fafb726c4934468a7c3a5d53d659bfbf54" +dependencies = [ + "bevy_app 0.11.0", + "bevy_ecs 0.11.0", + "bevy_input 0.11.0", + "bevy_math 0.11.0", + "bevy_reflect 0.11.0", + "bevy_utils 0.11.0", + "raw-window-handle", + "serde", +] + +[[package]] +name = "bevy_winit" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf17bd6330f7e633b7c56754c776511a8f52cde4bf54c0278f34d7527548f253" +dependencies = [ + "accesskit_winit 0.12.4", + "approx", + "bevy_a11y 0.10.1", + "bevy_app 0.10.1", + "bevy_derive 0.10.1", + "bevy_ecs 0.10.1", + "bevy_hierarchy 0.10.1", + "bevy_input 0.10.1", + "bevy_math 0.10.1", + "bevy_utils 0.10.1", + "bevy_window 0.10.1", + "crossbeam-channel", + "once_cell", "raw-window-handle", - "serde", + "wasm-bindgen", + "web-sys", + "winit", ] [[package]] name = "bevy_winit" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf17bd6330f7e633b7c56754c776511a8f52cde4bf54c0278f34d7527548f253" +checksum = "24c6709dc70cfee1eb94d5f125d29612c4a9345dfc1a70dd3189af927b2fd503" dependencies = [ - "accesskit_winit", + "accesskit_winit 0.14.1", "approx", - "bevy_a11y", - "bevy_app", - "bevy_derive", - "bevy_ecs", - "bevy_hierarchy", - "bevy_input", - "bevy_math", - "bevy_utils", - "bevy_window", + "bevy_a11y 0.11.0", + "bevy_app 0.11.0", + "bevy_derive 0.11.0", + "bevy_ecs 0.11.0", + "bevy_hierarchy 0.11.0", + "bevy_input 0.11.0", + "bevy_math 0.11.0", + "bevy_tasks 0.11.0", + "bevy_utils 0.11.0", + "bevy_window 0.11.0", "crossbeam-channel", - "once_cell", "raw-window-handle", "wasm-bindgen", "web-sys", @@ -1251,7 +1850,7 @@ name = "bevy_yarn_slinger" version = "0.1.0" dependencies = [ "anyhow", - "bevy", + "bevy 0.11.0", "csv", "rand", "seldom_fn_plugin", @@ -1265,7 +1864,7 @@ dependencies = [ name = "bevy_yarn_slinger_demo" version = "0.1.0" dependencies = [ - "bevy", + "bevy 0.10.1", "bevy_editor_pls", "bevy_sprite3d", "bevy_yarn_slinger", @@ -1276,7 +1875,7 @@ dependencies = [ name = "bevy_yarn_slinger_example_dialogue_view" version = "0.1.0" dependencies = [ - "bevy", + "bevy 0.10.1", "bevy_yarn_slinger", "seldom_fn_plugin", "unicode-segmentation", @@ -1297,7 +1896,7 @@ version = "0.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "lazy_static", @@ -1332,6 +1931,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + [[package]] name = "block" version = "0.1.6" @@ -1540,7 +2145,7 @@ checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", - "libloading", + "libloading 0.7.4", ] [[package]] @@ -1562,7 +2167,7 @@ checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" dependencies = [ "anstream", "anstyle", - "bitflags", + "bitflags 1.3.2", "clap_lex", "strsim", ] @@ -1683,12 +2288,27 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b" +[[package]] +name = "const_soft_float" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4001a314cf9c48da20f9d782592e5991012ed0ac952ddc73f9e8878cd8ae90da" + [[package]] name = "constant_time_eq" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +[[package]] +name = "constgebra" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd23e864550e6dafc1e41ac78ce4f1ccddc8672b40c403524a04ff3f0518420" +dependencies = [ + "const_soft_float", +] + [[package]] name = "core-foundation" version = "0.9.3" @@ -1717,7 +2337,7 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-graphics-types", "foreign-types", @@ -1730,7 +2350,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "foreign-types", "libc", @@ -1742,7 +2362,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb17e2d1795b1996419648915df94bc7103c28f7b48062d7acf4652fc371b2ff" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation-sys 0.6.2", "coreaudio-sys", ] @@ -1898,8 +2518,8 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" dependencies = [ - "bitflags", - "libloading", + "bitflags 1.3.2", + "libloading 0.7.4", "winapi", ] @@ -1943,6 +2563,12 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" +[[package]] +name = "data-encoding" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" + [[package]] name = "databake" version = "0.1.5" @@ -2022,7 +2648,7 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "add9a102807b524ec050363f09e06f1504214b0e1c7797f64261c891022dce8b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "byteorder", "lazy_static", "proc-macro-error", @@ -2112,18 +2738,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6591f13a63571c4821802eb5b10fd1155b1290bce87086440003841c8c3909b" dependencies = [ "const_panic", - "encase_derive", + "encase_derive 0.5.0", "glam 0.23.0", "thiserror", ] +[[package]] +name = "encase" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fce2eeef77fd4a293a54b62aa00ac9daebfbcda4bf8998c5a815635b004aa1c" +dependencies = [ + "const_panic", + "encase_derive 0.6.1", + "glam 0.24.1", + "thiserror", +] + [[package]] name = "encase_derive" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f1da6deed1f8b6f5909616ffa695f63a5de54d6a0f084fa715c70c8ed3abac9" dependencies = [ - "encase_derive_impl", + "encase_derive_impl 0.5.0", +] + +[[package]] +name = "encase_derive" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e520cde08cbf4f7cc097f61573ec06ce467019803de8ae82fb2823fa1554a0e" +dependencies = [ + "encase_derive_impl 0.6.1", ] [[package]] @@ -2137,6 +2784,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "encase_derive_impl" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fe2568f851fd6144a45fa91cfed8fe5ca8fc0b56ba6797bfc1ed2771b90e37c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.15", +] + [[package]] name = "encode_unicode" version = "0.3.6" @@ -2567,6 +3225,16 @@ dependencies = [ "serde", ] +[[package]] +name = "glam" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42218cb640844e3872cc3c153dc975229e080a6c4733b34709ef445610550226" +dependencies = [ + "bytemuck", + "serde", +] + [[package]] name = "glob" version = "0.3.1" @@ -2638,7 +3306,7 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gpu-alloc-types", ] @@ -2648,7 +3316,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -2670,7 +3338,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gpu-descriptor-types", "hashbrown 0.12.3", ] @@ -2681,7 +3349,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -2732,18 +3400,44 @@ dependencies = [ "serde", ] +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +dependencies = [ + "ahash 0.8.3", + "allocator-api2", + "serde", +] + [[package]] name = "hassle-rs" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90601c6189668c7345fc53842cb3f3a3d872203d523be1b3cb44a36a3e62fb85" dependencies = [ - "bitflags", + "bitflags 1.3.2", + "com-rs", + "libc", + "libloading 0.7.4", + "thiserror", + "widestring 0.5.1", + "winapi", +] + +[[package]] +name = "hassle-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" +dependencies = [ + "bitflags 1.3.2", "com-rs", "libc", - "libloading", + "libloading 0.7.4", "thiserror", - "widestring", + "widestring 1.0.2", "winapi", ] @@ -2787,6 +3481,16 @@ dependencies = [ "once_cell", ] +[[package]] +name = "hexasphere" +version = "9.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cb3df16a7bcb1b5bc092abd55e14f77ca70aea14445026e264586fc62889a10" +dependencies = [ + "constgebra", + "glam 0.24.1", +] + [[package]] name = "hexf-parse" version = "0.2.1" @@ -3384,7 +4088,7 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" dependencies = [ - "bitflags", + "bitflags 1.3.2", "inotify-sys", "libc", ] @@ -3545,7 +4249,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" dependencies = [ "libc", - "libloading", + "libloading 0.7.4", "pkg-config", ] @@ -3565,7 +4269,7 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", ] @@ -3575,7 +4279,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87d65e08a9ec02e409d27a0139eaa6b9756b4d81fe7cde71f6941a83730ce838" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -3609,9 +4313,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.141" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libloading" @@ -3623,6 +4327,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "libloading" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" +dependencies = [ + "cfg-if 1.0.0", + "windows-sys 0.48.0", +] + [[package]] name = "libm" version = "0.2.6" @@ -3779,7 +4493,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "core-graphics-types", "foreign-types", @@ -3858,7 +4572,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5eafe22a23b797c9bc227c6c896419b26b5bb88fa903417a3adaed08778850d5" dependencies = [ "bit-set", - "bitflags", + "bitflags 1.3.2", "codespan-reporting", "hexf-parse", "indexmap", @@ -3873,6 +4587,47 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "naga" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb" +dependencies = [ + "bit-set", + "bitflags 1.3.2", + "codespan-reporting", + "hexf-parse", + "indexmap", + "log", + "num-traits", + "pp-rs", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + +[[package]] +name = "naga_oil" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d9c27fc9c84580434af75123d13ad98d9a56e16d033b16dcfa6940728c8c225" +dependencies = [ + "bit-set", + "codespan-reporting", + "data-encoding", + "indexmap", + "naga 0.12.3", + "once_cell", + "regex", + "regex-syntax 0.6.29", + "rustc-hash", + "thiserror", + "tracing", + "unicode-ident", +] + [[package]] name = "native-tls" version = "0.2.11" @@ -3910,7 +4665,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "jni-sys", "ndk-sys", "num_enum", @@ -3939,7 +4694,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "libc", "memoffset 0.6.5", @@ -3951,7 +4706,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "libc", "static_assertions", @@ -3979,7 +4734,25 @@ version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "729f63e1ca555a43fe3efa4f3efdf4801c479da85b432242a7b726f353c88486" dependencies = [ - "bitflags", + "bitflags 1.3.2", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "mio", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "notify" +version = "6.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5738a2795d57ea20abec2d6d76c6081186709c0024187cd5977265eda6598b51" +dependencies = [ + "bitflags 1.3.2", "crossbeam-channel", "filetime", "fsevent-sys", @@ -4244,7 +5017,7 @@ version = "0.10.55" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "foreign-types", "libc", @@ -4435,7 +5208,7 @@ version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", @@ -4709,7 +5482,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -4718,7 +5491,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -4769,7 +5542,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76e189c2369884dce920945e2ddf79b3dff49e071a167dd1817fa9c4c00d512e" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "mach", "winapi", @@ -4790,6 +5563,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157" +[[package]] +name = "renderdoc-sys" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" + [[package]] name = "reqwest" version = "0.11.17" @@ -4869,7 +5648,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff" dependencies = [ "base64 0.13.1", - "bitflags", + "bitflags 1.3.2", "serde", ] @@ -4900,7 +5679,7 @@ version = "0.37.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "722529a737f5a942fdbac3a46cee213053196737c5eaa3386d52e85b786f2659" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", @@ -4966,7 +5745,7 @@ version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys 0.8.4", "libc", @@ -4989,7 +5768,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fe39c9c3154c4f55410e499f0fa4473868536a4b281d38d4b7cc775ea5a0182" dependencies = [ - "bevy", + "bevy 0.10.1", ] [[package]] @@ -5181,6 +5960,15 @@ dependencies = [ "serde", ] +[[package]] +name = "smol_str" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" +dependencies = [ + "serde", +] + [[package]] name = "socket2" version = "0.4.9" @@ -5207,7 +5995,7 @@ version = "0.2.0+1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" dependencies = [ - "bitflags", + "bitflags 1.3.2", "num-traits", ] @@ -5372,6 +6160,20 @@ dependencies = [ "winapi", ] +[[package]] +name = "sysinfo" +version = "0.29.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "751e810399bba86e9326f5762b7f32ac5a085542df78da6a78d94e07d14d7c11" +dependencies = [ + "cfg-if 1.0.0", + "core-foundation-sys 0.8.4", + "libc", + "ntapi", + "once_cell", + "winapi", +] + [[package]] name = "taffy" version = "0.3.12" @@ -5708,7 +6510,7 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "static_assertions", ] @@ -6057,7 +6859,7 @@ dependencies = [ "enum-iterator", "enumset", "leb128", - "libloading", + "libloading 0.7.4", "loupe", "object 0.28.4", "rkyv", @@ -6266,7 +7068,7 @@ dependencies = [ "cfg-if 1.0.0", "js-sys", "log", - "naga", + "naga 0.11.0", "parking_lot 0.12.1", "profiling", "raw-window-handle", @@ -6275,9 +7077,33 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu-core", - "wgpu-hal", - "wgpu-types", + "wgpu-core 0.15.1", + "wgpu-hal 0.15.4", + "wgpu-types 0.15.2", +] + +[[package]] +name = "wgpu" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8aa4361a426ff9f028520da01e8fda28ab9bdb029e2a76901f1f88317e2796e9" +dependencies = [ + "arrayvec", + "cfg-if 1.0.0", + "js-sys", + "log", + "naga 0.12.3", + "parking_lot 0.11.2", + "profiling", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core 0.16.1", + "wgpu-hal 0.16.2", + "wgpu-types 0.16.1", ] [[package]] @@ -6288,19 +7114,42 @@ checksum = "7131408d940e335792645a98f03639573b0480e9e2e7cddbbab74f7c6d9f3fff" dependencies = [ "arrayvec", "bit-vec", - "bitflags", + "bitflags 1.3.2", "codespan-reporting", "fxhash", "log", - "naga", + "naga 0.11.0", "parking_lot 0.12.1", "profiling", "raw-window-handle", "smallvec", "thiserror", "web-sys", - "wgpu-hal", - "wgpu-types", + "wgpu-hal 0.15.4", + "wgpu-types 0.15.2", +] + +[[package]] +name = "wgpu-core" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.3.3", + "codespan-reporting", + "log", + "naga 0.12.3", + "parking_lot 0.11.2", + "profiling", + "raw-window-handle", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal 0.16.2", + "wgpu-types 0.16.1", ] [[package]] @@ -6313,7 +7162,7 @@ dependencies = [ "arrayvec", "ash", "bit-set", - "bitflags", + "bitflags 1.3.2", "block", "core-graphics-types", "d3d12", @@ -6323,25 +7172,67 @@ dependencies = [ "gpu-alloc", "gpu-allocator", "gpu-descriptor", - "hassle-rs", + "hassle-rs 0.9.0", "js-sys", "khronos-egl", "libc", - "libloading", + "libloading 0.7.4", "log", "metal", - "naga", + "naga 0.11.0", "objc", "parking_lot 0.12.1", "profiling", "range-alloc", "raw-window-handle", - "renderdoc-sys", + "renderdoc-sys 0.7.1", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types 0.15.2", + "winapi", +] + +[[package]] +name = "wgpu-hal" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.3.3", + "block", + "core-graphics-types", + "d3d12", + "foreign-types", + "glow", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hassle-rs 0.10.0", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.0", + "log", + "metal", + "naga 0.12.3", + "objc", + "parking_lot 0.11.2", + "profiling", + "range-alloc", + "raw-window-handle", + "renderdoc-sys 1.0.0", + "rustc-hash", "smallvec", "thiserror", "wasm-bindgen", "web-sys", - "wgpu-types", + "wgpu-types 0.16.1", "winapi", ] @@ -6351,7 +7242,18 @@ version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32444e121b0bd00cb02c0de32fde457a9491bd44e03e7a5db6df9b1da2f6f110" dependencies = [ - "bitflags", + "bitflags 1.3.2", + "js-sys", + "web-sys", +] + +[[package]] +name = "wgpu-types" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a" +dependencies = [ + "bitflags 2.3.3", "js-sys", "web-sys", ] @@ -6373,6 +7275,12 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + [[package]] name = "winapi" version = "0.3.9" @@ -6652,7 +7560,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "866db3f712fffba75d31bf0cdecf357c8aeafd158c5b7ab51dba2a2b2d47f196" dependencies = [ "android-activity", - "bitflags", + "bitflags 1.3.2", "cfg_aliases", "core-foundation", "core-graphics", @@ -6798,7 +7706,7 @@ dependencies = [ "annotate-snippets", "antlr-rust", "better_any", - "bevy", + "bevy 0.10.1", "rand", "regex", "serde", @@ -6812,7 +7720,7 @@ dependencies = [ name = "yarn_slinger_core" version = "0.1.0" dependencies = [ - "bevy", + "bevy 0.10.1", "bytes", "paste", "prost", @@ -6827,7 +7735,7 @@ dependencies = [ name = "yarn_slinger_examples" version = "0.1.0" dependencies = [ - "bevy", + "bevy 0.10.1", "bevy_yarn_slinger", "bevy_yarn_slinger_example_dialogue_view", ] @@ -6845,7 +7753,7 @@ dependencies = [ name = "yarn_slinger_runtime" version = "0.1.0" dependencies = [ - "bevy", + "bevy 0.10.1", "fixed_decimal", "icu_locid", "icu_plurals", diff --git a/crates/bevy_plugin/Cargo.toml b/crates/bevy_plugin/Cargo.toml index 2e79dc83..6565bbec 100644 --- a/crates/bevy_plugin/Cargo.toml +++ b/crates/bevy_plugin/Cargo.toml @@ -19,7 +19,7 @@ sha2 = "0.10" rand = { version = "0.8", features = ["small_rng"] } [dependencies.bevy] -version = "0.10" +version = "0.11" default-features = false features = ["bevy_asset", "serialize"] @@ -27,6 +27,13 @@ features = ["bevy_asset", "serialize"] tempfile = "3" [dev-dependencies.bevy] -version = "0.10" +version = "0.11" default-features = false -features = ["bevy_core_pipeline", "bevy_render", "bevy_winit", "filesystem_watcher", "x11", "bevy_audio"] +features = [ + "bevy_core_pipeline", + "bevy_render", + "bevy_winit", + "filesystem_watcher", + "x11", + "bevy_audio", +] From 9372e962c96df20dbf05c071421321629a5ba1dd Mon Sep 17 00:00:00 2001 From: Tim Jentzsch Date: Sat, 15 Jul 2023 14:24:52 +0200 Subject: [PATCH 02/24] Remove FromReflect derives FromReflect is now derived automatically when Reflect is derived --- .../src/development_file_generation.rs | 2 +- .../src/localization/strings_file/asset.rs | 2 +- .../src/localization/strings_file/updating.rs | 2 +- crates/bevy_plugin/src/project/compilation.rs | 6 +- crates/bevy_plugin/src/yarn_file_asset.rs | 2 +- crates/codegen/src/bin/generate_proto.rs | 2 +- crates/compiler/src/compiler.rs | 6 +- .../listeners/error_listener/diagnostic.rs | 4 +- crates/compiler/src/output.rs | 4 +- crates/compiler/src/output/debug_info.rs | 4 +- crates/compiler/src/output/declaration.rs | 4 +- crates/compiler/src/output/string_info.rs | 2 +- crates/core/src/feature_gates.rs | 2 +- crates/core/src/generated/ext.rs | 2 +- crates/core/src/generated/yarn.rs | 58 ++++++++++--------- crates/core/src/internal_value.rs | 2 +- crates/core/src/line_id.rs | 2 +- crates/core/src/operator.rs | 2 +- crates/core/src/position.rs | 2 +- crates/core/src/types/function.rs | 2 +- crates/core/src/types/type.rs | 2 +- crates/core/src/yarn_value.rs | 2 +- crates/example_dialogue_view/src/updating.rs | 2 +- crates/runtime/src/analyser/diagnosis.rs | 4 +- crates/runtime/src/command.rs | 2 +- crates/runtime/src/dialogue_option.rs | 4 +- crates/runtime/src/events.rs | 2 +- crates/runtime/src/line.rs | 2 +- crates/runtime/src/markup/line_parser.rs | 2 +- .../runtime/src/markup/markup_parse_error.rs | 2 +- .../markup/parsed_markup/markup_attribute.rs | 2 +- .../src/markup/parsed_markup/markup_value.rs | 2 +- .../src/virtual_machine/execution_state.rs | 2 +- crates/runtime/src/virtual_machine/state.rs | 2 +- 34 files changed, 73 insertions(+), 71 deletions(-) diff --git a/crates/bevy_plugin/src/development_file_generation.rs b/crates/bevy_plugin/src/development_file_generation.rs index f72ed453..d900fe62 100644 --- a/crates/bevy_plugin/src/development_file_generation.rs +++ b/crates/bevy_plugin/src/development_file_generation.rs @@ -7,7 +7,7 @@ pub(crate) fn development_file_generation_plugin(app: &mut App) { /// The kind of development experience you wish when creating yarn files and dealing with missing localizations. /// Defaults to [`DevelopmentFileGeneration::TRY_FULL`] in debug builds, [`DevelopmentFileGeneration::None`] otherwise. -#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Reflect, FromReflect, Serialize, Deserialize)] +#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Reflect, Serialize, Deserialize)] #[reflect(Debug, Default, PartialEq, Hash, Serialize, Deserialize)] #[non_exhaustive] pub enum DevelopmentFileGeneration { diff --git a/crates/bevy_plugin/src/localization/strings_file/asset.rs b/crates/bevy_plugin/src/localization/strings_file/asset.rs index 39db303b..d2675e84 100644 --- a/crates/bevy_plugin/src/localization/strings_file/asset.rs +++ b/crates/bevy_plugin/src/localization/strings_file/asset.rs @@ -261,7 +261,7 @@ pub(crate) struct StringsFileRecord { pub(crate) comment: String, } -#[derive(Debug, Clone, Eq, PartialEq, Hash, Reflect, Serialize, Deserialize, FromReflect)] +#[derive(Debug, Clone, Eq, PartialEq, Hash, Reflect, Serialize, Deserialize)] #[reflect(Debug, PartialEq, Hash, Serialize, Deserialize)] pub(crate) struct Lock(String); diff --git a/crates/bevy_plugin/src/localization/strings_file/updating.rs b/crates/bevy_plugin/src/localization/strings_file/updating.rs index 50c2f581..7283d2f3 100644 --- a/crates/bevy_plugin/src/localization/strings_file/updating.rs +++ b/crates/bevy_plugin/src/localization/strings_file/updating.rs @@ -20,7 +20,7 @@ pub(crate) fn strings_file_updating_plugin(app: &mut App) { ); } -#[derive(Debug, Clone, PartialEq, Eq, Default, Reflect, FromReflect)] +#[derive(Debug, Clone, PartialEq, Eq, Default, Reflect)] #[reflect(Debug, Default, PartialEq)] pub(crate) struct UpdateAllStringsFilesForStringTableEvent( pub(crate) std::collections::HashMap, diff --git a/crates/bevy_plugin/src/project/compilation.rs b/crates/bevy_plugin/src/project/compilation.rs index 8467bb2a..6f6ceddc 100644 --- a/crates/bevy_plugin/src/project/compilation.rs +++ b/crates/bevy_plugin/src/project/compilation.rs @@ -38,11 +38,11 @@ pub(crate) struct YarnProjectConfigToLoad { pub(crate) development_file_generation: DevelopmentFileGeneration, } -#[derive(Debug, Clone, PartialEq, Eq, Default, Resource, Reflect, FromReflect)] +#[derive(Debug, Clone, PartialEq, Eq, Default, Resource, Reflect)] #[reflect(Debug, Resource, Default, PartialEq)] pub(crate) struct YarnFilesToLoad(pub(crate) HashSet); -#[derive(Debug, Clone, PartialEq, Eq, Default, Resource, Reflect, FromReflect)] +#[derive(Debug, Clone, PartialEq, Eq, Default, Resource, Reflect)] #[reflect(Debug, Resource, Default, PartialEq)] pub(crate) struct YarnFilesBeingLoaded(pub(crate) HashSet>); @@ -95,7 +95,7 @@ fn add_yarn_files_to_load_queue( yarn_files_being_loaded.0.extend(handles); } -#[derive(Debug, Clone, PartialEq, Eq, Default, Reflect, FromReflect)] +#[derive(Debug, Clone, PartialEq, Eq, Default, Reflect)] #[reflect(Debug, Default, PartialEq)] pub(crate) struct RecompileLoadedYarnFilesEvent; diff --git a/crates/bevy_plugin/src/yarn_file_asset.rs b/crates/bevy_plugin/src/yarn_file_asset.rs index d74e7af2..344ec914 100644 --- a/crates/bevy_plugin/src/yarn_file_asset.rs +++ b/crates/bevy_plugin/src/yarn_file_asset.rs @@ -10,7 +10,7 @@ use std::hash::Hash; use yarn_slinger::prelude::YarnFile as InnerYarnFile; /// A Yarn file. These will mostly be created by loading them from disk with the [`AssetServer`]. -#[derive(Debug, Clone, Eq, PartialEq, Reflect, FromReflect, TypeUuid, Serialize, Deserialize)] +#[derive(Debug, Clone, Eq, PartialEq, Reflect, TypeUuid, Serialize, Deserialize)] #[reflect(Debug, PartialEq, Hash, Serialize, Deserialize)] #[uuid = "32570e61-d69d-4f87-9552-9da2a62ecfd1"] pub struct YarnFile { diff --git a/crates/codegen/src/bin/generate_proto.rs b/crates/codegen/src/bin/generate_proto.rs index 87032217..3beb27e5 100644 --- a/crates/codegen/src/bin/generate_proto.rs +++ b/crates/codegen/src/bin/generate_proto.rs @@ -13,7 +13,7 @@ fn main() -> Result<()> { ".", "use crate::prelude::*;\ #[cfg_attr(feature = \"serde\", derive(Serialize, Deserialize))]\n\ - #[cfg_attr(feature = \"bevy\", derive(Reflect, FromReflect))]\n\ + #[cfg_attr(feature = \"bevy\", derive(Reflect))]\n\ #[cfg_attr(feature = \"bevy\", reflect(Debug, PartialEq))]\n\ #[cfg_attr(\n\ all(feature = \"bevy\", feature = \"serde\"),\n\ diff --git a/crates/compiler/src/compiler.rs b/crates/compiler/src/compiler.rs index 89a57d28..c4492256 100644 --- a/crates/compiler/src/compiler.rs +++ b/crates/compiler/src/compiler.rs @@ -23,7 +23,7 @@ pub type Result = std::result::Result; /// /// This type is a combination of the original `CompilationStep` and `Compiler` types, optimized for easier, fluent calling. #[derive(Debug, Clone, PartialEq, Default)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] #[cfg_attr( @@ -106,7 +106,7 @@ impl Compiler { /// Represents the contents of a file to compile. #[derive(Debug, Clone, Eq, PartialEq, Hash)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq, Hash))] #[cfg_attr( @@ -127,7 +127,7 @@ pub struct File { /// The types of compilation that the compiler will do. #[derive(Debug, Clone, Default, Eq, PartialEq, Hash)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect,))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq, Hash, Default))] #[cfg_attr( diff --git a/crates/compiler/src/listeners/error_listener/diagnostic.rs b/crates/compiler/src/listeners/error_listener/diagnostic.rs index 166b0989..c7336332 100644 --- a/crates/compiler/src/listeners/error_listener/diagnostic.rs +++ b/crates/compiler/src/listeners/error_listener/diagnostic.rs @@ -23,7 +23,7 @@ use yarn_slinger_core::prelude::*; /// /// The properties marked as `Obsolete` were not implemented. #[derive(Debug, Clone, PartialEq, Eq, Hash)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq, Hash))] #[cfg_attr( @@ -192,7 +192,7 @@ impl DiagnosticVec for Vec { /// /// The `Info` variant was not implemented because it was unused. #[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Hash, strum_macros::Display)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq, Default, Hash))] #[cfg_attr( diff --git a/crates/compiler/src/output.rs b/crates/compiler/src/output.rs index 9ff7e217..be5d86f7 100644 --- a/crates/compiler/src/output.rs +++ b/crates/compiler/src/output.rs @@ -21,7 +21,7 @@ mod string_info; /// In contrast to the original implementation, where this struct was called a `CompilationResult`, we return /// an actual [`Result`], so this type is guaranteed to only hold warnings as opposed to all diagnostics. #[derive(Debug, Clone, PartialEq, Default)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, Default))] #[cfg_attr( @@ -124,7 +124,7 @@ impl Compilation { /// A collection of [`Diagnostic`] objects that describe problems that occurred during compilation. /// At least one of these diagnostics will have a severity of [`DiagnosticSeverity::Error`]. #[derive(Error, Clone, PartialEq, Eq, Hash)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq, Hash))] #[cfg_attr( diff --git a/crates/compiler/src/output/debug_info.rs b/crates/compiler/src/output/debug_info.rs index 98092606..ec3420b9 100644 --- a/crates/compiler/src/output/debug_info.rs +++ b/crates/compiler/src/output/debug_info.rs @@ -5,7 +5,7 @@ use std::collections::HashMap; /// Contains debug information for a node in a Yarn file. #[derive(Debug, Clone, PartialEq, Eq, Default)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq, Default))] #[cfg_attr( @@ -64,7 +64,7 @@ impl DebugInfo { /// Contains positional information about an instruction. #[derive(Debug, Clone, PartialEq, Eq, Hash)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq, Hash))] #[cfg_attr( diff --git a/crates/compiler/src/output/declaration.rs b/crates/compiler/src/output/declaration.rs index b3b4d31a..53bffc09 100644 --- a/crates/compiler/src/output/declaration.rs +++ b/crates/compiler/src/output/declaration.rs @@ -19,7 +19,7 @@ use yarn_slinger_core::types::Type; /// You do not create instances of this class yourself. They are /// generated by the [`Compiler`]. #[derive(Debug, Clone, PartialEq)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect,))] +#[cfg_attr(feature = "bevy", derive(Reflect,))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] #[cfg_attr( @@ -179,7 +179,7 @@ impl Declaration { /// /// In the original implementation, [`DeclarationSource::External`] is just a magic string. #[derive(Debug, Clone, PartialEq, Eq, Default)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect,))] +#[cfg_attr(feature = "bevy", derive(Reflect,))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq, Default))] #[cfg_attr( diff --git a/crates/compiler/src/output/string_info.rs b/crates/compiler/src/output/string_info.rs index 4d3f1a09..8b1d7e5a 100644 --- a/crates/compiler/src/output/string_info.rs +++ b/crates/compiler/src/output/string_info.rs @@ -9,7 +9,7 @@ use crate::prelude::*; /// You do not create instances of this class yourself. They are /// generated by the [`Compiler`]. #[derive(Debug, Clone, Default, PartialEq, Eq, Hash)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq, Hash))] #[cfg_attr( diff --git a/crates/core/src/feature_gates.rs b/crates/core/src/feature_gates.rs index 8150a7a7..2b3b19fe 100644 --- a/crates/core/src/feature_gates.rs +++ b/crates/core/src/feature_gates.rs @@ -1,6 +1,6 @@ #[cfg(all(feature = "bevy", feature = "serde"))] pub use bevy::prelude::{ReflectDeserialize, ReflectSerialize}; #[cfg(feature = "bevy")] -pub use bevy::reflect::{std_traits::ReflectDefault, FromReflect, Reflect, TypeUuid}; +pub use bevy::reflect::{std_traits::ReflectDefault, Reflect, TypeUuid}; #[cfg(feature = "serde")] pub use serde::{Deserialize, Serialize}; diff --git a/crates/core/src/generated/ext.rs b/crates/core/src/generated/ext.rs index f425dbf9..75ebcd6e 100644 --- a/crates/core/src/generated/ext.rs +++ b/crates/core/src/generated/ext.rs @@ -122,7 +122,7 @@ impl TryFrom for OpCode { } #[derive(Debug, Clone, Copy, PartialEq, Eq, Error)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect,))] +#[cfg_attr(feature = "bevy", derive(Reflect,))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] #[cfg_attr( diff --git a/crates/core/src/generated/yarn.rs b/crates/core/src/generated/yarn.rs index 7cc574a4..3ab797a6 100644 --- a/crates/core/src/generated/yarn.rs +++ b/crates/core/src/generated/yarn.rs @@ -1,9 +1,12 @@ /// A complete Yarn program. use crate::prelude::*; #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] -#[cfg_attr(all(feature = "bevy", feature = "serde"), reflect(Serialize, Deserialize))] +#[cfg_attr( + all(feature = "bevy", feature = "serde"), + reflect(Serialize, Deserialize) +)] #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Program { @@ -17,17 +20,17 @@ pub struct Program { /// instruction is run, and the value is not found in the storage, this /// value will be used #[prost(map = "string, message", tag = "3")] - pub initial_values: ::std::collections::HashMap< - ::prost::alloc::string::String, - Operand, - >, + pub initial_values: ::std::collections::HashMap<::prost::alloc::string::String, Operand>, } /// A collection of instructions use crate::prelude::*; #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] -#[cfg_attr(all(feature = "bevy", feature = "serde"), reflect(Serialize, Deserialize))] +#[cfg_attr( + all(feature = "bevy", feature = "serde"), + reflect(Serialize, Deserialize) +)] #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Node { @@ -53,9 +56,12 @@ pub struct Node { } use crate::prelude::*; #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] -#[cfg_attr(all(feature = "bevy", feature = "serde"), reflect(Serialize, Deserialize))] +#[cfg_attr( + all(feature = "bevy", feature = "serde"), + reflect(Serialize, Deserialize) +)] #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Header { @@ -67,9 +73,12 @@ pub struct Header { /// A single Yarn instruction. use crate::prelude::*; #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] -#[cfg_attr(all(feature = "bevy", feature = "serde"), reflect(Serialize, Deserialize))] +#[cfg_attr( + all(feature = "bevy", feature = "serde"), + reflect(Serialize, Deserialize) +)] #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Instruction { @@ -85,23 +94,13 @@ pub mod instruction { /// The type of instruction that this is. use crate::prelude::*; #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] - #[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] + #[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] #[cfg_attr( all(feature = "bevy", feature = "serde"), reflect(Serialize, Deserialize) )] - #[derive( - Clone, - Copy, - Debug, - PartialEq, - Eq, - Hash, - PartialOrd, - Ord, - ::prost::Enumeration - )] + #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum OpCode { /// Jumps to a named position in the node. @@ -152,7 +151,7 @@ pub mod instruction { Pop = 11, /// Calls a function in the client. Pops as many arguments as the /// client indicates the function receives, and the result (if any) - /// is pushed to the stack. + /// is pushed to the stack. /// opA = string: name of the function CallFunc = 12, /// Pushes the contents of a variable onto the stack. @@ -224,9 +223,12 @@ pub mod instruction { /// A value used by an Instruction. use crate::prelude::*; #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] -#[cfg_attr(all(feature = "bevy", feature = "serde"), reflect(Serialize, Deserialize))] +#[cfg_attr( + all(feature = "bevy", feature = "serde"), + reflect(Serialize, Deserialize) +)] #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Operand { @@ -239,7 +241,7 @@ pub mod operand { /// The type of operand this is. use crate::prelude::*; #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] - #[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] + #[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] #[cfg_attr( all(feature = "bevy", feature = "serde"), diff --git a/crates/core/src/internal_value.rs b/crates/core/src/internal_value.rs index 0d6d6be9..dd3f3cce 100644 --- a/crates/core/src/internal_value.rs +++ b/crates/core/src/internal_value.rs @@ -12,7 +12,7 @@ use crate::types::Type; /// /// Corresponds to the internal `Value` class in the original C# implementation. #[derive(Debug, Clone, PartialEq)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] #[cfg_attr( diff --git a/crates/core/src/line_id.rs b/crates/core/src/line_id.rs index 98788b60..b1382de2 100644 --- a/crates/core/src/line_id.rs +++ b/crates/core/src/line_id.rs @@ -8,7 +8,7 @@ use std::fmt::Display; /// Luke: Noooooo #line:nooooo /// ``` #[derive(Debug, Clone, PartialEq, Eq, Hash)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect,))] +#[cfg_attr(feature = "bevy", derive(Reflect,))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq, Hash))] #[cfg_attr( diff --git a/crates/core/src/operator.rs b/crates/core/src/operator.rs index e4a04968..0a1f9106 100644 --- a/crates/core/src/operator.rs +++ b/crates/core/src/operator.rs @@ -4,7 +4,7 @@ use std::borrow::Cow; /// The available operators that can be used with Yarn values. #[derive(Debug, Clone, Copy, PartialEq, Eq, strum_macros::Display)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect,))] +#[cfg_attr(feature = "bevy", derive(Reflect,))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] #[cfg_attr( diff --git a/crates/core/src/position.rs b/crates/core/src/position.rs index 55928907..4a508011 100644 --- a/crates/core/src/position.rs +++ b/crates/core/src/position.rs @@ -3,7 +3,7 @@ use crate::prelude::*; /// Represents a position in a multi-line string. #[derive(Debug, Clone, Copy, Eq, PartialEq, Hash)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect,))] +#[cfg_attr(feature = "bevy", derive(Reflect,))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq, Hash))] #[cfg_attr( diff --git a/crates/core/src/types/function.rs b/crates/core/src/types/function.rs index d913247d..e7994403 100644 --- a/crates/core/src/types/function.rs +++ b/crates/core/src/types/function.rs @@ -10,7 +10,7 @@ pub(crate) fn function_type_properties(function_type: &FunctionType) -> TypeProp } #[derive(Debug, Clone, PartialEq, Eq, Default, Hash)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq, Default, Hash))] #[cfg_attr( diff --git a/crates/core/src/types/type.rs b/crates/core/src/types/type.rs index 25e6acf5..965237da 100644 --- a/crates/core/src/types/type.rs +++ b/crates/core/src/types/type.rs @@ -24,7 +24,7 @@ use thiserror::Error; /// representation of the types than dynamic dispatch. The `Undefined` "variant", which was a simple `null`, /// was also replaced by the more idiomatic `Option::None`. #[derive(Debug, Clone, PartialEq, Eq, Default, Hash)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq, Default, Hash))] #[cfg_attr( diff --git a/crates/core/src/yarn_value.rs b/crates/core/src/yarn_value.rs index b2587fbc..3779c704 100644 --- a/crates/core/src/yarn_value.rs +++ b/crates/core/src/yarn_value.rs @@ -14,7 +14,7 @@ use thiserror::Error; /// /// Corresponds to C#'s [`Convert`](https://docs.microsoft.com/en-us/dotnet/api/system.convert?view=net-5.0) class. #[derive(Debug, Clone, PartialEq)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect,))] +#[cfg_attr(feature = "bevy", derive(Reflect,))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] #[cfg_attr( diff --git a/crates/example_dialogue_view/src/updating.rs b/crates/example_dialogue_view/src/updating.rs index 76363b11..3848192d 100644 --- a/crates/example_dialogue_view/src/updating.rs +++ b/crates/example_dialogue_view/src/updating.rs @@ -27,7 +27,7 @@ pub(crate) fn ui_updating_plugin(app: &mut App) { /// Signals that a speaker has changed. /// A speaker starts speaking when a new line is presented with a [`PresentLineEvent`] which has a character name. /// A speaker stops speaking when the line is fully displayed on the screen, which happens over the course of a few seconds -#[derive(Debug, Eq, PartialEq, Hash, Reflect, FromReflect)] +#[derive(Debug, Eq, PartialEq, Hash, Reflect)] #[reflect(Debug, PartialEq, Hash)] #[non_exhaustive] pub struct SpeakerChangeEvent { diff --git a/crates/runtime/src/analyser/diagnosis.rs b/crates/runtime/src/analyser/diagnosis.rs index 30290e13..cfefcc23 100644 --- a/crates/runtime/src/analyser/diagnosis.rs +++ b/crates/runtime/src/analyser/diagnosis.rs @@ -9,7 +9,7 @@ use std::iter; /// A result of analysing a compiled Yarn program with [`Dialogue::analyse`]. Created by the [`CompiledProgramAnalyser`]s used in the given [`Context`]. #[derive(Debug, Clone, PartialEq, Eq, Hash)] #[non_exhaustive] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq, Hash))] #[cfg_attr( @@ -32,7 +32,7 @@ pub struct Diagnosis { /// The severity of a [`Diagnosis`], as reported by a [`CompiledProgramAnalyser`]. #[derive(Debug, Clone, PartialEq, Eq, Hash)] #[non_exhaustive] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq, Hash))] #[cfg_attr( diff --git a/crates/runtime/src/command.rs b/crates/runtime/src/command.rs index 866df199..e52733fb 100644 --- a/crates/runtime/src/command.rs +++ b/crates/runtime/src/command.rs @@ -10,7 +10,7 @@ use yarn_slinger_core::prelude::YarnValue; /// A custom command found in a Yarn file within the `<<` and `>>` characters. #[derive(Debug, Clone, PartialEq)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] #[cfg_attr( diff --git a/crates/runtime/src/dialogue_option.rs b/crates/runtime/src/dialogue_option.rs index 913a0678..7ac44ae5 100644 --- a/crates/runtime/src/dialogue_option.rs +++ b/crates/runtime/src/dialogue_option.rs @@ -5,7 +5,7 @@ use std::fmt::Display; /// An option to be presented to the user. #[derive(Debug, Clone, PartialEq)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] #[cfg_attr( @@ -42,7 +42,7 @@ pub struct DialogueOption { /// Since the IDs are just zero-based indices, you can also derive them yourself. Note that the index numeration includes options which /// have [`DialogueOption::is_available`] set to `false`, so the index of an option may not be as it appears in the list of options presented to the user.11 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq, Hash))] #[cfg_attr( diff --git a/crates/runtime/src/events.rs b/crates/runtime/src/events.rs index da145838..53362979 100644 --- a/crates/runtime/src/events.rs +++ b/crates/runtime/src/events.rs @@ -9,7 +9,7 @@ use crate::prelude::*; use yarn_slinger_core::prelude::*; #[derive(Debug, Clone, PartialEq)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] #[cfg_attr( diff --git a/crates/runtime/src/line.rs b/crates/runtime/src/line.rs index 33f86d11..85e4060e 100644 --- a/crates/runtime/src/line.rs +++ b/crates/runtime/src/line.rs @@ -23,7 +23,7 @@ use crate::prelude::*; /// /// `MarkupParseResult` and `ExpandSubstitutions` were merged into this because we don't require consumers to manually fetch from string tables. #[derive(Debug, Clone, PartialEq)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] #[cfg_attr( diff --git a/crates/runtime/src/markup/line_parser.rs b/crates/runtime/src/markup/line_parser.rs index 02793251..fa41ec89 100644 --- a/crates/runtime/src/markup/line_parser.rs +++ b/crates/runtime/src/markup/line_parser.rs @@ -15,7 +15,7 @@ use unicode_segmentation::UnicodeSegmentation; pub type Result = std::result::Result; #[derive(Debug, Clone)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug))] #[cfg_attr( diff --git a/crates/runtime/src/markup/markup_parse_error.rs b/crates/runtime/src/markup/markup_parse_error.rs index 92e2299a..f125ccbe 100644 --- a/crates/runtime/src/markup/markup_parse_error.rs +++ b/crates/runtime/src/markup/markup_parse_error.rs @@ -5,7 +5,7 @@ use thiserror::Error; #[allow(missing_docs)] #[derive(Error, Debug, PartialEq, Eq, Hash)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq, Hash))] #[cfg_attr( diff --git a/crates/runtime/src/markup/parsed_markup/markup_attribute.rs b/crates/runtime/src/markup/parsed_markup/markup_attribute.rs index fafbdeb0..cb50ff58 100644 --- a/crates/runtime/src/markup/parsed_markup/markup_attribute.rs +++ b/crates/runtime/src/markup/parsed_markup/markup_attribute.rs @@ -15,7 +15,7 @@ use std::collections::HashMap; /// ## See also /// - [`Line`] #[derive(Debug, Clone, PartialEq)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] #[cfg_attr( diff --git a/crates/runtime/src/markup/parsed_markup/markup_value.rs b/crates/runtime/src/markup/parsed_markup/markup_value.rs index ea7d09e5..578fd44d 100644 --- a/crates/runtime/src/markup/parsed_markup/markup_value.rs +++ b/crates/runtime/src/markup/parsed_markup/markup_value.rs @@ -10,7 +10,7 @@ use core::fmt::Display; /// You do not create instances of this struct yourself. It is created /// by objects that can parse markup, such as [`Dialogue`] #[derive(Debug, Clone, PartialEq)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] #[cfg_attr( diff --git a/crates/runtime/src/virtual_machine/execution_state.rs b/crates/runtime/src/virtual_machine/execution_state.rs index df43feb5..312d2b00 100644 --- a/crates/runtime/src/virtual_machine/execution_state.rs +++ b/crates/runtime/src/virtual_machine/execution_state.rs @@ -7,7 +7,7 @@ use crate::prelude::*; /// Does not contain `DeliveringContent` since that that state would be used to indicate /// that a handler is currently running, which we don't have. #[derive(Debug, Clone, Copy, Eq, PartialEq, Hash, Default)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq, Default, Hash))] #[cfg_attr( diff --git a/crates/runtime/src/virtual_machine/state.rs b/crates/runtime/src/virtual_machine/state.rs index 54e71924..86b5d1b4 100644 --- a/crates/runtime/src/virtual_machine/state.rs +++ b/crates/runtime/src/virtual_machine/state.rs @@ -5,7 +5,7 @@ use std::fmt::Debug; use yarn_slinger_core::prelude::*; #[derive(Debug, Clone, PartialEq, Default)] -#[cfg_attr(feature = "bevy", derive(Reflect, FromReflect))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq, Default))] #[cfg_attr( From e55164b56e907712f7ad28121f84fb8f487e47f1 Mon Sep 17 00:00:00 2001 From: Tim Jentzsch Date: Sat, 15 Jul 2023 14:59:53 +0200 Subject: [PATCH 03/24] Update remaining Bevy dependencies --- Cargo.lock | 1084 ++++++++++++++--------- crates/compiler/Cargo.toml | 4 +- crates/core/Cargo.toml | 5 +- crates/core/src/generated/yarn.rs | 44 +- crates/example_dialogue_view/Cargo.toml | 2 +- crates/runtime/Cargo.toml | 14 +- demo/Cargo.toml | 15 +- examples/bevy_yarn_slinger/Cargo.toml | 14 +- 8 files changed, 718 insertions(+), 464 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6d886a22..0d1fcce3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -126,11 +126,11 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" dependencies = [ - "gimli 0.27.2", + "gimli 0.27.3", ] [[package]] @@ -141,14 +141,13 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.7.5" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cipher", "cpufeatures", - "opaque-debug", ] [[package]] @@ -168,7 +167,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "getrandom", "once_cell", "version_check", @@ -176,9 +175,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" dependencies = [ "memchr", ] @@ -213,9 +212,9 @@ dependencies = [ [[package]] name = "android-activity" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c77a0045eda8b888c76ea473c2b0515ba6f471d318f8927c5c72240937035a6" +checksum = "40bc1575e653f158cbdc6ebcd917b9564e66321c5325c232c3591269c257be69" dependencies = [ "android-properties", "bitflags 1.3.2", @@ -226,7 +225,7 @@ dependencies = [ "ndk", "ndk-context", "ndk-sys", - "num_enum", + "num_enum 0.6.1", ] [[package]] @@ -283,15 +282,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ "utf8parse", ] @@ -369,24 +368,24 @@ dependencies = [ [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "ash" -version = "0.37.2+1.3.238" +version = "0.37.3+1.3.251" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28bf19c1f0a470be5fbf7522a308a05df06610252c5bcf5143e1b23f629a9a03" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" dependencies = [ "libloading 0.7.4", ] [[package]] name = "async-channel" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", "event-listener", @@ -428,17 +427,6 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79d6dc922a2792b006573f60b2648076355daeae5ce9cb59507e5908c9625d31" -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "1.1.0" @@ -447,16 +435,16 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" dependencies = [ "addr2line", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", - "miniz_oxide 0.6.2", - "object 0.30.3", + "miniz_oxide", + "object 0.31.1", "rustc-demangle", ] @@ -474,9 +462,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "base64ct" @@ -524,7 +512,7 @@ dependencies = [ "bevy_hierarchy 0.10.1", "bevy_log 0.10.1", "bevy_math 0.10.1", - "bevy_pbr", + "bevy_pbr 0.10.1", "bevy_reflect 0.10.1", "bevy_render 0.10.1", "bevy_utils 0.10.1", @@ -544,7 +532,7 @@ checksum = "7556c913daacbec7aa213eda82517673bf6c6b25e0d827a56efe17421ebaca35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.26", ] [[package]] @@ -727,7 +715,6 @@ dependencies = [ "bevy_tasks 0.10.1", "bevy_utils 0.10.1", "bytemuck", - "serde", ] [[package]] @@ -806,7 +793,7 @@ checksum = "e1477347b17df781756ba0dfd677e2975e57e930752cd3cd42e6cdd8fdaa3223" dependencies = [ "bevy_macro_utils 0.11.0", "quote", - "syn 2.0.15", + "syn 2.0.26", ] [[package]] @@ -901,7 +888,7 @@ dependencies = [ "bevy_macro_utils 0.11.0", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.26", ] [[package]] @@ -927,7 +914,7 @@ dependencies = [ "bevy 0.10.1", "bevy-inspector-egui", "egui_dock", - "indexmap", + "indexmap 1.9.3", ] [[package]] @@ -941,7 +928,7 @@ dependencies = [ "bevy_editor_pls_core", "bevy_mod_debugdump", "egui-gizmo", - "indexmap", + "indexmap 1.9.3", "opener", "pretty-type-name", ] @@ -1002,6 +989,26 @@ dependencies = [ "gilrs", ] +[[package]] +name = "bevy_gizmos" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7938b43b4bdf9d039b7d3b310f871ed5ffa5a185e861a9c85731c40182019f8d" +dependencies = [ + "bevy_app 0.11.0", + "bevy_asset 0.11.0", + "bevy_core 0.11.0", + "bevy_core_pipeline 0.11.0", + "bevy_ecs 0.11.0", + "bevy_math 0.11.0", + "bevy_pbr 0.11.0", + "bevy_reflect 0.11.0", + "bevy_render 0.11.0", + "bevy_sprite 0.11.0", + "bevy_transform 0.11.0", + "bevy_utils 0.11.0", +] + [[package]] name = "bevy_gltf" version = "0.10.1" @@ -1019,7 +1026,7 @@ dependencies = [ "bevy_hierarchy 0.10.1", "bevy_log 0.10.1", "bevy_math 0.10.1", - "bevy_pbr", + "bevy_pbr 0.10.1", "bevy_reflect 0.10.1", "bevy_render 0.10.1", "bevy_scene 0.10.1", @@ -1031,6 +1038,36 @@ dependencies = [ "thiserror", ] +[[package]] +name = "bevy_gltf" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f09b699698a2f5843ef63064010a5e7783403f99a697a04f41a2f8141cb4245d" +dependencies = [ + "anyhow", + "base64 0.13.1", + "bevy_app 0.11.0", + "bevy_asset 0.11.0", + "bevy_core 0.11.0", + "bevy_core_pipeline 0.11.0", + "bevy_ecs 0.11.0", + "bevy_hierarchy 0.11.0", + "bevy_log 0.11.0", + "bevy_math 0.11.0", + "bevy_pbr 0.11.0", + "bevy_reflect 0.11.0", + "bevy_render 0.11.0", + "bevy_scene 0.11.0", + "bevy_tasks 0.11.0", + "bevy_transform 0.11.0", + "bevy_utils 0.11.0", + "gltf", + "percent-encoding", + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "bevy_hierarchy" version = "0.10.1" @@ -1072,7 +1109,6 @@ dependencies = [ "bevy_math 0.10.1", "bevy_reflect 0.10.1", "bevy_utils 0.10.1", - "serde", "thiserror", ] @@ -1108,22 +1144,22 @@ dependencies = [ "bevy_diagnostic 0.10.1", "bevy_ecs 0.10.1", "bevy_gilrs", - "bevy_gltf", + "bevy_gltf 0.10.1", "bevy_hierarchy 0.10.1", "bevy_input 0.10.1", "bevy_log 0.10.1", "bevy_math 0.10.1", - "bevy_pbr", + "bevy_pbr 0.10.1", "bevy_ptr 0.10.1", "bevy_reflect 0.10.1", "bevy_render 0.10.1", "bevy_scene 0.10.1", - "bevy_sprite", + "bevy_sprite 0.10.1", "bevy_tasks 0.10.1", - "bevy_text", + "bevy_text 0.10.1", "bevy_time 0.10.1", "bevy_transform 0.10.1", - "bevy_ui", + "bevy_ui 0.10.1", "bevy_utils 0.10.1", "bevy_window 0.10.1", "bevy_winit 0.10.1", @@ -1144,17 +1180,23 @@ dependencies = [ "bevy_derive 0.11.0", "bevy_diagnostic 0.11.0", "bevy_ecs 0.11.0", + "bevy_gizmos", + "bevy_gltf 0.11.0", "bevy_hierarchy 0.11.0", "bevy_input 0.11.0", "bevy_log 0.11.0", "bevy_math 0.11.0", + "bevy_pbr 0.11.0", "bevy_ptr 0.11.0", "bevy_reflect 0.11.0", "bevy_render 0.11.0", "bevy_scene 0.11.0", + "bevy_sprite 0.11.0", "bevy_tasks 0.11.0", + "bevy_text 0.11.0", "bevy_time 0.11.0", "bevy_transform 0.11.0", + "bevy_ui 0.11.0", "bevy_utils 0.11.0", "bevy_window 0.11.0", "bevy_winit 0.11.0", @@ -1211,7 +1253,7 @@ checksum = "fd3868e555723249fde3786891f35893b3001b2be4efb51f431467cb7fc378cd" dependencies = [ "quote", "rustc-hash", - "syn 2.0.15", + "syn 2.0.26", "toml_edit", ] @@ -1290,6 +1332,29 @@ dependencies = [ "radsort", ] +[[package]] +name = "bevy_pbr" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3efec2ae4b4f9fd38b82b93350499dac2dc6f07e63ef50a03c00c52075e2dea8" +dependencies = [ + "bevy_app 0.11.0", + "bevy_asset 0.11.0", + "bevy_core_pipeline 0.11.0", + "bevy_derive 0.11.0", + "bevy_ecs 0.11.0", + "bevy_math 0.11.0", + "bevy_reflect 0.11.0", + "bevy_render 0.11.0", + "bevy_transform 0.11.0", + "bevy_utils 0.11.0", + "bevy_window 0.11.0", + "bitflags 2.3.3", + "bytemuck", + "naga_oil", + "radsort", +] + [[package]] name = "bevy_ptr" version = "0.10.1" @@ -1354,7 +1419,7 @@ dependencies = [ "proc-macro2", "quote", "syn 1.0.109", - "uuid 1.3.3", + "uuid 1.4.0", ] [[package]] @@ -1367,8 +1432,8 @@ dependencies = [ "bit-set", "proc-macro2", "quote", - "syn 2.0.15", - "uuid 1.3.3", + "syn 2.0.26", + "uuid 1.4.0", ] [[package]] @@ -1404,7 +1469,7 @@ dependencies = [ "hexasphere 8.1.0", "image", "ktx2", - "naga 0.11.0", + "naga 0.11.1", "once_cell", "parking_lot 0.12.1", "regex", @@ -1486,7 +1551,7 @@ dependencies = [ "bevy_macro_utils 0.11.0", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.26", ] [[package]] @@ -1508,7 +1573,7 @@ dependencies = [ "ron", "serde", "thiserror", - "uuid 1.3.3", + "uuid 1.4.0", ] [[package]] @@ -1530,7 +1595,7 @@ dependencies = [ "ron", "serde", "thiserror", - "uuid 1.3.3", + "uuid 1.4.0", ] [[package]] @@ -1558,6 +1623,31 @@ dependencies = [ "thiserror", ] +[[package]] +name = "bevy_sprite" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03f64119444ef9788dcdd05012a60f0fa3b7ddb396d434ebcfc3edefd76c91b5" +dependencies = [ + "bevy_app 0.11.0", + "bevy_asset 0.11.0", + "bevy_core_pipeline 0.11.0", + "bevy_derive 0.11.0", + "bevy_ecs 0.11.0", + "bevy_log 0.11.0", + "bevy_math 0.11.0", + "bevy_reflect 0.11.0", + "bevy_render 0.11.0", + "bevy_transform 0.11.0", + "bevy_utils 0.11.0", + "bitflags 2.3.3", + "bytemuck", + "fixedbitset", + "guillotiere", + "rectangle-pack", + "thiserror", +] + [[package]] name = "bevy_sprite3d" version = "2.4.0" @@ -1610,7 +1700,7 @@ dependencies = [ "bevy_math 0.10.1", "bevy_reflect 0.10.1", "bevy_render 0.10.1", - "bevy_sprite", + "bevy_sprite 0.10.1", "bevy_transform 0.10.1", "bevy_utils 0.10.1", "bevy_window 0.10.1", @@ -1619,6 +1709,29 @@ dependencies = [ "thiserror", ] +[[package]] +name = "bevy_text" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b52a19b3d0caf20acd1bdb47b6a00717accc834b46c4f204a63de15cea45ec4b" +dependencies = [ + "ab_glyph", + "anyhow", + "bevy_app 0.11.0", + "bevy_asset 0.11.0", + "bevy_ecs 0.11.0", + "bevy_math 0.11.0", + "bevy_reflect 0.11.0", + "bevy_render 0.11.0", + "bevy_sprite 0.11.0", + "bevy_transform 0.11.0", + "bevy_utils 0.11.0", + "bevy_window 0.11.0", + "glyph_brush_layout", + "serde", + "thiserror", +] + [[package]] name = "bevy_time" version = "0.10.1" @@ -1630,7 +1743,6 @@ dependencies = [ "bevy_reflect 0.10.1", "bevy_utils 0.10.1", "crossbeam-channel", - "serde", "thiserror", ] @@ -1660,7 +1772,6 @@ dependencies = [ "bevy_hierarchy 0.10.1", "bevy_math 0.10.1", "bevy_reflect 0.10.1", - "serde", ] [[package]] @@ -1695,8 +1806,8 @@ dependencies = [ "bevy_math 0.10.1", "bevy_reflect 0.10.1", "bevy_render 0.10.1", - "bevy_sprite", - "bevy_text", + "bevy_sprite 0.10.1", + "bevy_text 0.10.1", "bevy_transform 0.10.1", "bevy_utils 0.10.1", "bevy_window 0.10.1", @@ -1707,6 +1818,36 @@ dependencies = [ "thiserror", ] +[[package]] +name = "bevy_ui" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb85992eb5809936b3326940dc8d6e7b219af3dde1ecbca5948addd6a78694cc" +dependencies = [ + "bevy_a11y 0.11.0", + "bevy_app 0.11.0", + "bevy_asset 0.11.0", + "bevy_core_pipeline 0.11.0", + "bevy_derive 0.11.0", + "bevy_ecs 0.11.0", + "bevy_hierarchy 0.11.0", + "bevy_input 0.11.0", + "bevy_log 0.11.0", + "bevy_math 0.11.0", + "bevy_reflect 0.11.0", + "bevy_render 0.11.0", + "bevy_sprite 0.11.0", + "bevy_text 0.11.0", + "bevy_transform 0.11.0", + "bevy_utils 0.11.0", + "bevy_window 0.11.0", + "bytemuck", + "serde", + "smallvec", + "taffy", + "thiserror", +] + [[package]] name = "bevy_utils" version = "0.10.1" @@ -1721,7 +1862,7 @@ dependencies = [ "petgraph", "thiserror", "tracing", - "uuid 1.3.3", + "uuid 1.4.0", ] [[package]] @@ -1738,7 +1879,7 @@ dependencies = [ "petgraph", "thiserror", "tracing", - "uuid 1.3.3", + "uuid 1.4.0", ] [[package]] @@ -1760,7 +1901,7 @@ checksum = "9e37f2e885b0e8af59dc19871c313d3cf2a2495db35bb4d4ae0a61b3f87d5401" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.26", ] [[package]] @@ -1776,7 +1917,6 @@ dependencies = [ "bevy_reflect 0.10.1", "bevy_utils 0.10.1", "raw-window-handle", - "serde", ] [[package]] @@ -1864,7 +2004,7 @@ dependencies = [ name = "bevy_yarn_slinger_demo" version = "0.1.0" dependencies = [ - "bevy 0.10.1", + "bevy 0.11.0", "bevy_editor_pls", "bevy_sprite3d", "bevy_yarn_slinger", @@ -1875,7 +2015,7 @@ dependencies = [ name = "bevy_yarn_slinger_example_dialogue_view" version = "0.1.0" dependencies = [ - "bevy 0.10.1", + "bevy 0.11.0", "bevy_yarn_slinger", "seldom_fn_plugin", "unicode-segmentation", @@ -1937,6 +2077,18 @@ version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + [[package]] name = "block" version = "0.1.6" @@ -1973,27 +2125,26 @@ dependencies = [ [[package]] name = "bstr" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" +checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" dependencies = [ "memchr", - "once_cell", - "regex-automata 0.1.10", + "regex-automata 0.3.3", "serde", ] [[package]] name = "bumpalo" -version = "3.12.2" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytecheck" -version = "0.6.10" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13fe11640a23eb24562225322cd3e452b93a3d4091d62fab69c70542fcd17d1f" +checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" dependencies = [ "bytecheck_derive", "ptr_meta", @@ -2002,9 +2153,9 @@ dependencies = [ [[package]] name = "bytecheck_derive" -version = "0.6.10" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e31225543cb46f81a7e224762764f4a6a0f097b1db0b175f69e8065efaa42de5" +checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" dependencies = [ "proc-macro2", "quote", @@ -2028,7 +2179,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.26", ] [[package]] @@ -2110,12 +2261,6 @@ dependencies = [ "nom", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -2130,11 +2275,12 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "cipher" -version = "0.3.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "generic-array", + "crypto-common", + "inout", ] [[package]] @@ -2150,9 +2296,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.2.7" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" +checksum = "3eab9e8ceb9afdade1ab3f0fd8dbce5b1b2f468ad653baf10e771781b2b67b73" dependencies = [ "clap_builder", "clap_derive", @@ -2161,34 +2307,33 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.2.7" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" +checksum = "9f2763db829349bf00cfc06251268865ed4363b93a943174f638daf3ecdba2cd" dependencies = [ "anstream", "anstyle", - "bitflags 1.3.2", "clap_lex", "strsim", ] [[package]] name = "clap_derive" -version = "4.2.0" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.26", ] [[package]] name = "clap_lex" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" [[package]] name = "clipboard-win" @@ -2256,14 +2401,14 @@ dependencies = [ [[package]] name = "console" -version = "0.15.5" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" dependencies = [ "encode_unicode", "lazy_static", "libc", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -2272,7 +2417,7 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen", ] @@ -2290,9 +2435,9 @@ checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b" [[package]] name = "const_soft_float" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4001a314cf9c48da20f9d782592e5991012ed0ac952ddc73f9e8878cd8ae90da" +checksum = "87ca1caa64ef4ed453e68bb3db612e51cf1b2f5b871337f0fcab1c8f87cc3dff" [[package]] name = "constant_time_eq" @@ -2346,13 +2491,12 @@ dependencies = [ [[package]] name = "core-graphics-types" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" +checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" dependencies = [ "bitflags 1.3.2", "core-foundation", - "foreign-types", "libc", ] @@ -2383,7 +2527,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9847f90f32a50b0dcbd68bc23ff242798b13080b97b0569f6ed96a45ce4cf2cd" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "libc", "scopeguard", "windows-sys 0.33.0", @@ -2416,9 +2560,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] @@ -2429,7 +2573,7 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -2444,7 +2588,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] @@ -2454,31 +2598,31 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", - "memoffset 0.8.0", + "memoffset 0.9.0", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -2493,9 +2637,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad" +checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" dependencies = [ "csv-core", "itoa", @@ -2525,9 +2669,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" dependencies = [ "darling_core", "darling_macro", @@ -2535,26 +2679,26 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.26", ] [[package]] name = "darling_macro" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.15", + "syn 2.0.26", ] [[package]] @@ -2565,9 +2709,9 @@ checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" [[package]] name = "data-encoding" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "databake" @@ -2604,9 +2748,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", @@ -2633,7 +2777,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.26", ] [[package]] @@ -2792,7 +2936,7 @@ checksum = "3fe2568f851fd6144a45fa91cfed8fe5ca8fc0b56ba6797bfc1ed2771b90e37c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.26", ] [[package]] @@ -2807,7 +2951,7 @@ version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -2848,7 +2992,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.26", ] [[package]] @@ -2867,11 +3011,17 @@ dependencies = [ "parking_lot 0.12.1", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "erased-serde" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2b0c2380453a92ea8b6c8e5f64ecaafccddde8ceab55ff7a8ac1029f894569" +checksum = "f94c0e13118e7d7533271f754a168ae8400e6a1cc043f2bfd53cc7290f1a1de3" dependencies = [ "serde", ] @@ -2962,7 +3112,7 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall 0.2.16", "windows-sys 0.48.0", @@ -2993,7 +3143,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] @@ -3019,9 +3169,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -3045,6 +3195,12 @@ dependencies = [ "libc", ] +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + [[package]] name = "futures-channel" version = "0.3.28" @@ -3119,11 +3275,11 @@ dependencies = [ [[package]] name = "generational-arena" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1d3b771574f62d0548cee0ad9057857e9fc25d7a3335f140c84f6acd0bf601" +checksum = "877e94aff08e743b651baaea359664321055749b398adff8740a7399af7796e7" dependencies = [ - "cfg-if 0.1.10", + "cfg-if", ] [[package]] @@ -3148,11 +3304,11 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "libc", "wasi", @@ -3168,15 +3324,15 @@ dependencies = [ "fnv", "gilrs-core", "log", - "uuid 1.3.3", + "uuid 1.4.0", "vec_map", ] [[package]] name = "gilrs-core" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd745b0cb1a207756e8fabacf5623066ad6aa543ea0be4bab34e897e6bbe24f9" +checksum = "f85b0f27572f0560cfc4a067a2978a4a490f9fa5cf1326d30b142a288312a965" dependencies = [ "core-foundation", "io-kit-sys", @@ -3185,11 +3341,11 @@ dependencies = [ "libudev-sys", "log", "nix 0.26.2", - "uuid 1.3.3", + "uuid 1.4.0", "vec_map", "wasm-bindgen", "web-sys", - "windows 0.46.0", + "windows 0.48.0", ] [[package]] @@ -3199,15 +3355,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" dependencies = [ "fallible-iterator", - "indexmap", + "indexmap 1.9.3", "stable_deref_trait", ] [[package]] name = "gimli" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] name = "glam" @@ -3243,9 +3399,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "glow" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e007a07a24de5ecae94160f141029e9a347282cfe25d1d58d85d845cf3130f1" +checksum = "807edf58b70c0b5b2181dd39fe1839dbdb3ba02645630dc5f753e23da307f762" dependencies = [ "js-sys", "slotmap", @@ -3255,33 +3411,32 @@ dependencies = [ [[package]] name = "gltf" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd7703af6975def3b32573c60aaa5ebfebfab5d879da1e1315d87155ba57bcd" +checksum = "f4fe8d5192923fbd783c15e74627de8e27c97e1e3dec22bf54515a407249febf" dependencies = [ "byteorder", "gltf-json", "lazy_static", - "urlencoding", ] [[package]] name = "gltf-derive" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b33dbe598480111e3b2e5a1e9a7e52ad5df0f836e04b8c80fc96f52a9c9f2e" +checksum = "ec223c88f017861193ae128239aff8fbc4478f38a036d9d7b2ce10a52b46b1f2" dependencies = [ "inflections", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.26", ] [[package]] name = "gltf-json" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5511a759d99beeeef064bd6f81e207c77e3a3431c7499d7590929e35de371f31" +checksum = "3b1ba7523fcf32541f4aec96e13024c255d928eab3223f99ab945045f2a6de18" dependencies = [ "gltf-derive", "serde", @@ -3352,6 +3507,15 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "grid" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0634107a3a005070dd73e27e74ecb691a94e9e5ba7829f434db7fbf73a6b5c47" +dependencies = [ + "no-std-compat", +] + [[package]] name = "guillotiere" version = "0.6.2" @@ -3364,9 +3528,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.18" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" dependencies = [ "bytes", "fnv", @@ -3374,7 +3538,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -3449,27 +3613,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hexasphere" @@ -3551,9 +3697,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.26" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -4024,9 +4170,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -4064,6 +4210,16 @@ dependencies = [ "serde", ] +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + [[package]] name = "indicatif" version = "0.16.2" @@ -4102,13 +4258,22 @@ dependencies = [ "libc", ] +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + [[package]] name = "instant" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -4126,30 +4291,29 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi", "libc", "windows-sys 0.48.0", ] [[package]] name = "ipnet" -version = "2.7.2" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", + "hermit-abi", + "rustix 0.38.4", "windows-sys 0.48.0", ] @@ -4164,9 +4328,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" [[package]] name = "jni" @@ -4203,7 +4367,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" dependencies = [ "cesu8", - "cfg-if 1.0.0", + "cfg-if", "combine", "jni-sys", "log", @@ -4235,9 +4399,9 @@ checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" [[package]] name = "js-sys" -version = "0.3.62" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c16e1bfd491478ab155fd8b4896b86f9ede344949b641e61501e07c2b8b4d5" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -4323,7 +4487,7 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "winapi", ] @@ -4333,15 +4497,15 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "windows-sys 0.48.0", ] [[package]] name = "libm" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libudev-sys" @@ -4355,9 +4519,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f508063cc7bb32987c71511216bd5a32be15bccb6a80b52df8b9d7f01fc3aa2" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" [[package]] name = "litemap" @@ -4370,9 +4540,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -4380,12 +4550,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if 1.0.0", -] +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "loupe" @@ -4393,7 +4560,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b6a72dfa44fe15b5e76b94307eeb2ff995a8c5b283b55008940c02e0c5b634d" dependencies = [ - "indexmap", + "indexmap 1.9.3", "loupe-derive", "rustversion", ] @@ -4480,9 +4647,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -4513,15 +4680,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.7.1" @@ -4534,14 +4692,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "log", "wasi", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -4567,15 +4725,15 @@ dependencies = [ [[package]] name = "naga" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eafe22a23b797c9bc227c6c896419b26b5bb88fa903417a3adaed08778850d5" +checksum = "6c3d4269bcb7d50121097702fde1afb75f4ea8083aeb7a55688dcf289a853271" dependencies = [ "bit-set", "bitflags 1.3.2", "codespan-reporting", "hexf-parse", - "indexmap", + "indexmap 1.9.3", "log", "num-traits", "petgraph", @@ -4597,7 +4755,7 @@ dependencies = [ "bitflags 1.3.2", "codespan-reporting", "hexf-parse", - "indexmap", + "indexmap 1.9.3", "log", "num-traits", "pp-rs", @@ -4617,7 +4775,7 @@ dependencies = [ "bit-set", "codespan-reporting", "data-encoding", - "indexmap", + "indexmap 1.9.3", "naga 0.12.3", "once_cell", "regex", @@ -4668,7 +4826,7 @@ dependencies = [ "bitflags 1.3.2", "jni-sys", "ndk-sys", - "num_enum", + "num_enum 0.5.11", "raw-window-handle", "thiserror", ] @@ -4695,7 +4853,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ "bitflags 1.3.2", - "cfg-if 1.0.0", + "cfg-if", "libc", "memoffset 0.6.5", ] @@ -4707,11 +4865,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ "bitflags 1.3.2", - "cfg-if 1.0.0", + "cfg-if", "libc", "static_assertions", ] +[[package]] +name = "no-std-compat" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" + [[package]] name = "nohash-hasher" version = "0.2.0" @@ -4836,11 +5000,11 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] @@ -4850,7 +5014,16 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ - "num_enum_derive", + "num_enum_derive 0.5.11", +] + +[[package]] +name = "num_enum" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" +dependencies = [ + "num_enum_derive 0.6.1", ] [[package]] @@ -4865,6 +5038,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "num_enum_derive" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.26", +] + [[package]] name = "number_prefix" version = "0.4.0" @@ -4944,15 +5129,15 @@ checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" dependencies = [ "crc32fast", "hashbrown 0.11.2", - "indexmap", + "indexmap 1.9.3", "memchr", ] [[package]] name = "object" -version = "0.30.3" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" dependencies = [ "memchr", ] @@ -4991,15 +5176,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "opener" @@ -5018,7 +5197,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" dependencies = [ "bitflags 1.3.2", - "cfg-if 1.0.0", + "cfg-if", "foreign-types", "libc", "once_cell", @@ -5034,7 +5213,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.26", ] [[package]] @@ -5103,7 +5282,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.7", + "parking_lot_core 0.9.8", ] [[package]] @@ -5112,7 +5291,7 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "instant", "libc", "redox_syscall 0.2.16", @@ -5122,15 +5301,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "smallvec", - "windows-sys 0.45.0", + "windows-targets 0.48.1", ] [[package]] @@ -5146,9 +5325,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35" [[package]] name = "pbkdf2" @@ -5170,9 +5349,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "petgraph" @@ -5181,14 +5360,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" dependencies = [ "fixedbitset", - "indexmap", + "indexmap 1.9.3", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" [[package]] name = "pin-utils" @@ -5204,15 +5383,15 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "png" -version = "0.17.8" +version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" +checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" dependencies = [ "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] @@ -5298,9 +5477,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" dependencies = [ "unicode-ident", ] @@ -5387,13 +5566,19 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" dependencies = [ "proc-macro2", ] +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + [[package]] name = "radsort" version = "0.1.0" @@ -5496,13 +5681,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.1" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.1", + "regex-automata 0.3.3", + "regex-syntax 0.7.4", ] [[package]] @@ -5524,6 +5710,17 @@ dependencies = [ "regex-syntax 0.6.29", ] +[[package]] +name = "regex-automata" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.4", +] + [[package]] name = "regex-syntax" version = "0.6.29" @@ -5532,9 +5729,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "region" @@ -5571,11 +5768,11 @@ checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" [[package]] name = "reqwest" -version = "0.11.17" +version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ - "base64 0.21.0", + "base64 0.21.2", "bytes", "encoding_rs", "futures-core", @@ -5608,23 +5805,26 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.41" +version = "0.7.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21499ed91807f07ae081880aabb2ccc0235e9d88011867d984525e9a4c3cfa3e" +checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" dependencies = [ + "bitvec", "bytecheck", "hashbrown 0.12.3", "ptr_meta", "rend", "rkyv_derive", "seahash", + "tinyvec", + "uuid 1.4.0", ] [[package]] name = "rkyv_derive" -version = "0.7.41" +version = "0.7.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1c672430eb41556291981f45ca900a0239ad007242d1cb4b4167af842db666" +checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" dependencies = [ "proc-macro2", "quote", @@ -5675,23 +5875,36 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.12" +version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "722529a737f5a942fdbac3a46cee213053196737c5eaa3386d52e85b786f2659" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +dependencies = [ + "bitflags 2.3.3", + "errno", + "libc", + "linux-raw-sys 0.4.3", "windows-sys 0.48.0", ] [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" [[package]] name = "ruzstd" @@ -5705,9 +5918,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" [[package]] name = "same-file" @@ -5720,11 +5933,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -5741,9 +5954,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "security-framework" -version = "2.8.2" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -5754,9 +5967,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" dependencies = [ "core-foundation-sys 0.8.4", "libc", @@ -5788,9 +6001,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.163" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" dependencies = [ "serde_derive", ] @@ -5817,29 +6030,29 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.9" +version = "0.11.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" +checksum = "5a16be4fe5320ade08736447e3198294a5ea9a6d44dde6f35f0a5e06859c427a" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.26", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "b5062a995d481b2308b6064e9af76011f2921c35f97b0468811ed9f6cd91dfed" dependencies = [ "itoa", "ryu", @@ -5873,7 +6086,7 @@ version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] @@ -5886,11 +6099,11 @@ checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] @@ -5924,11 +6137,10 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" [[package]] name = "simple_logger" -version = "4.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78beb34673091ccf96a8816fce8bfd30d1292c7621ca2bcb5f2ba0fae4f558d" +checksum = "2230cd5c29b815c9b699fb610b49a5ed65588f3509d9f0108be3a885da629333" dependencies = [ - "atty", "log", "windows-sys 0.42.0", ] @@ -5953,9 +6165,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" dependencies = [ "serde", ] @@ -6102,9 +6314,9 @@ dependencies = [ [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "svg_fmt" @@ -6125,9 +6337,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" dependencies = [ "proc-macro2", "quote", @@ -6152,7 +6364,7 @@ version = "0.28.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c2f3ca6693feb29a89724516f016488e9aafc7f37264f898593ee4b942f31b" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "core-foundation-sys 0.8.4", "libc", "ntapi", @@ -6166,7 +6378,7 @@ version = "0.29.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "751e810399bba86e9326f5762b7f32ac5a085542df78da6a78d94e07d14d7c11" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "core-foundation-sys 0.8.4", "libc", "ntapi", @@ -6181,15 +6393,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3540ec65df399929a04a485feb50144475735920cc47eaf8eba09c70b1df4055" dependencies = [ "arrayvec", + "grid", "num-traits", "slotmap", ] +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + [[package]] name = "tar" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +checksum = "ec96d2ffad078296368d46ff1cb309be1c23c513b4ab0e22a45de0185275ac96" dependencies = [ "filetime", "libc", @@ -6198,21 +6417,22 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.7" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" +checksum = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" [[package]] name = "tempfile" -version = "3.5.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" dependencies = [ - "cfg-if 1.0.0", + "autocfg", + "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.45.0", + "rustix 0.37.23", + "windows-sys 0.48.0", ] [[package]] @@ -6226,22 +6446,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.26", ] [[package]] @@ -6250,7 +6470,7 @@ version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "once_cell", ] @@ -6282,9 +6502,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" +checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" dependencies = [ "serde", "time-core", @@ -6348,11 +6568,12 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.1" +version = "1.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" +checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" dependencies = [ "autocfg", + "backtrace", "bytes", "libc", "mio", @@ -6397,17 +6618,17 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" [[package]] name = "toml_edit" -version = "0.19.8" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ - "indexmap", + "indexmap 2.0.0", "toml_datetime", "winnow", ] @@ -6424,7 +6645,7 @@ version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -6433,13 +6654,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.26", ] [[package]] @@ -6500,9 +6721,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "ttf-parser" -version = "0.19.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44dcf002ae3b32cd25400d6df128c5babec3927cd1eb7ce813cfff20eb6c3746" +checksum = "a464a4b34948a5f67fddd2b823c62d9d92e44be75058b99939eae6c5b6960b33" [[package]] name = "twox-hash" @@ -6510,7 +6731,7 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "static_assertions", ] @@ -6534,9 +6755,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -6567,21 +6788,15 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "url" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", "idna", "percent-encoding", ] -[[package]] -name = "urlencoding" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" - [[package]] name = "utf16_iter" version = "1.0.4" @@ -6608,9 +6823,9 @@ checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" [[package]] name = "uuid" -version = "1.3.3" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" +checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be" dependencies = [ "getrandom", "serde", @@ -6658,11 +6873,10 @@ dependencies = [ [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -6678,7 +6892,7 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] @@ -6693,17 +6907,17 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.26", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.35" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "083abe15c5d88556b77bdf7aef403625be9e327ad37c62c4e4129af740168163" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -6727,7 +6941,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.26", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6744,8 +6958,8 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea8d8361c9d006ea3d7797de7bd6b1492ffd0f91a22430cfda6c1658ad57bedf" dependencies = [ - "cfg-if 1.0.0", - "indexmap", + "cfg-if", + "indexmap 1.9.3", "js-sys", "loupe", "more-asserts", @@ -6855,7 +7069,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0358af9c154724587731175553805648d9acb8f6657880d165e378672b7e53" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "enum-iterator", "enumset", "leb128", @@ -6881,7 +7095,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "440dc3d93c9ca47865a4f4edd037ea81bf983b5796b59b3d712d844b32dbef15" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "enumset", "leb128", "loupe", @@ -6931,7 +7145,7 @@ checksum = "39df01ea05dc0a9bab67e054c7cb01521e53b35a7bb90bd02eca564ed0b2667f" dependencies = [ "backtrace", "enum-iterator", - "indexmap", + "indexmap 1.9.3", "loupe", "more-asserts", "rkyv", @@ -6958,10 +7172,10 @@ checksum = "30d965fa61f4dc4cdb35a54daaf7ecec3563fbb94154a6c35433f879466247dd" dependencies = [ "backtrace", "cc", - "cfg-if 1.0.0", + "cfg-if", "corosensei", "enum-iterator", - "indexmap", + "indexmap 1.9.3", "lazy_static", "libc", "loupe", @@ -6984,7 +7198,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fadbe31e3c1b6f3e398ad172b169152ae1a743ae6efd5f9ffb34019983319d99" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "generational-arena", "getrandom", "libc", @@ -7027,9 +7241,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.62" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b5f940c7edfdc6d12126d98c9ef4d1b3d470011c47c76a6581df47ad9ba721" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -7065,10 +7279,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d745a1b6d91d85c33defbb29f0eee0450e1d2614d987e14bf6baf26009d132d7" dependencies = [ "arrayvec", - "cfg-if 1.0.0", + "cfg-if", "js-sys", "log", - "naga 0.11.0", + "naga 0.11.1", "parking_lot 0.12.1", "profiling", "raw-window-handle", @@ -7089,11 +7303,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8aa4361a426ff9f028520da01e8fda28ab9bdb029e2a76901f1f88317e2796e9" dependencies = [ "arrayvec", - "cfg-if 1.0.0", + "cfg-if", "js-sys", "log", "naga 0.12.3", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "profiling", "raw-window-handle", "smallvec", @@ -7118,7 +7332,7 @@ dependencies = [ "codespan-reporting", "fxhash", "log", - "naga 0.11.0", + "naga 0.11.1", "parking_lot 0.12.1", "profiling", "raw-window-handle", @@ -7141,7 +7355,7 @@ dependencies = [ "codespan-reporting", "log", "naga 0.12.3", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "profiling", "raw-window-handle", "rustc-hash", @@ -7179,7 +7393,7 @@ dependencies = [ "libloading 0.7.4", "log", "metal", - "naga 0.11.0", + "naga 0.11.1", "objc", "parking_lot 0.12.1", "profiling", @@ -7222,7 +7436,7 @@ dependencies = [ "metal", "naga 0.12.3", "objc", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "profiling", "range-alloc", "raw-window-handle", @@ -7341,6 +7555,15 @@ dependencies = [ "windows-targets 0.42.2", ] +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.1", +] + [[package]] name = "windows-implement" version = "0.44.0" @@ -7406,7 +7629,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.1", ] [[package]] @@ -7426,9 +7649,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm 0.48.0", "windows_aarch64_msvc 0.48.0", @@ -7585,9 +7808,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.4.6" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" dependencies = [ "memchr", ] @@ -7613,6 +7836,15 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60e49e42bdb1d5dc76f4cd78102f8f0714d32edfa3efb82286eb0f0b1fc0da0f" +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + [[package]] name = "x11-dl" version = "2.21.0" @@ -7663,9 +7895,9 @@ checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" [[package]] name = "xml-rs" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52839dc911083a8ef63efa4d039d1f58b5e409f923e44c80828f206f66e5541c" +checksum = "5a56c84a8ccd4258aed21c92f70c0f6dea75356b6892ae27c24139da456f9336" [[package]] name = "yansi-term" @@ -7706,7 +7938,7 @@ dependencies = [ "annotate-snippets", "antlr-rust", "better_any", - "bevy 0.10.1", + "bevy 0.11.0", "rand", "regex", "serde", @@ -7720,7 +7952,7 @@ dependencies = [ name = "yarn_slinger_core" version = "0.1.0" dependencies = [ - "bevy 0.10.1", + "bevy 0.11.0", "bytes", "paste", "prost", @@ -7735,7 +7967,7 @@ dependencies = [ name = "yarn_slinger_examples" version = "0.1.0" dependencies = [ - "bevy 0.10.1", + "bevy 0.11.0", "bevy_yarn_slinger", "bevy_yarn_slinger_example_dialogue_view", ] @@ -7746,14 +7978,14 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.26", ] [[package]] name = "yarn_slinger_runtime" version = "0.1.0" dependencies = [ - "bevy 0.10.1", + "bevy 0.11.0", "fixed_decimal", "icu_locid", "icu_plurals", @@ -7842,9 +8074,9 @@ dependencies = [ [[package]] name = "zip" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e92305c174683d78035cbf1b70e18db6329cc0f1b9cae0a52ca90bf5bfe7125" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ "aes", "byteorder", @@ -7856,7 +8088,7 @@ dependencies = [ "hmac", "pbkdf2", "sha1 0.10.5", - "time 0.3.21", + "time 0.3.23", "zstd", ] diff --git a/crates/compiler/Cargo.toml b/crates/compiler/Cargo.toml index cdc323f3..9cd79c51 100644 --- a/crates/compiler/Cargo.toml +++ b/crates/compiler/Cargo.toml @@ -18,6 +18,6 @@ thiserror = "1" strum = "0.24" strum_macros = "0.24" annotate-snippets = { version = "0.9", features = ["color"] } -serde = { version = "1", features = ["derive"] , optional = true } -bevy = { version = "0.10", default-features = false, optional = true } +serde = { version = "1", features = ["derive"], optional = true } +bevy = { version = "0.11", default-features = false, optional = true } rand = { version = "0.8", features = ["small_rng"] } diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index d17fa10f..bca98aaf 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -17,6 +17,5 @@ strum = "0.24" strum_macros = "0.24" thiserror = "1" prost = "0.11" -serde = { version = "1", features = ["derive"] , optional = true } -bevy = { version = "0.10", default-features = false, optional = true } - +serde = { version = "1", features = ["derive"], optional = true } +bevy = { version = "0.11", default-features = false, optional = true } diff --git a/crates/core/src/generated/yarn.rs b/crates/core/src/generated/yarn.rs index 3ab797a6..f716b0c6 100644 --- a/crates/core/src/generated/yarn.rs +++ b/crates/core/src/generated/yarn.rs @@ -3,10 +3,7 @@ use crate::prelude::*; #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] -#[cfg_attr( - all(feature = "bevy", feature = "serde"), - reflect(Serialize, Deserialize) -)] +#[cfg_attr(all(feature = "bevy", feature = "serde"), reflect(Serialize, Deserialize))] #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Program { @@ -20,17 +17,17 @@ pub struct Program { /// instruction is run, and the value is not found in the storage, this /// value will be used #[prost(map = "string, message", tag = "3")] - pub initial_values: ::std::collections::HashMap<::prost::alloc::string::String, Operand>, + pub initial_values: ::std::collections::HashMap< + ::prost::alloc::string::String, + Operand, + >, } /// A collection of instructions use crate::prelude::*; #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] -#[cfg_attr( - all(feature = "bevy", feature = "serde"), - reflect(Serialize, Deserialize) -)] +#[cfg_attr(all(feature = "bevy", feature = "serde"), reflect(Serialize, Deserialize))] #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Node { @@ -58,10 +55,7 @@ use crate::prelude::*; #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] -#[cfg_attr( - all(feature = "bevy", feature = "serde"), - reflect(Serialize, Deserialize) -)] +#[cfg_attr(all(feature = "bevy", feature = "serde"), reflect(Serialize, Deserialize))] #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Header { @@ -75,10 +69,7 @@ use crate::prelude::*; #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] -#[cfg_attr( - all(feature = "bevy", feature = "serde"), - reflect(Serialize, Deserialize) -)] +#[cfg_attr(all(feature = "bevy", feature = "serde"), reflect(Serialize, Deserialize))] #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Instruction { @@ -100,7 +91,17 @@ pub mod instruction { all(feature = "bevy", feature = "serde"), reflect(Serialize, Deserialize) )] - #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] + #[derive( + Clone, + Copy, + Debug, + PartialEq, + Eq, + Hash, + PartialOrd, + Ord, + ::prost::Enumeration + )] #[repr(i32)] pub enum OpCode { /// Jumps to a named position in the node. @@ -151,7 +152,7 @@ pub mod instruction { Pop = 11, /// Calls a function in the client. Pops as many arguments as the /// client indicates the function receives, and the result (if any) - /// is pushed to the stack. + /// is pushed to the stack. /// opA = string: name of the function CallFunc = 12, /// Pushes the contents of a variable onto the stack. @@ -225,10 +226,7 @@ use crate::prelude::*; #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] -#[cfg_attr( - all(feature = "bevy", feature = "serde"), - reflect(Serialize, Deserialize) -)] +#[cfg_attr(all(feature = "bevy", feature = "serde"), reflect(Serialize, Deserialize))] #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Operand { diff --git a/crates/example_dialogue_view/Cargo.toml b/crates/example_dialogue_view/Cargo.toml index 0ff67ce6..37845a5b 100644 --- a/crates/example_dialogue_view/Cargo.toml +++ b/crates/example_dialogue_view/Cargo.toml @@ -13,6 +13,6 @@ unicode-segmentation = "1" seldom_fn_plugin = "0.3" [dependencies.bevy] -version = "0.10" +version = "0.11" default-features = false features = ["bevy_ui", "bevy_text", "bevy_render", "png", "bevy_asset"] diff --git a/crates/runtime/Cargo.toml b/crates/runtime/Cargo.toml index 4510b389..bfadfdff 100644 --- a/crates/runtime/Cargo.toml +++ b/crates/runtime/Cargo.toml @@ -6,7 +6,12 @@ license = "MIT OR Apache-2.0" [features] default = [] -serde = ["dep:serde", "bevy?/serialize", "yarn_slinger_core/serde", "icu_locid/serde"] +serde = [ + "dep:serde", + "bevy?/serialize", + "yarn_slinger_core/serde", + "icu_locid/serde", +] bevy = ["dep:bevy", "yarn_slinger_core/bevy"] [dependencies] @@ -19,10 +24,9 @@ icu_locid = { version = "1", features = ["std"] } icu_provider = { version = "1", features = ["std"] } icu_provider_adapters = { version = "1", features = ["std"] } fixed_decimal = { version = "0.5", features = ["ryu", "std"] } -zerovec = { version = "0.9", features = ["std"] } +zerovec = { version = "0.9", features = ["std"] } once_cell = "1" regex = "1" thiserror = "1" -serde = { version = "1", features = ["derive"] , optional = true } -bevy = { version = "0.10", default-features = false, optional = true } - +serde = { version = "1", features = ["derive"], optional = true } +bevy = { version = "0.11", default-features = false, optional = true } diff --git a/demo/Cargo.toml b/demo/Cargo.toml index 7d6b7f0a..41916da7 100644 --- a/demo/Cargo.toml +++ b/demo/Cargo.toml @@ -15,6 +15,17 @@ bevy_sprite3d = "=2.4.0" bevy_editor_pls = { version = "0.4", optional = true } [dependencies.bevy] -version = "0.10" +version = "0.11" default-features = false -features = ["bevy_core_pipeline", "bevy_pbr", "bevy_render", "bevy_sprite", "bevy_winit", "filesystem_watcher", "png", "x11", "bevy_gltf", "tonemapping_luts"] +features = [ + "bevy_core_pipeline", + "bevy_pbr", + "bevy_render", + "bevy_sprite", + "bevy_winit", + "filesystem_watcher", + "png", + "x11", + "bevy_gltf", + "tonemapping_luts", +] diff --git a/examples/bevy_yarn_slinger/Cargo.toml b/examples/bevy_yarn_slinger/Cargo.toml index cb6a60e6..8782cf66 100644 --- a/examples/bevy_yarn_slinger/Cargo.toml +++ b/examples/bevy_yarn_slinger/Cargo.toml @@ -9,6 +9,16 @@ bevy_yarn_slinger = { path = "../../crates/bevy_plugin" } bevy_yarn_slinger_example_dialogue_view = { path = "../../crates/example_dialogue_view" } [dependencies.bevy] -version = "0.10" +version = "0.11" default-features = false -features = ["bevy_core_pipeline", "bevy_pbr", "bevy_render", "bevy_sprite", "bevy_winit", "filesystem_watcher", "png", "x11", "bevy_gltf",] +features = [ + "bevy_core_pipeline", + "bevy_pbr", + "bevy_render", + "bevy_sprite", + "bevy_winit", + "filesystem_watcher", + "png", + "x11", + "bevy_gltf", +] From 3d983f4868b775a420c0a79fcd2aa2a1669d64ff Mon Sep 17 00:00:00 2001 From: Tim Jentzsch Date: Sat, 15 Jul 2023 15:17:57 +0200 Subject: [PATCH 04/24] Add missing Event derives --- crates/bevy_plugin/src/dialogue_runner/events.rs | 16 ++++++++-------- .../src/localization/strings_file/updating.rs | 2 +- crates/bevy_plugin/src/project.rs | 2 +- crates/bevy_plugin/src/project/compilation.rs | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/crates/bevy_plugin/src/dialogue_runner/events.rs b/crates/bevy_plugin/src/dialogue_runner/events.rs index 35919532..2b07ee62 100644 --- a/crates/bevy_plugin/src/dialogue_runner/events.rs +++ b/crates/bevy_plugin/src/dialogue_runner/events.rs @@ -16,7 +16,7 @@ pub(crate) fn dialogue_runner_events_plugin(app: &mut App) { /// An event that is fired after a dialogue advances and wishes to present a line to the user. /// A dialogue view should listen for this event and draw it to the screen. /// Handling this event is **mandatory** for dialogue views. -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone, PartialEq, Event)] pub struct PresentLineEvent { /// The line to present to the user. pub line: LocalizedLine, @@ -28,7 +28,7 @@ pub struct PresentLineEvent { /// A dialogue view should listen for this event and draw it to the screen. /// You need to handle this event by calling [`DialogueRunner::select_option`] with the ID found in the provided [`DialogueOption`]s. /// Handling this event is **mandatory** for dialogue views. -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone, PartialEq, Event)] pub struct PresentOptionsEvent { /// The options to present to the user. pub options: Vec, @@ -42,7 +42,7 @@ pub struct PresentOptionsEvent { /// However, a command is allowed much more freedom in its syntax than one might think, and as such, not all commands are registerable. /// Thus, you can listen for this event and handle it yourself if you wish to build your own command syntax for e.g. a DSL. /// Handling this event is optional for dialogue views. -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone, PartialEq, Event)] pub struct ExecuteCommandEvent { /// The command to execute. pub command: UnderlyingYarnCommand, @@ -52,7 +52,7 @@ pub struct ExecuteCommandEvent { /// An event that is fired after a node has been completed, i.e. all of its lines, commands, options, etc. have been exhausted. /// Handling this event is **optional** for dialogue views. -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone, PartialEq, Event)] pub struct NodeCompleteEvent { /// The name of the node that has been completed. pub node_name: String, @@ -62,7 +62,7 @@ pub struct NodeCompleteEvent { /// An event that is fired after a node has been started, i.e. the first line, command, option, etc. has been executed. /// Handling this event is **optional** for dialogue views -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone, PartialEq, Event)] pub struct NodeStartEvent { /// The name of the node that has been started. pub node_name: String, @@ -73,7 +73,7 @@ pub struct NodeStartEvent { /// An event that is fired when a new node has been started. Contains the IDs of all lines in the node as a general hint /// for asset providing systems to pre-load the lines. The lines are not guaranteed to be presented in the order of the IDs or at all. /// Handling this event is **optional** for dialogue views. -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone, PartialEq, Event)] pub struct LineHintsEvent { /// The IDs of all lines in the node. pub line_ids: Vec, @@ -83,14 +83,14 @@ pub struct LineHintsEvent { /// An event that is fired when a dialogue has been started via [`DialogueRunner::start_node`]/ /// Handling this event is **optional** for dialogue views. -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone, PartialEq, Event)] pub struct DialogueStartEvent { /// The [`DialogueRunner`] that has started this dialogue. pub source: Entity, } /// An event that is fired when a dialogue has been completed or stopped via [`DialogueRunner::stop`]. -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone, PartialEq, Event)] pub struct DialogueCompleteEvent { /// The [`DialogueRunner`] that has completed this dialogue. pub source: Entity, diff --git a/crates/bevy_plugin/src/localization/strings_file/updating.rs b/crates/bevy_plugin/src/localization/strings_file/updating.rs index 7283d2f3..d99fed68 100644 --- a/crates/bevy_plugin/src/localization/strings_file/updating.rs +++ b/crates/bevy_plugin/src/localization/strings_file/updating.rs @@ -20,7 +20,7 @@ pub(crate) fn strings_file_updating_plugin(app: &mut App) { ); } -#[derive(Debug, Clone, PartialEq, Eq, Default, Reflect)] +#[derive(Debug, Clone, PartialEq, Eq, Default, Reflect, Event)] #[reflect(Debug, Default, PartialEq)] pub(crate) struct UpdateAllStringsFilesForStringTableEvent( pub(crate) std::collections::HashMap, diff --git a/crates/bevy_plugin/src/project.rs b/crates/bevy_plugin/src/project.rs index 268e3f3f..b40ecd60 100644 --- a/crates/bevy_plugin/src/project.rs +++ b/crates/bevy_plugin/src/project.rs @@ -107,7 +107,7 @@ impl YarnProject { /// Used to late initialize a [`YarnProject`] with a set of Yarn files when using [`YarnSlingerPlugin::deferred`]. /// If you know the yarn files at the start of the game, you should use [`YarnSlingerPlugin::with_yarn_sources`] instead. -#[derive(Debug, Clone, PartialEq, Eq)] +#[derive(Debug, Clone, PartialEq, Eq, Event)] pub struct LoadYarnProjectEvent { pub(crate) localizations: Option, pub(crate) yarn_files: HashSet, diff --git a/crates/bevy_plugin/src/project/compilation.rs b/crates/bevy_plugin/src/project/compilation.rs index 6f6ceddc..11e5925c 100644 --- a/crates/bevy_plugin/src/project/compilation.rs +++ b/crates/bevy_plugin/src/project/compilation.rs @@ -95,7 +95,7 @@ fn add_yarn_files_to_load_queue( yarn_files_being_loaded.0.extend(handles); } -#[derive(Debug, Clone, PartialEq, Eq, Default, Reflect)] +#[derive(Debug, Clone, PartialEq, Eq, Default, Reflect, Event)] #[reflect(Debug, Default, PartialEq)] pub(crate) struct RecompileLoadedYarnFilesEvent; From b276ff201019cf460f3f0d28437c9d24d2843447 Mon Sep 17 00:00:00 2001 From: Tim Jentzsch Date: Sat, 15 Jul 2023 15:21:46 +0200 Subject: [PATCH 05/24] Add missing TypePath derives --- crates/bevy_plugin/src/localization/strings_file/asset.rs | 4 ++-- crates/bevy_plugin/src/plugin/yarn_file_source.rs | 4 ++-- crates/bevy_plugin/src/project/compilation.rs | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/crates/bevy_plugin/src/localization/strings_file/asset.rs b/crates/bevy_plugin/src/localization/strings_file/asset.rs index d2675e84..4d21a19a 100644 --- a/crates/bevy_plugin/src/localization/strings_file/asset.rs +++ b/crates/bevy_plugin/src/localization/strings_file/asset.rs @@ -4,7 +4,7 @@ use crate::prelude::*; use anyhow::{anyhow, bail}; use bevy::asset::{AssetLoader, BoxedFuture, LoadContext, LoadedAsset}; use bevy::prelude::*; -use bevy::reflect::TypeUuid; +use bevy::reflect::{TypePath, TypeUuid}; use bevy::utils::HashMap; use sha2::{Digest, Sha256}; use std::fs; @@ -39,7 +39,7 @@ impl AssetLoader for StringsFileAssetLoader { } } -#[derive(Debug, Clone, Eq, PartialEq, Default, Serialize, Deserialize, TypeUuid)] +#[derive(Debug, Clone, Eq, PartialEq, Default, Serialize, Deserialize, TypeUuid, TypePath)] #[uuid = "2e897914-f0f7-4b7f-b181-4d84b8ff6164"] #[non_exhaustive] pub(crate) struct StringsFile(HashMap); diff --git a/crates/bevy_plugin/src/plugin/yarn_file_source.rs b/crates/bevy_plugin/src/plugin/yarn_file_source.rs index 79b8014d..e24f2322 100644 --- a/crates/bevy_plugin/src/plugin/yarn_file_source.rs +++ b/crates/bevy_plugin/src/plugin/yarn_file_source.rs @@ -1,9 +1,9 @@ use crate::prelude::*; -use bevy::prelude::*; +use bevy::{prelude::*, reflect::TypePath}; use std::path::PathBuf; /// Possible sources to load a [`YarnFile`] from. -#[derive(Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Debug, Clone, PartialEq, Eq, Hash, TypePath)] pub enum YarnFileSource { /// A [`YarnFile`] that is already present in the asset server, addressed by its [`Handle`]. Handle(Handle), diff --git a/crates/bevy_plugin/src/project/compilation.rs b/crates/bevy_plugin/src/project/compilation.rs index 11e5925c..3158b5d8 100644 --- a/crates/bevy_plugin/src/project/compilation.rs +++ b/crates/bevy_plugin/src/project/compilation.rs @@ -3,6 +3,7 @@ use crate::prelude::*; use crate::project::{CompilationSystemSet, LoadYarnProjectEvent, WatchingForChanges}; use anyhow::bail; use bevy::prelude::*; +use bevy::reflect::TypePath; use bevy::utils::HashSet; use std::fmt::Debug; From 32a2061c5ec93bfbe6b24324285078f784b66227 Mon Sep 17 00:00:00 2001 From: Tim Jentzsch Date: Sat, 15 Jul 2023 15:27:01 +0200 Subject: [PATCH 06/24] Update to new .add_systems syntax --- crates/bevy_plugin/src/commands/command_registry/wait.rs | 2 +- crates/bevy_plugin/src/commands/execution.rs | 3 ++- crates/bevy_plugin/src/dialogue_runner/runtime_interaction.rs | 1 + crates/bevy_plugin/src/localization/line_id_generation.rs | 1 + crates/bevy_plugin/src/localization/strings_file/updating.rs | 1 + crates/bevy_plugin/src/project/compilation.rs | 2 +- 6 files changed, 7 insertions(+), 3 deletions(-) diff --git a/crates/bevy_plugin/src/commands/command_registry/wait.rs b/crates/bevy_plugin/src/commands/command_registry/wait.rs index 674b6a18..038bab7a 100644 --- a/crates/bevy_plugin/src/commands/command_registry/wait.rs +++ b/crates/bevy_plugin/src/commands/command_registry/wait.rs @@ -10,7 +10,7 @@ use std::time::Duration; pub(crate) fn wait_command_plugin(app: &mut App) { app.init_resource::() - .add_system(update_wait.in_set(YarnSlingerSystemSet)); + .add_systems(Update, update_wait.in_set(YarnSlingerSystemSet)); } #[derive(Debug, Clone, Resource, Default)] diff --git a/crates/bevy_plugin/src/commands/execution.rs b/crates/bevy_plugin/src/commands/execution.rs index cbd94625..5e6a46c3 100644 --- a/crates/bevy_plugin/src/commands/execution.rs +++ b/crates/bevy_plugin/src/commands/execution.rs @@ -6,7 +6,8 @@ use bevy::ecs::event::ManualEventReader; use bevy::prelude::*; pub(crate) fn command_execution_plugin(app: &mut App) { - app.add_system( + app.add_systems( + Update, execute_commands .after(DialogueExecutionSystemSet) .in_set(YarnSlingerSystemSet), diff --git a/crates/bevy_plugin/src/dialogue_runner/runtime_interaction.rs b/crates/bevy_plugin/src/dialogue_runner/runtime_interaction.rs index 9728f29e..5ca207ac 100644 --- a/crates/bevy_plugin/src/dialogue_runner/runtime_interaction.rs +++ b/crates/bevy_plugin/src/dialogue_runner/runtime_interaction.rs @@ -9,6 +9,7 @@ use bevy::utils::HashMap; pub(crate) fn runtime_interaction_plugin(app: &mut App) { app.add_systems( + Update, ( continue_runtime .pipe(panic_on_err) diff --git a/crates/bevy_plugin/src/localization/line_id_generation.rs b/crates/bevy_plugin/src/localization/line_id_generation.rs index 9f4a9478..5e3ed2ed 100644 --- a/crates/bevy_plugin/src/localization/line_id_generation.rs +++ b/crates/bevy_plugin/src/localization/line_id_generation.rs @@ -11,6 +11,7 @@ pub(crate) struct LineIdUpdateSystemSet; pub(crate) fn line_id_generation_plugin(app: &mut App) { app.add_systems( + Update, ( handle_yarn_file_events .pipe(panic_on_err) diff --git a/crates/bevy_plugin/src/localization/strings_file/updating.rs b/crates/bevy_plugin/src/localization/strings_file/updating.rs index d99fed68..d84435a8 100644 --- a/crates/bevy_plugin/src/localization/strings_file/updating.rs +++ b/crates/bevy_plugin/src/localization/strings_file/updating.rs @@ -6,6 +6,7 @@ use bevy::utils::{HashMap, HashSet}; pub(crate) fn strings_file_updating_plugin(app: &mut App) { app.add_event::() .add_systems( + Update, (update_all_strings_files_for_string_table .pipe(panic_on_err) .after(LineIdUpdateSystemSet) diff --git a/crates/bevy_plugin/src/project/compilation.rs b/crates/bevy_plugin/src/project/compilation.rs index 3158b5d8..c5b6aedc 100644 --- a/crates/bevy_plugin/src/project/compilation.rs +++ b/crates/bevy_plugin/src/project/compilation.rs @@ -3,7 +3,6 @@ use crate::prelude::*; use crate::project::{CompilationSystemSet, LoadYarnProjectEvent, WatchingForChanges}; use anyhow::bail; use bevy::prelude::*; -use bevy::reflect::TypePath; use bevy::utils::HashSet; use std::fmt::Debug; @@ -13,6 +12,7 @@ pub(crate) fn project_compilation_plugin(app: &mut App) { .init_resource::() .add_event::() .add_systems( + Update, ( load_project.pipe(panic_on_err), add_yarn_files_to_load_queue From 741423ea51fe03a1bb6ede956c3c7b5dc1c05a40 Mon Sep 17 00:00:00 2001 From: Tim Jentzsch Date: Sat, 15 Jul 2023 15:28:51 +0200 Subject: [PATCH 07/24] Remove deprecated .add_plugin call --- crates/bevy_plugin/src/plugin.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/bevy_plugin/src/plugin.rs b/crates/bevy_plugin/src/plugin.rs index a76e69eb..1a92c0d9 100644 --- a/crates/bevy_plugin/src/plugin.rs +++ b/crates/bevy_plugin/src/plugin.rs @@ -162,7 +162,7 @@ impl Plugin for YarnSlingerPlugin { Did you call `YarnSlingerPlugin::with_yarn_files()` without any Yarn file sources? \ If you really want to load no Yarn files right now and do that later, use `YarnSlingerPlugin::deferred()` instead.\ If you wanted to load from the default directory instead, use `YarnSlingerPlugin::default()`."); - app.add_plugin(Self::deferred()) + app.add_plugins(Self::deferred()) .world .send_event(self.project.clone()); } From 735ee250f589795f2c84e87aed2d122b08f96cd8 Mon Sep 17 00:00:00 2001 From: Tim Jentzsch Date: Sat, 15 Jul 2023 15:37:19 +0200 Subject: [PATCH 08/24] Port remaining .add_systems calls --- crates/bevy_plugin/src/lib.rs | 13 ++++++++----- .../src/line_provider/text_provider.rs | 3 ++- crates/bevy_plugin/src/project.rs | 2 +- .../src/option_selection.rs | 1 + crates/example_dialogue_view/src/setup.rs | 2 +- crates/example_dialogue_view/src/typewriter.rs | 1 + crates/example_dialogue_view/src/updating.rs | 1 + demo/src/main.rs | 16 ++++++++++------ .../yarn_files/running_examples.md | 9 +++++---- .../src/bin/access_variables.rs | 13 ++++++++----- .../bevy_yarn_slinger/src/bin/custom_command.rs | 11 +++++++---- .../bevy_yarn_slinger/src/bin/custom_function.rs | 11 +++++++---- .../bevy_yarn_slinger/src/bin/hello_world.rs | 13 ++++++++----- 13 files changed, 60 insertions(+), 36 deletions(-) diff --git a/crates/bevy_plugin/src/lib.rs b/crates/bevy_plugin/src/lib.rs index d6f57445..3a670e80 100644 --- a/crates/bevy_plugin/src/lib.rs +++ b/crates/bevy_plugin/src/lib.rs @@ -67,11 +67,14 @@ //! .add_plugin(YarnSlingerPlugin::new()) //! // Initialize the bundled example UI. Requires the `bevy_yarn_slinger_example_dialogue_view` crate. //! // .add_plugin(ExampleYarnSlingerDialogueViewPlugin::new()) -//! .add_systems(( -//! setup_camera.on_startup(), -//! // Spawn dialogue runner once the Yarn project has finished compiling -//! spawn_dialogue_runner.run_if(resource_added::()), -//! )) +//! .add_systems( +//! Update, +//! ( +//! setup_camera.on_startup(), +//! // Spawn dialogue runner once the Yarn project has finished compiling +//! spawn_dialogue_runner.run_if(resource_added::()), +//! ) +//! ) //! .run(); //! } //! diff --git a/crates/bevy_plugin/src/line_provider/text_provider.rs b/crates/bevy_plugin/src/line_provider/text_provider.rs index fae3a1fe..631029db 100644 --- a/crates/bevy_plugin/src/line_provider/text_provider.rs +++ b/crates/bevy_plugin/src/line_provider/text_provider.rs @@ -13,7 +13,8 @@ mod strings_file_text_provider; pub(crate) fn text_provider_plugin(app: &mut App) { app.fn_plugin(shared_text_provider::shared_text_provider_plugin) .fn_plugin(strings_file_text_provider::strings_file_text_provider_plugin) - .add_system( + .add_systems( + Update, fetch_resources .in_set(LineProviderSystemSet) .in_set(YarnSlingerSystemSet), diff --git a/crates/bevy_plugin/src/project.rs b/crates/bevy_plugin/src/project.rs index b40ecd60..cfa1cb66 100644 --- a/crates/bevy_plugin/src/project.rs +++ b/crates/bevy_plugin/src/project.rs @@ -23,7 +23,7 @@ pub(crate) struct CompilationSystemSet; /// # use bevy::prelude::*; /// # use bevy_yarn_slinger::prelude::*; /// # let mut app = App::new(); -/// app.add_system(setup_dialogue_runners.run_if(resource_added::())); +/// app.add_systems(Update, setup_dialogue_runners.run_if(resource_added::())); /// /// fn setup_dialogue_runners(mut commands: Commands, project: Res) { /// commands.spawn(project.create_dialogue_runner()); diff --git a/crates/example_dialogue_view/src/option_selection.rs b/crates/example_dialogue_view/src/option_selection.rs index a0702a7b..f6520299 100644 --- a/crates/example_dialogue_view/src/option_selection.rs +++ b/crates/example_dialogue_view/src/option_selection.rs @@ -8,6 +8,7 @@ use bevy_yarn_slinger::{events::*, prelude::*}; pub(crate) fn option_selection_plugin(app: &mut App) { app.add_systems( + Update, ( show_options.run_if( resource_exists::().and_then(resource_exists::()), diff --git a/crates/example_dialogue_view/src/setup.rs b/crates/example_dialogue_view/src/setup.rs index 29005c86..46c5871e 100644 --- a/crates/example_dialogue_view/src/setup.rs +++ b/crates/example_dialogue_view/src/setup.rs @@ -4,7 +4,7 @@ use bevy::prelude::*; use bevy_yarn_slinger::prelude::*; pub(crate) fn ui_setup_plugin(app: &mut App) { - app.add_system(setup.on_startup()); + app.add_systems(Update, setup.on_startup()); } #[derive(Debug, Default, Component)] diff --git a/crates/example_dialogue_view/src/typewriter.rs b/crates/example_dialogue_view/src/typewriter.rs index 66396d67..15ef0ac4 100644 --- a/crates/example_dialogue_view/src/typewriter.rs +++ b/crates/example_dialogue_view/src/typewriter.rs @@ -12,6 +12,7 @@ use unicode_segmentation::UnicodeSegmentation; pub(crate) fn typewriter_plugin(app: &mut App) { app.add_systems( + Update, ( despawn.run_if(on_event::()), spawn.run_if(on_event::()), diff --git a/crates/example_dialogue_view/src/updating.rs b/crates/example_dialogue_view/src/updating.rs index 3848192d..9bc9cb3a 100644 --- a/crates/example_dialogue_view/src/updating.rs +++ b/crates/example_dialogue_view/src/updating.rs @@ -7,6 +7,7 @@ use bevy_yarn_slinger::{events::*, prelude::*}; pub(crate) fn ui_updating_plugin(app: &mut App) { app.add_systems( + Update, ( hide_dialog.run_if(on_event::()), show_dialog.run_if(on_event::()), diff --git a/demo/src/main.rs b/demo/src/main.rs index b8c39f21..e8edbe96 100644 --- a/demo/src/main.rs +++ b/demo/src/main.rs @@ -50,13 +50,17 @@ fn main() { ) .add_plugin(ExampleYarnSlingerDialogueViewPlugin::new()) .add_plugin(Sprite3dPlugin) - .add_systems(( - setup.on_startup(), - spawn_dialogue_runner.run_if(resource_added::()), - adapt_materials.run_if(any_with_component::()), - spawn_sprites.run_if(sprites_have_loaded), - )) .add_systems( + Update, + ( + setup.on_startup(), + spawn_dialogue_runner.run_if(resource_added::()), + adapt_materials.run_if(any_with_component::()), + spawn_sprites.run_if(sprites_have_loaded), + ), + ) + .add_systems( + Update, ( handle_fade.run_if(resource_exists::()), move_camera.run_if(resource_exists::()), diff --git a/docs/src/working_with_yarn_slinger/yarn_files/running_examples.md b/docs/src/working_with_yarn_slinger/yarn_files/running_examples.md index b9229a65..ba6f2a3e 100644 --- a/docs/src/working_with_yarn_slinger/yarn_files/running_examples.md +++ b/docs/src/working_with_yarn_slinger/yarn_files/running_examples.md @@ -5,7 +5,7 @@ This is nice because it runs directly in your browser and so doesn't require any and Yarn Spinner read Yarn files the same way, the behavior will be identical to how it would be in your game. The only thing to look out for is that Try Yarn Spinner will only start at a node named "Start". -If you want to see the result of your Yarn files in an actual game window, you can +If you want to see the result of your Yarn files in an actual game window, you can setup a little example project. We will use screenshots from such a setup throughout the book. If you want to follow along this way setup the crate by running the following commands. @@ -33,7 +33,7 @@ fn main() { })) .add_plugin(YarnSlingerPlugin::new()) .add_plugin(ExampleYarnSlingerDialogueViewPlugin::new()) - .add_systems(( + .add_systems(Update, ( setup_camera.on_startup(), spawn_dialogue_runner.run_if(resource_added::()), )) @@ -50,6 +50,7 @@ fn spawn_dialogue_runner(mut commands: Commands, project: Res) { commands.spawn(dialogue_runner); } ``` + Don't worry, we will look at what this code does in detail later. For now, just treat it as something that runs your Yarn files. @@ -73,8 +74,8 @@ Run your game with `cargo run` and you should see the following: ![hello_world.png](hello_world.png) It might have taken a while to compile, but the good news is that the code you're running now -supports *hot reloading*, which means that you can change your Yarn file and save it while the game is running -and the changes will be visible immediately, as long as you didn't already close the dialog by completing it. +supports _hot reloading_, which means that you can change your Yarn file and save it while the game is running +and the changes will be visible immediately, as long as you didn't already close the dialog by completing it. No recompilation required! Try it out now. Can you make the dialogue say "Goodbye World!" instead? diff --git a/examples/bevy_yarn_slinger/src/bin/access_variables.rs b/examples/bevy_yarn_slinger/src/bin/access_variables.rs index 115e94b3..0cdd33e2 100644 --- a/examples/bevy_yarn_slinger/src/bin/access_variables.rs +++ b/examples/bevy_yarn_slinger/src/bin/access_variables.rs @@ -8,11 +8,14 @@ fn main() { app.add_plugins(DefaultPlugins) .add_plugin(YarnSlingerPlugin::new()) .add_plugin(ExampleYarnSlingerDialogueViewPlugin::new()) - .add_systems(( - setup_camera.on_startup(), - spawn_dialogue_runner.run_if(resource_added::()), - print_yarn_variable.run_if(any_with_component::()), - )) + .add_systems( + Update, + ( + setup_camera.on_startup(), + spawn_dialogue_runner.run_if(resource_added::()), + print_yarn_variable.run_if(any_with_component::()), + ), + ) .run(); } diff --git a/examples/bevy_yarn_slinger/src/bin/custom_command.rs b/examples/bevy_yarn_slinger/src/bin/custom_command.rs index 1d97f5c1..6746278d 100644 --- a/examples/bevy_yarn_slinger/src/bin/custom_command.rs +++ b/examples/bevy_yarn_slinger/src/bin/custom_command.rs @@ -8,10 +8,13 @@ fn main() { app.add_plugins(DefaultPlugins) .add_plugin(YarnSlingerPlugin::new()) .add_plugin(ExampleYarnSlingerDialogueViewPlugin::new()) - .add_systems(( - setup_camera.on_startup(), - spawn_dialogue_runner.run_if(resource_added::()), - )) + .add_systems( + Update, + ( + setup_camera.on_startup(), + spawn_dialogue_runner.run_if(resource_added::()), + ), + ) .run(); } diff --git a/examples/bevy_yarn_slinger/src/bin/custom_function.rs b/examples/bevy_yarn_slinger/src/bin/custom_function.rs index 337f9d40..daa49531 100644 --- a/examples/bevy_yarn_slinger/src/bin/custom_function.rs +++ b/examples/bevy_yarn_slinger/src/bin/custom_function.rs @@ -8,10 +8,13 @@ fn main() { app.add_plugins(DefaultPlugins) .add_plugin(YarnSlingerPlugin::new()) .add_plugin(ExampleYarnSlingerDialogueViewPlugin::new()) - .add_systems(( - setup_camera.on_startup(), - spawn_dialogue_runner.run_if(resource_added::()), - )) + .add_systems( + Update, + ( + setup_camera.on_startup(), + spawn_dialogue_runner.run_if(resource_added::()), + ), + ) .run(); } diff --git a/examples/bevy_yarn_slinger/src/bin/hello_world.rs b/examples/bevy_yarn_slinger/src/bin/hello_world.rs index be92f86b..90eb206f 100644 --- a/examples/bevy_yarn_slinger/src/bin/hello_world.rs +++ b/examples/bevy_yarn_slinger/src/bin/hello_world.rs @@ -11,11 +11,14 @@ fn main() { .add_plugin(YarnSlingerPlugin::new()) // Initialize the bundled example UI .add_plugin(ExampleYarnSlingerDialogueViewPlugin::new()) - .add_systems(( - setup_camera.on_startup(), - // Spawn the dialogue runner once the Yarn project has finished compiling - spawn_dialogue_runner.run_if(resource_added::()), - )) + .add_systems( + Update, + ( + setup_camera.on_startup(), + // Spawn the dialogue runner once the Yarn project has finished compiling + spawn_dialogue_runner.run_if(resource_added::()), + ), + ) .run(); } From 28d00aed78668c82aeb325d1db2b2493066acdb5 Mon Sep 17 00:00:00 2001 From: Tim Jentzsch Date: Thu, 3 Aug 2023 19:35:28 +0200 Subject: [PATCH 09/24] Update seldom_fn_plugin to 0.4 for bevy 0.11 --- Cargo.lock | 359 +++++++++++++++++----------------- crates/bevy_plugin/Cargo.toml | 2 +- 2 files changed, 176 insertions(+), 185 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0d1fcce3..8e089759 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -26,9 +26,9 @@ checksum = "704d532b1cd3d912bb37499c55a81ac748cc1afa737eedd100ba441acdd47d38" [[package]] name = "accesskit" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c98a5d094590335462354da402d754fe2cb78f0e6ce5024611c28ed539c1de" +checksum = "d77020650e30e570cff04a3650872b9be650b79de494005da13809574a0d1fdb" [[package]] name = "accesskit_consumer" @@ -41,11 +41,11 @@ dependencies = [ [[package]] name = "accesskit_consumer" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca541e0fdb600916d196a940228df99b86d804fd2e6ef13894d7814f2799db43" +checksum = "14346d6d9b9e88d03f42f21453977946dac425b3e962476931e1da8a959817b3" dependencies = [ - "accesskit 0.11.0", + "accesskit 0.11.1", ] [[package]] @@ -62,12 +62,12 @@ dependencies = [ [[package]] name = "accesskit_macos" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4baea9413f0daf1cd4aab199bc09f8139cd726ce7673d523c27d186b8b878325" +checksum = "dfa2fdecd5a520958deb7fd3614c2b6500d808a3acfc6ddd52211bf57ba8d6bc" dependencies = [ - "accesskit 0.11.0", - "accesskit_consumer 0.15.0", + "accesskit 0.11.1", + "accesskit_consumer 0.15.1", "objc2", "once_cell", ] @@ -88,12 +88,12 @@ dependencies = [ [[package]] name = "accesskit_windows" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e11c7f177739f23bd19bb856e4a64fdd96eb8638ec0a6a6dde9a7019a9e91c53" +checksum = "4a4ab2fad3575f5c77f21cddeaa0e156db6ce35f8f3522f7c69e0ac51e7bd0f4" dependencies = [ - "accesskit 0.11.0", - "accesskit_consumer 0.15.0", + "accesskit 0.11.1", + "accesskit_consumer 0.15.1", "arrayvec", "once_cell", "paste", @@ -114,13 +114,13 @@ dependencies = [ [[package]] name = "accesskit_winit" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f1bd64cd0b480cafb7bdd91eb489a1ff50f0f5702437b9efa32a25b8bb82a1" +checksum = "badc92d61313d1e495edb0f1b3ec0fe6e337e1ea1e868bc1d02b9c245d46da5d" dependencies = [ - "accesskit 0.11.0", - "accesskit_macos 0.7.1", - "accesskit_windows 0.14.0", + "accesskit 0.11.1", + "accesskit_macos 0.8.0", + "accesskit_windows 0.14.1", "winit", ] @@ -190,9 +190,9 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "alsa" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8512c9117059663fb5606788fbca3619e2a91dac0e3fe516242eab1fa6be5e44" +checksum = "e2562ad8dcf0f789f65c6fdaad8a8a9708ed6b488e649da28c01656ad66b8b47" dependencies = [ "alsa-sys", "bitflags 1.3.2", @@ -212,9 +212,9 @@ dependencies = [ [[package]] name = "android-activity" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40bc1575e653f158cbdc6ebcd917b9564e66321c5325c232c3591269c257be69" +checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0" dependencies = [ "android-properties", "bitflags 1.3.2", @@ -242,9 +242,9 @@ checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e" [[package]] name = "android_log-sys" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27f0fc03f560e1aebde41c2398b691cb98b5ea5996a6184a7a67bbbb77448969" +checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937" [[package]] name = "android_system_properties" @@ -333,9 +333,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "approx" @@ -401,7 +401,7 @@ dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand", + "fastrand 1.9.0", "futures-lite", "slab", ] @@ -532,7 +532,7 @@ checksum = "7556c913daacbec7aa213eda82517673bf6c6b25e0d827a56efe17421ebaca35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -553,7 +553,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f758f437d9d862bf10a8e3a0f76b426095c19a87d118c945dcb935358d856076" dependencies = [ - "accesskit 0.11.0", + "accesskit 0.11.1", "bevy_app 0.11.0", "bevy_derive 0.11.0", "bevy_ecs 0.11.0", @@ -625,7 +625,7 @@ dependencies = [ "bevy_winit 0.10.1", "crossbeam-channel", "downcast-rs", - "fastrand", + "fastrand 1.9.0", "js-sys", "notify 5.2.0", "parking_lot 0.12.1", @@ -653,7 +653,7 @@ dependencies = [ "bevy_winit 0.11.0", "crossbeam-channel", "downcast-rs", - "fastrand", + "fastrand 1.9.0", "js-sys", "notify 6.0.1", "parking_lot 0.12.1", @@ -793,7 +793,7 @@ checksum = "e1477347b17df781756ba0dfd677e2975e57e930752cd3cd42e6cdd8fdaa3223" dependencies = [ "bevy_macro_utils 0.11.0", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -823,7 +823,7 @@ dependencies = [ "bevy_log 0.11.0", "bevy_time 0.11.0", "bevy_utils 0.11.0", - "sysinfo 0.29.4", + "sysinfo 0.29.7", ] [[package]] @@ -888,7 +888,7 @@ dependencies = [ "bevy_macro_utils 0.11.0", "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -1224,7 +1224,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "487dfd1fc75fada8f3f2f4773addf3fbba53a2a91cb913616e6dc6c26dd62995" dependencies = [ - "android_log-sys 0.3.0", + "android_log-sys 0.3.1", "bevy_app 0.11.0", "bevy_ecs 0.11.0", "bevy_utils 0.11.0", @@ -1253,7 +1253,7 @@ checksum = "fd3868e555723249fde3786891f35893b3001b2be4efb51f431467cb7fc378cd" dependencies = [ "quote", "rustc-hash", - "syn 2.0.26", + "syn 2.0.28", "toml_edit", ] @@ -1419,7 +1419,7 @@ dependencies = [ "proc-macro2", "quote", "syn 1.0.109", - "uuid 1.4.0", + "uuid 1.4.1", ] [[package]] @@ -1432,8 +1432,8 @@ dependencies = [ "bit-set", "proc-macro2", "quote", - "syn 2.0.26", - "uuid 1.4.0", + "syn 2.0.28", + "uuid 1.4.1", ] [[package]] @@ -1526,7 +1526,7 @@ dependencies = [ "thread_local", "wasm-bindgen", "web-sys", - "wgpu 0.16.2", + "wgpu 0.16.3", "wgpu-hal 0.16.2", ] @@ -1551,7 +1551,7 @@ dependencies = [ "bevy_macro_utils 0.11.0", "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -1573,7 +1573,7 @@ dependencies = [ "ron", "serde", "thiserror", - "uuid 1.4.0", + "uuid 1.4.1", ] [[package]] @@ -1595,7 +1595,7 @@ dependencies = [ "ron", "serde", "thiserror", - "uuid 1.4.0", + "uuid 1.4.1", ] [[package]] @@ -1862,7 +1862,7 @@ dependencies = [ "petgraph", "thiserror", "tracing", - "uuid 1.4.0", + "uuid 1.4.1", ] [[package]] @@ -1879,7 +1879,7 @@ dependencies = [ "petgraph", "thiserror", "tracing", - "uuid 1.4.0", + "uuid 1.4.1", ] [[package]] @@ -1901,7 +1901,7 @@ checksum = "9e37f2e885b0e8af59dc19871c313d3cf2a2495db35bb4d4ae0a61b3f87d5401" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -1966,7 +1966,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24c6709dc70cfee1eb94d5f125d29612c4a9345dfc1a70dd3189af927b2fd503" dependencies = [ - "accesskit_winit 0.14.1", + "accesskit_winit 0.14.2", "approx", "bevy_a11y 0.11.0", "bevy_app 0.11.0", @@ -1993,7 +1993,7 @@ dependencies = [ "bevy 0.11.0", "csv", "rand", - "seldom_fn_plugin", + "seldom_fn_plugin 0.4.0", "serde", "sha2", "tempfile", @@ -2017,7 +2017,7 @@ version = "0.1.0" dependencies = [ "bevy 0.11.0", "bevy_yarn_slinger", - "seldom_fn_plugin", + "seldom_fn_plugin 0.3.0", "unicode-segmentation", ] @@ -2130,7 +2130,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" dependencies = [ "memchr", - "regex-automata 0.3.3", + "regex-automata 0.3.4", "serde", ] @@ -2179,7 +2179,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -2239,11 +2239,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "6c6b2562119bf28c3439f7f02db99faf0aa1a8cdfe5772a2ee155d32227239f0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -2296,9 +2297,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.12" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eab9e8ceb9afdade1ab3f0fd8dbce5b1b2f468ad653baf10e771781b2b67b73" +checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" dependencies = [ "clap_builder", "clap_derive", @@ -2307,9 +2308,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.12" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f2763db829349bf00cfc06251268865ed4363b93a943174f638daf3ecdba2cd" +checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" dependencies = [ "anstream", "anstyle", @@ -2326,7 +2327,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -2687,7 +2688,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -2698,7 +2699,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -2746,6 +2747,12 @@ dependencies = [ "serde", ] +[[package]] +name = "deranged" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929" + [[package]] name = "digest" version = "0.10.7" @@ -2777,7 +2784,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -2853,9 +2860,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "elsa" @@ -2936,7 +2943,7 @@ checksum = "3fe2568f851fd6144a45fa91cfed8fe5ca8fc0b56ba6797bfc1ed2771b90e37c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -2992,7 +2999,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -3019,18 +3026,18 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "erased-serde" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f94c0e13118e7d7533271f754a168ae8400e6a1cc043f2bfd53cc7290f1a1de3" +checksum = "da96524cc884f6558f1769b6c46686af2fe8e8b4cd253bd5a3cdba8181b8e070" dependencies = [ "serde", ] [[package]] name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", @@ -3097,6 +3104,12 @@ dependencies = [ "instant", ] +[[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + [[package]] name = "fdeflate" version = "0.3.0" @@ -3228,7 +3241,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -3324,7 +3337,7 @@ dependencies = [ "fnv", "gilrs-core", "log", - "uuid 1.4.0", + "uuid 1.4.1", "vec_map", ] @@ -3341,7 +3354,7 @@ dependencies = [ "libudev-sys", "log", "nix 0.26.2", - "uuid 1.4.0", + "uuid 1.4.1", "vec_map", "wasm-bindgen", "web-sys", @@ -3399,9 +3412,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "glow" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "807edf58b70c0b5b2181dd39fe1839dbdb3ba02645630dc5f753e23da307f762" +checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728" dependencies = [ "js-sys", "slotmap", @@ -3429,7 +3442,7 @@ dependencies = [ "inflections", "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -4289,17 +4302,6 @@ dependencies = [ "mach2", ] -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "ipnet" version = "2.8.0" @@ -4313,7 +4315,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.4", + "rustix", "windows-sys 0.48.0", ] @@ -4328,9 +4330,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jni" @@ -4519,15 +4521,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "litemap" @@ -4990,9 +4986,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", "libm", @@ -5047,7 +5043,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -5213,7 +5209,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -5236,9 +5232,9 @@ dependencies = [ [[package]] name = "orbclient" -version = "0.3.45" +version = "0.3.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "221d488cd70617f1bd599ed8ceb659df2147d9393717954d82a0f5e8032a6ab1" +checksum = "8378ac0dfbd4e7895f2d2c1f1345cab3836910baf3a300b000d04250f0c8428f" dependencies = [ "redox_syscall 0.3.5", ] @@ -5325,9 +5321,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pbkdf2" @@ -5396,9 +5392,9 @@ dependencies = [ [[package]] name = "postcard" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa512cd0d087cc9f99ad30a1bf64795b67871edbead083ffc3a4dfafa59aa00" +checksum = "c9ee729232311d3cd113749948b689627618133b1c5012b77342c1950b25eaeb" dependencies = [ "cobs", "serde", @@ -5477,9 +5473,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.64" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -5566,9 +5562,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.29" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -5687,7 +5683,7 @@ checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.3", + "regex-automata 0.3.4", "regex-syntax 0.7.4", ] @@ -5712,9 +5708,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "b7b6d6190b7594385f61bd3911cd1be99dfddcfc365a4160cc2ab5bff4aed294" dependencies = [ "aho-corasick", "memchr", @@ -5817,7 +5813,7 @@ dependencies = [ "rkyv_derive", "seahash", "tinyvec", - "uuid 1.4.0", + "uuid 1.4.1", ] [[package]] @@ -5875,36 +5871,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.23" +version = "0.38.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +checksum = "1ee020b1716f0a80e2ace9b03441a749e402e86712f15f16fe8a8f75afac732f" dependencies = [ "bitflags 2.3.3", "errno", "libc", - "linux-raw-sys 0.4.3", + "linux-raw-sys", "windows-sys 0.48.0", ] [[package]] name = "rustversion" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ruzstd" @@ -5918,9 +5900,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "same-file" @@ -5942,9 +5924,9 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "seahash" @@ -5954,9 +5936,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "security-framework" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -5967,9 +5949,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys 0.8.4", "libc", @@ -5984,6 +5966,15 @@ dependencies = [ "bevy 0.10.1", ] +[[package]] +name = "seldom_fn_plugin" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8b68f2d4518ce1f3db064454d1103f4b85f23edcdab4350312e8f4697e0cd46" +dependencies = [ + "bevy 0.11.0", +] + [[package]] name = "semver" version = "0.9.0" @@ -6001,9 +5992,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.171" +version = "1.0.180" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed" dependencies = [ "serde_derive", ] @@ -6030,29 +6021,29 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.11" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a16be4fe5320ade08736447e3198294a5ea9a6d44dde6f35f0a5e06859c427a" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.180" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "24e744d7782b686ab3b73267ef05697159cc0e5abbed3f47f9933165e5219036" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] name = "serde_json" -version = "1.0.102" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5062a995d481b2308b6064e9af76011f2921c35f97b0468811ed9f6cd91dfed" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ "itoa", "ryu", @@ -6125,9 +6116,9 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] name = "simd-adler32" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "simdutf8" @@ -6337,9 +6328,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.26" +version = "2.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" +checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" dependencies = [ "proc-macro2", "quote", @@ -6374,9 +6365,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.29.4" +version = "0.29.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "751e810399bba86e9326f5762b7f32ac5a085542df78da6a78d94e07d14d7c11" +checksum = "165d6d8539689e3d3bc8b98ac59541e1f21c7de7c85d60dc80e43ae0ed2113db" dependencies = [ "cfg-if", "core-foundation-sys 0.8.4", @@ -6417,21 +6408,20 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.9" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tempfile" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" dependencies = [ - "autocfg", "cfg-if", - "fastrand", + "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix 0.37.23", + "rustix", "windows-sys 0.48.0", ] @@ -6446,22 +6436,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -6502,10 +6492,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.23" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" +checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea" dependencies = [ + "deranged", "serde", "time-core", ] @@ -6660,7 +6651,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -6823,9 +6814,9 @@ checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" [[package]] name = "uuid" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ "getrandom", "serde", @@ -6907,7 +6898,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", "wasm-bindgen-shared", ] @@ -6941,7 +6932,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7298,9 +7289,9 @@ dependencies = [ [[package]] name = "wgpu" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8aa4361a426ff9f028520da01e8fda28ab9bdb029e2a76901f1f88317e2796e9" +checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd" dependencies = [ "arrayvec", "cfg-if", @@ -7808,9 +7799,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.5.0" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" +checksum = "f46aab759304e4d7b2075a9aecba26228bb073ee8c50db796b2c72c676b5d807" dependencies = [ "memchr", ] @@ -7895,9 +7886,9 @@ checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" [[package]] name = "xml-rs" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a56c84a8ccd4258aed21c92f70c0f6dea75356b6892ae27c24139da456f9336" +checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1" [[package]] name = "yansi-term" @@ -7978,7 +7969,7 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -8088,7 +8079,7 @@ dependencies = [ "hmac", "pbkdf2", "sha1 0.10.5", - "time 0.3.23", + "time 0.3.25", "zstd", ] diff --git a/crates/bevy_plugin/Cargo.toml b/crates/bevy_plugin/Cargo.toml index 6565bbec..396ee76a 100644 --- a/crates/bevy_plugin/Cargo.toml +++ b/crates/bevy_plugin/Cargo.toml @@ -12,7 +12,7 @@ audio_assets = ["bevy/bevy_audio", "bevy/vorbis"] [dependencies] anyhow = "1" csv = "1" -seldom_fn_plugin = "0.3" +seldom_fn_plugin = "0.4" serde = { version = "1", features = ["derive"] } yarn_slinger = { path = "../yarn_slinger", features = ["bevy", "serde"] } sha2 = "0.10" From 3937a928ce50d39181857a50bd4a3465604112dd Mon Sep 17 00:00:00 2001 From: Tim Jentzsch Date: Thu, 3 Aug 2023 19:37:43 +0200 Subject: [PATCH 10/24] Adapt to new asset change watcher --- crates/bevy_plugin/src/plugin.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/bevy_plugin/src/plugin.rs b/crates/bevy_plugin/src/plugin.rs index 1a92c0d9..79f3bdfa 100644 --- a/crates/bevy_plugin/src/plugin.rs +++ b/crates/bevy_plugin/src/plugin.rs @@ -237,6 +237,7 @@ impl YarnApp for App { let asset_plugins: Vec<&AssetPlugin> = self.get_added_plugins(); let asset_plugin: &AssetPlugin = asset_plugins.into_iter().next().expect("Yarn Slinger requires access to the Bevy asset plugin. \ Please add `YarnSlingerPlugin` after `AssetPlugin`, which is commonly added as part of the `DefaultPlugins`"); - asset_plugin.watch_for_changes + + asset_plugin.watch_for_changes.is_some() } } From 9a72a34a426f6ca5b2fa6d620ae57951c413f3f7 Mon Sep 17 00:00:00 2001 From: Tim Jentzsch Date: Thu, 3 Aug 2023 19:42:36 +0200 Subject: [PATCH 11/24] Fix dependencies and size usage in examples --- Cargo.lock | 156 ++++++++-------------- crates/example_dialogue_view/src/setup.rs | 10 +- demo/Cargo.toml | 2 +- 3 files changed, 63 insertions(+), 105 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8e089759..65bdb74e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -561,20 +561,21 @@ dependencies = [ [[package]] name = "bevy_animation" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0dc19f21846ebf8ba4d96617c2517b5119038774aa5dbbaf1bff122332b359c" +checksum = "3d130cb8b7e2b81304591c5c8e511accd2df58b8d8185ab4836ed2f377e6a61f" dependencies = [ - "bevy_app 0.10.1", - "bevy_asset 0.10.1", - "bevy_core 0.10.1", - "bevy_ecs 0.10.1", - "bevy_hierarchy 0.10.1", - "bevy_math 0.10.1", - "bevy_reflect 0.10.1", - "bevy_time 0.10.1", - "bevy_transform 0.10.1", - "bevy_utils 0.10.1", + "bevy_app 0.11.0", + "bevy_asset 0.11.0", + "bevy_core 0.11.0", + "bevy_ecs 0.11.0", + "bevy_hierarchy 0.11.0", + "bevy_math 0.11.0", + "bevy_reflect 0.11.0", + "bevy_render 0.11.0", + "bevy_time 0.11.0", + "bevy_transform 0.11.0", + "bevy_utils 0.11.0", ] [[package]] @@ -627,7 +628,6 @@ dependencies = [ "downcast-rs", "fastrand 1.9.0", "js-sys", - "notify 5.2.0", "parking_lot 0.12.1", "serde", "thiserror", @@ -655,7 +655,7 @@ dependencies = [ "downcast-rs", "fastrand 1.9.0", "js-sys", - "notify 6.0.1", + "notify", "parking_lot 0.12.1", "serde", "thiserror", @@ -664,25 +664,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "bevy_audio" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42b9f9b87b0d094268ce52bb75ff346ae0054573f7acc5d66bf032e2c88f748d" -dependencies = [ - "anyhow", - "bevy_app 0.10.1", - "bevy_asset 0.10.1", - "bevy_ecs 0.10.1", - "bevy_math 0.10.1", - "bevy_reflect 0.10.1", - "bevy_transform 0.10.1", - "bevy_utils 0.10.1", - "oboe", - "parking_lot 0.12.1", - "rodio", -] - [[package]] name = "bevy_audio" version = "0.11.0" @@ -698,6 +679,7 @@ dependencies = [ "bevy_reflect 0.11.0", "bevy_transform 0.11.0", "bevy_utils 0.11.0", + "oboe", "parking_lot 0.12.1", "rodio", ] @@ -978,15 +960,18 @@ dependencies = [ [[package]] name = "bevy_gilrs" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f32eb07e8c9ea4be7195ccec10d8f9ad70200f3ae2e13adc4b84df9f50bb1c6" +checksum = "b877a371caa64edd6ec5d66b47c67b9e9e9acff2f3bcc51e31e175463e89f6ba" dependencies = [ - "bevy_app 0.10.1", - "bevy_ecs 0.10.1", - "bevy_input 0.10.1", - "bevy_utils 0.10.1", + "bevy_app 0.11.0", + "bevy_ecs 0.11.0", + "bevy_input 0.11.0", + "bevy_log 0.11.0", + "bevy_time 0.11.0", + "bevy_utils 0.11.0", "gilrs", + "thiserror", ] [[package]] @@ -1009,35 +994,6 @@ dependencies = [ "bevy_utils 0.11.0", ] -[[package]] -name = "bevy_gltf" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2707632208617c3660ea7a1d2ef2ccc84b59f217c2f01a1d0abe81db4ae7bbde" -dependencies = [ - "anyhow", - "base64 0.13.1", - "bevy_animation", - "bevy_app 0.10.1", - "bevy_asset 0.10.1", - "bevy_core 0.10.1", - "bevy_core_pipeline 0.10.1", - "bevy_ecs 0.10.1", - "bevy_hierarchy 0.10.1", - "bevy_log 0.10.1", - "bevy_math 0.10.1", - "bevy_pbr 0.10.1", - "bevy_reflect 0.10.1", - "bevy_render 0.10.1", - "bevy_scene 0.10.1", - "bevy_tasks 0.10.1", - "bevy_transform 0.10.1", - "bevy_utils 0.10.1", - "gltf", - "percent-encoding", - "thiserror", -] - [[package]] name = "bevy_gltf" version = "0.11.0" @@ -1046,6 +1002,7 @@ checksum = "f09b699698a2f5843ef63064010a5e7783403f99a697a04f41a2f8141cb4245d" dependencies = [ "anyhow", "base64 0.13.1", + "bevy_animation", "bevy_app 0.11.0", "bevy_asset 0.11.0", "bevy_core 0.11.0", @@ -1134,17 +1091,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "862b11931c5874cb00778ffb715fc526ee49e52a493d3bcf50e8010f301858b3" dependencies = [ "bevy_a11y 0.10.1", - "bevy_animation", "bevy_app 0.10.1", "bevy_asset 0.10.1", - "bevy_audio 0.10.1", "bevy_core 0.10.1", "bevy_core_pipeline 0.10.1", "bevy_derive 0.10.1", "bevy_diagnostic 0.10.1", "bevy_ecs 0.10.1", - "bevy_gilrs", - "bevy_gltf 0.10.1", "bevy_hierarchy 0.10.1", "bevy_input 0.10.1", "bevy_log 0.10.1", @@ -1172,16 +1125,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f232e7bd2566abd05656789e3c6278a5ca2a24f1232dff525e5b0233a99a610" dependencies = [ "bevy_a11y 0.11.0", + "bevy_animation", "bevy_app 0.11.0", "bevy_asset 0.11.0", - "bevy_audio 0.11.0", + "bevy_audio", "bevy_core 0.11.0", "bevy_core_pipeline 0.11.0", "bevy_derive 0.11.0", "bevy_diagnostic 0.11.0", "bevy_ecs 0.11.0", + "bevy_gilrs", "bevy_gizmos", - "bevy_gltf 0.11.0", + "bevy_gltf", "bevy_hierarchy 0.11.0", "bevy_input 0.11.0", "bevy_log 0.11.0", @@ -1468,12 +1423,10 @@ dependencies = [ "futures-lite", "hexasphere 8.1.0", "image", - "ktx2", "naga 0.11.1", "once_cell", "parking_lot 0.12.1", "regex", - "ruzstd", "serde", "smallvec", "thiserror", @@ -1516,10 +1469,12 @@ dependencies = [ "hexasphere 9.1.0", "image", "js-sys", + "ktx2", "naga 0.12.3", "naga_oil", "parking_lot 0.12.1", "regex", + "ruzstd", "serde", "smallvec", "thiserror", @@ -1650,11 +1605,11 @@ dependencies = [ [[package]] name = "bevy_sprite3d" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f873dd5be1022006f78f57cefb939e5f6bd106fda335da6170abb974e20ce28" +checksum = "11776a0721936f8b88e1d3ddacbbb1fa4da0c4c2412164bee03f1b0c49586536" dependencies = [ - "bevy 0.10.1", + "bevy 0.11.0", ] [[package]] @@ -4888,24 +4843,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "notify" -version = "5.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729f63e1ca555a43fe3efa4f3efdf4801c479da85b432242a7b726f353c88486" -dependencies = [ - "bitflags 1.3.2", - "crossbeam-channel", - "filetime", - "fsevent-sys", - "inotify", - "kqueue", - "libc", - "mio", - "walkdir", - "windows-sys 0.45.0", -] - [[package]] name = "notify" version = "6.0.1" @@ -5890,11 +5827,12 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ruzstd" -version = "0.2.4" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cada0ef59efa6a5f4dc5e491f93d9f31e3fc7758df421ff1de8a706338e1100" +checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc" dependencies = [ "byteorder", + "thiserror-core", "twox-hash", ] @@ -6443,6 +6381,26 @@ dependencies = [ "thiserror-impl", ] +[[package]] +name = "thiserror-core" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d97345f6437bb2004cd58819d8a9ef8e36cdd7661c2abc4bbde0a7c40d9f497" +dependencies = [ + "thiserror-core-impl", +] + +[[package]] +name = "thiserror-core-impl" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10ac1c5050e43014d16b2f94d0d2ce79e65ffdd8b38d8048f9c8f6a8a6da62ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "thiserror-impl" version = "1.0.44" diff --git a/crates/example_dialogue_view/src/setup.rs b/crates/example_dialogue_view/src/setup.rs index 46c5871e..5ae8ae46 100644 --- a/crates/example_dialogue_view/src/setup.rs +++ b/crates/example_dialogue_view/src/setup.rs @@ -32,7 +32,7 @@ fn setup(mut commands: Commands) { fmt_name("root"), NodeBundle { style: Style { - size: Size::width(Val::Percent(100.0)), + width: Val::Percent(100.0), justify_content: JustifyContent::FlexEnd, align_items: AlignItems::Center, margin: UiRect::bottom(Val::Px(30.0)), @@ -68,7 +68,7 @@ fn setup(mut commands: Commands) { ..default() }, style: Style { - size: Size::width(Val::Px(DIALOG_WIDTH)), + width: Val::Px(DIALOG_WIDTH), ..default() }, ..default() @@ -102,8 +102,8 @@ fn setup(mut commands: Commands) { fmt_name("dialogue"), NodeBundle { style: Style { - size: Size::width(Val::Px(DIALOG_WIDTH)), - min_size: Size::height(Val::Px(50.0)), + width: Val::Px(DIALOG_WIDTH), + max_height: Val::Px(50.0), flex_direction: FlexDirection::Column, justify_content: JustifyContent::SpaceAround, align_items: AlignItems::FlexStart, @@ -168,7 +168,7 @@ fn setup(mut commands: Commands) { ..default() }, style: Style { - size: Size::width(Val::Px(DIALOG_WIDTH)), + width: Val::Px(DIALOG_WIDTH), ..default() }, ..default() diff --git a/demo/Cargo.toml b/demo/Cargo.toml index 41916da7..e0f9b674 100644 --- a/demo/Cargo.toml +++ b/demo/Cargo.toml @@ -11,7 +11,7 @@ editor = ["bevy_editor_pls"] [dependencies] bevy_yarn_slinger = { path = "../crates/bevy_plugin" } bevy_yarn_slinger_example_dialogue_view = { path = "../crates/example_dialogue_view" } -bevy_sprite3d = "=2.4.0" +bevy_sprite3d = "2.5" bevy_editor_pls = { version = "0.4", optional = true } [dependencies.bevy] From 7bf96f515f81f42af9a01f899c90351c894f8b73 Mon Sep 17 00:00:00 2001 From: Tim Jentzsch Date: Thu, 3 Aug 2023 19:45:39 +0200 Subject: [PATCH 12/24] Fix additional compile errors from Bevy 0.11 --- crates/example_dialogue_view/src/setup.rs | 21 ++++++------------- .../example_dialogue_view/src/typewriter.rs | 2 +- crates/example_dialogue_view/src/updating.rs | 2 +- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/crates/example_dialogue_view/src/setup.rs b/crates/example_dialogue_view/src/setup.rs index 5ae8ae46..6dc818a2 100644 --- a/crates/example_dialogue_view/src/setup.rs +++ b/crates/example_dialogue_view/src/setup.rs @@ -4,7 +4,7 @@ use bevy::prelude::*; use bevy_yarn_slinger::prelude::*; pub(crate) fn ui_setup_plugin(app: &mut App) { - app.add_systems(Update, setup.on_startup()); + app.add_systems(Startup, setup); } #[derive(Debug, Default, Component)] @@ -82,11 +82,8 @@ fn setup(mut commands: Commands) { text: Text::from_section(String::new(), text_style::name()), style: Style { position_type: PositionType::Absolute, - position: UiRect { - left: Val::Px(TEXT_BORDER / 2.0), - top: Val::Px(-8.0), - ..default() - }, + left: Val::Px(TEXT_BORDER / 2.0), + top: Val::Px(-8.0), ..default() }, z_index: ZIndex::Local(1), @@ -186,7 +183,7 @@ fn setup(mut commands: Commands) { }, style: Style { position_type: PositionType::Absolute, - position: UiRect::bottom(Val::Px(INITIAL_DIALOGUE_CONTINUE_BOTTOM)), + bottom: Val::Px(INITIAL_DIALOGUE_CONTINUE_BOTTOM), ..default() }, z_index: ZIndex::Local(1), @@ -270,10 +267,7 @@ mod style { use super::*; pub(crate) fn standard() -> Style { Style { - max_size: Size { - width: Val::Px(DIALOG_WIDTH - 2.0 * TEXT_BORDER), - height: Val::Undefined, - }, + max_width: Val::Px(DIALOG_WIDTH - 2.0 * TEXT_BORDER), ..default() } } @@ -281,10 +275,7 @@ mod style { const INDENT_MODIFIER: f32 = 1.0; Style { margin: UiRect::horizontal(Val::Px((INDENT_MODIFIER - 1.0) * TEXT_BORDER)), - max_size: Size { - width: Val::Px(DIALOG_WIDTH - 2.0 * INDENT_MODIFIER * TEXT_BORDER), - height: Val::Undefined, - }, + max_width: Val::Px(DIALOG_WIDTH - 2.0 * INDENT_MODIFIER * TEXT_BORDER), ..default() } } diff --git a/crates/example_dialogue_view/src/typewriter.rs b/crates/example_dialogue_view/src/typewriter.rs index 15ef0ac4..42fdc8cb 100644 --- a/crates/example_dialogue_view/src/typewriter.rs +++ b/crates/example_dialogue_view/src/typewriter.rs @@ -163,5 +163,5 @@ fn bob_continue( let mut style = style.single_mut(); let pixels = (time.elapsed_seconds() * 3.0).sin().powi(2) * 5.0 + INITIAL_DIALOGUE_CONTINUE_BOTTOM; - style.position.bottom = Val::Px(pixels); + style.bottom = Val::Px(pixels); } diff --git a/crates/example_dialogue_view/src/updating.rs b/crates/example_dialogue_view/src/updating.rs index 9bc9cb3a..4a0e4d9a 100644 --- a/crates/example_dialogue_view/src/updating.rs +++ b/crates/example_dialogue_view/src/updating.rs @@ -28,7 +28,7 @@ pub(crate) fn ui_updating_plugin(app: &mut App) { /// Signals that a speaker has changed. /// A speaker starts speaking when a new line is presented with a [`PresentLineEvent`] which has a character name. /// A speaker stops speaking when the line is fully displayed on the screen, which happens over the course of a few seconds -#[derive(Debug, Eq, PartialEq, Hash, Reflect)] +#[derive(Debug, Eq, PartialEq, Hash, Reflect, Event)] #[reflect(Debug, PartialEq, Hash)] #[non_exhaustive] pub struct SpeakerChangeEvent { From 9728b72c5b6083f9cc844208c4a356221a3d7b99 Mon Sep 17 00:00:00 2001 From: Tim Jentzsch Date: Sun, 6 Aug 2023 18:18:44 +0200 Subject: [PATCH 13/24] Update remaining 0.3 version of seldom_fn_plugin --- Cargo.lock | 71 +++++++++++-------------- crates/example_dialogue_view/Cargo.toml | 2 +- 2 files changed, 32 insertions(+), 41 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 65bdb74e..3b0f3495 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1948,7 +1948,7 @@ dependencies = [ "bevy 0.11.0", "csv", "rand", - "seldom_fn_plugin 0.4.0", + "seldom_fn_plugin", "serde", "sha2", "tempfile", @@ -1972,7 +1972,7 @@ version = "0.1.0" dependencies = [ "bevy 0.11.0", "bevy_yarn_slinger", - "seldom_fn_plugin 0.3.0", + "seldom_fn_plugin", "unicode-segmentation", ] @@ -2085,7 +2085,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" dependencies = [ "memchr", - "regex-automata 0.3.4", + "regex-automata 0.3.6", "serde", ] @@ -3076,13 +3076,13 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "windows-sys 0.48.0", ] @@ -4376,9 +4376,9 @@ dependencies = [ [[package]] name = "kqueue" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" dependencies = [ "kqueue-sys", "libc", @@ -4386,9 +4386,9 @@ dependencies = [ [[package]] name = "kqueue-sys" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" dependencies = [ "bitflags 1.3.2", "libc", @@ -5125,9 +5125,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" dependencies = [ "bitflags 1.3.2", "cfg-if", @@ -5157,9 +5157,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" dependencies = [ "cc", "libc", @@ -5298,9 +5298,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "2c516611246607d0c04186886dbb3a754368ef82c79e9827a802c6d836dd111c" [[package]] name = "pin-utils" @@ -5419,9 +5419,9 @@ dependencies = [ [[package]] name = "profiling" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332cd62e95873ea4f41f3dfd6bbbfc5b52aec892d7e8d534197c4720a0bbbab2" +checksum = "46b2164ebdb1dfeec5e337be164292351e11daf63a05174c6776b2f47460f0c9" [[package]] name = "prost" @@ -5614,13 +5614,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.4", + "regex-automata 0.3.6", "regex-syntax 0.7.4", ] @@ -5645,9 +5645,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7b6d6190b7594385f61bd3911cd1be99dfddcfc365a4160cc2ab5bff4aed294" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" dependencies = [ "aho-corasick", "memchr", @@ -5808,9 +5808,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.6" +version = "0.38.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee020b1716f0a80e2ace9b03441a749e402e86712f15f16fe8a8f75afac732f" +checksum = "172891ebdceb05aa0005f533a6cbfca599ddd7d966f6f5d4d9b2e70478e70399" dependencies = [ "bitflags 2.3.3", "errno", @@ -5895,15 +5895,6 @@ dependencies = [ "libc", ] -[[package]] -name = "seldom_fn_plugin" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fe39c9c3154c4f55410e499f0fa4473868536a4b281d38d4b7cc775ea5a0182" -dependencies = [ - "bevy 0.10.1", -] - [[package]] name = "seldom_fn_plugin" version = "0.4.0" @@ -5930,9 +5921,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.180" +version = "1.0.182" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed" +checksum = "bdb30a74471f5b7a1fa299f40b4bf1be93af61116df95465b2b5fc419331e430" dependencies = [ "serde_derive", ] @@ -5968,9 +5959,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.180" +version = "1.0.182" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24e744d7782b686ab3b73267ef05697159cc0e5abbed3f47f9933165e5219036" +checksum = "6f4c2c6ea4bc09b5c419012eafcdb0fcef1d9119d626c8f3a0708a5b92d38a70" dependencies = [ "proc-macro2", "quote", @@ -7757,9 +7748,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46aab759304e4d7b2075a9aecba26228bb073ee8c50db796b2c72c676b5d807" +checksum = "acaaa1190073b2b101e15083c38ee8ec891b5e05cbee516521e94ec008f61e64" dependencies = [ "memchr", ] diff --git a/crates/example_dialogue_view/Cargo.toml b/crates/example_dialogue_view/Cargo.toml index 37845a5b..f1ce0d8d 100644 --- a/crates/example_dialogue_view/Cargo.toml +++ b/crates/example_dialogue_view/Cargo.toml @@ -10,7 +10,7 @@ exclude = ["assets", "wasm"] [dependencies] bevy_yarn_slinger = { path = "../bevy_plugin" } unicode-segmentation = "1" -seldom_fn_plugin = "0.3" +seldom_fn_plugin = "0.4" [dependencies.bevy] version = "0.11" From d3fdbf669ffcfb64a8f5e72ed3ee75a6d97352f9 Mon Sep 17 00:00:00 2001 From: Tim Jentzsch Date: Sun, 6 Aug 2023 18:24:21 +0200 Subject: [PATCH 14/24] Adapt Interaction::Clicked to Interaction::Pressed --- crates/example_dialogue_view/src/option_selection.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/example_dialogue_view/src/option_selection.rs b/crates/example_dialogue_view/src/option_selection.rs index f6520299..fc79e174 100644 --- a/crates/example_dialogue_view/src/option_selection.rs +++ b/crates/example_dialogue_view/src/option_selection.rs @@ -100,7 +100,7 @@ fn select_option( let mut window = windows.single_mut(); for (interaction, button, children) in buttons.iter_mut() { let (color, icon) = match *interaction { - Interaction::Clicked if selection.is_none() => { + Interaction::Pressed if selection.is_none() => { selection = Some(button.0); (Color::TOMATO, CursorIcon::Default) } From 7dbfa74b14c9fb004f2a03cb8c7dd66537c3221a Mon Sep 17 00:00:00 2001 From: Tim Jentzsch Date: Sun, 6 Aug 2023 18:29:35 +0200 Subject: [PATCH 15/24] Fix function arguments for internal asset loaders --- crates/example_dialogue_view/src/assets.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/crates/example_dialogue_view/src/assets.rs b/crates/example_dialogue_view/src/assets.rs index 41340039..1d4f53b0 100644 --- a/crates/example_dialogue_view/src/assets.rs +++ b/crates/example_dialogue_view/src/assets.rs @@ -1,3 +1,5 @@ +use std::path::Path; + use bevy::asset::load_internal_binary_asset; use bevy::prelude::*; use bevy::render::texture::{CompressedImageFormats, ImageType}; @@ -22,10 +24,11 @@ pub(crate) fn ui_assets_plugin(app: &mut App) { ); } -fn load_font(bytes: &[u8]) -> Font { +fn load_font(bytes: &[u8], _path: String) -> Font { Font::try_from_bytes(bytes.to_vec()).unwrap() } -fn load_image(bytes: &[u8]) -> Image { + +fn load_image(bytes: &[u8], _path: String) -> Image { const IS_SRGB: bool = true; Image::from_buffer( bytes, From a4b41e67eefd1eb334059480068868c1489730f4 Mon Sep 17 00:00:00 2001 From: Tim Jentzsch Date: Sun, 6 Aug 2023 18:33:17 +0200 Subject: [PATCH 16/24] Fix deprecated function calls --- demo/src/main.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/demo/src/main.rs b/demo/src/main.rs index e8edbe96..500637d8 100644 --- a/demo/src/main.rs +++ b/demo/src/main.rs @@ -2,7 +2,7 @@ #![cfg_attr(not(debug_assertations), windows_subsystem = "windows")] use self::{setup::*, visual_effects::*, yarn_slinger_integration::*}; -use bevy::asset::LoadState; +use bevy::asset::{ChangeWatcher, LoadState}; use bevy::prelude::*; use bevy::scene::SceneInstance; use bevy::window::PresentMode; @@ -23,7 +23,7 @@ fn main() { DefaultPlugins .set(AssetPlugin { #[cfg(not(any(target_arch = "wasm32", target_os = "android")))] - watch_for_changes: true, + watch_for_changes: ChangeWatcher::with_delay(Duration::from_millis(200)), ..default() }) .set(WindowPlugin { @@ -40,20 +40,20 @@ fn main() { ) .insert_resource(ClearColor(Color::CYAN)); #[cfg(feature = "editor")] - app.add_plugin(EditorPlugin::new()); - app.add_plugin( + app.add_plugins(EditorPlugin::new()); + app.add_plugins( YarnSlingerPlugin::with_yarn_source(YarnFileSource::file("dialogue/story.yarn")) .with_localizations(Localizations { base_localization: "en-US".into(), translations: vec!["de-CH".into()], }), ) - .add_plugin(ExampleYarnSlingerDialogueViewPlugin::new()) - .add_plugin(Sprite3dPlugin) + .add_plugins(ExampleYarnSlingerDialogueViewPlugin::new()) + .add_plugins(Sprite3dPlugin) + .add_systems(Startup, setup) .add_systems( Update, ( - setup.on_startup(), spawn_dialogue_runner.run_if(resource_added::()), adapt_materials.run_if(any_with_component::()), spawn_sprites.run_if(sprites_have_loaded), From 63f632eca87786a95b46a774f9837533f857a3d1 Mon Sep 17 00:00:00 2001 From: Tim Jentzsch Date: Sun, 6 Aug 2023 18:34:21 +0200 Subject: [PATCH 17/24] Fix compile errors --- demo/src/main.rs | 2 ++ demo/src/setup.rs | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/demo/src/main.rs b/demo/src/main.rs index 500637d8..b379d026 100644 --- a/demo/src/main.rs +++ b/demo/src/main.rs @@ -1,6 +1,8 @@ // Disable windows console in release builds #![cfg_attr(not(debug_assertations), windows_subsystem = "windows")] +use std::time::Duration; + use self::{setup::*, visual_effects::*, yarn_slinger_integration::*}; use bevy::asset::{ChangeWatcher, LoadState}; use bevy::prelude::*; diff --git a/demo/src/setup.rs b/demo/src/setup.rs index 32bc9d3d..53988cdc 100644 --- a/demo/src/setup.rs +++ b/demo/src/setup.rs @@ -82,7 +82,8 @@ pub(crate) fn setup(mut commands: Commands, asset_server: Res) { background_color: Color::BLACK.into(), z_index: ZIndex::Global(-1), style: Style { - size: Size::new(Val::Percent(100.), Val::Percent(100.)), + width: Val::Percent(100.), + height: Val::Percent(100.), position_type: PositionType::Absolute, ..default() }, From e3ad614c55ce9c8a29e1839202decd229b6b1292 Mon Sep 17 00:00:00 2001 From: Tim Jentzsch Date: Sun, 6 Aug 2023 18:36:45 +0200 Subject: [PATCH 18/24] Replace remaining calls to deprecated functions --- crates/example_dialogue_view/src/assets.rs | 2 -- .../bevy_yarn_slinger/src/bin/access_variables.rs | 6 +++--- examples/bevy_yarn_slinger/src/bin/custom_command.rs | 10 ++++------ .../bevy_yarn_slinger/src/bin/custom_function.rs | 10 ++++------ examples/bevy_yarn_slinger/src/bin/hello_world.rs | 12 +++++------- 5 files changed, 16 insertions(+), 24 deletions(-) diff --git a/crates/example_dialogue_view/src/assets.rs b/crates/example_dialogue_view/src/assets.rs index 1d4f53b0..88f734a4 100644 --- a/crates/example_dialogue_view/src/assets.rs +++ b/crates/example_dialogue_view/src/assets.rs @@ -1,5 +1,3 @@ -use std::path::Path; - use bevy::asset::load_internal_binary_asset; use bevy::prelude::*; use bevy::render::texture::{CompressedImageFormats, ImageType}; diff --git a/examples/bevy_yarn_slinger/src/bin/access_variables.rs b/examples/bevy_yarn_slinger/src/bin/access_variables.rs index 0cdd33e2..98b59b45 100644 --- a/examples/bevy_yarn_slinger/src/bin/access_variables.rs +++ b/examples/bevy_yarn_slinger/src/bin/access_variables.rs @@ -6,12 +6,12 @@ use bevy_yarn_slinger_example_dialogue_view::prelude::*; fn main() { let mut app = App::new(); app.add_plugins(DefaultPlugins) - .add_plugin(YarnSlingerPlugin::new()) - .add_plugin(ExampleYarnSlingerDialogueViewPlugin::new()) + .add_plugins(YarnSlingerPlugin::new()) + .add_plugins(ExampleYarnSlingerDialogueViewPlugin::new()) + .add_systems(Startup, setup_camera) .add_systems( Update, ( - setup_camera.on_startup(), spawn_dialogue_runner.run_if(resource_added::()), print_yarn_variable.run_if(any_with_component::()), ), diff --git a/examples/bevy_yarn_slinger/src/bin/custom_command.rs b/examples/bevy_yarn_slinger/src/bin/custom_command.rs index 6746278d..09bd6c86 100644 --- a/examples/bevy_yarn_slinger/src/bin/custom_command.rs +++ b/examples/bevy_yarn_slinger/src/bin/custom_command.rs @@ -6,14 +6,12 @@ use bevy_yarn_slinger_example_dialogue_view::prelude::*; fn main() { let mut app = App::new(); app.add_plugins(DefaultPlugins) - .add_plugin(YarnSlingerPlugin::new()) - .add_plugin(ExampleYarnSlingerDialogueViewPlugin::new()) + .add_plugins(YarnSlingerPlugin::new()) + .add_plugins(ExampleYarnSlingerDialogueViewPlugin::new()) + .add_systems(Startup, setup_camera) .add_systems( Update, - ( - setup_camera.on_startup(), - spawn_dialogue_runner.run_if(resource_added::()), - ), + spawn_dialogue_runner.run_if(resource_added::()), ) .run(); } diff --git a/examples/bevy_yarn_slinger/src/bin/custom_function.rs b/examples/bevy_yarn_slinger/src/bin/custom_function.rs index daa49531..371ce2e7 100644 --- a/examples/bevy_yarn_slinger/src/bin/custom_function.rs +++ b/examples/bevy_yarn_slinger/src/bin/custom_function.rs @@ -6,14 +6,12 @@ use bevy_yarn_slinger_example_dialogue_view::prelude::*; fn main() { let mut app = App::new(); app.add_plugins(DefaultPlugins) - .add_plugin(YarnSlingerPlugin::new()) - .add_plugin(ExampleYarnSlingerDialogueViewPlugin::new()) + .add_plugins(YarnSlingerPlugin::new()) + .add_plugins(ExampleYarnSlingerDialogueViewPlugin::new()) + .add_systems(Startup, setup_camera) .add_systems( Update, - ( - setup_camera.on_startup(), - spawn_dialogue_runner.run_if(resource_added::()), - ), + spawn_dialogue_runner.run_if(resource_added::()), ) .run(); } diff --git a/examples/bevy_yarn_slinger/src/bin/hello_world.rs b/examples/bevy_yarn_slinger/src/bin/hello_world.rs index 90eb206f..8bd1650d 100644 --- a/examples/bevy_yarn_slinger/src/bin/hello_world.rs +++ b/examples/bevy_yarn_slinger/src/bin/hello_world.rs @@ -8,16 +8,14 @@ fn main() { // Register the Yarn Slinger plugin using its default settings, which will look for Yarn files in the "dialogue" folder. // If this app should support Wasm or Android, we cannot load files without specifying them, so use the following instead. // .add_plugin(YarnSlingerPlugin::with_yarn_source(YarnFileSource::file("dialogue/hello_world.yarn"))) - .add_plugin(YarnSlingerPlugin::new()) + .add_plugins(YarnSlingerPlugin::new()) // Initialize the bundled example UI - .add_plugin(ExampleYarnSlingerDialogueViewPlugin::new()) + .add_plugins(ExampleYarnSlingerDialogueViewPlugin::new()) + .add_systems(Startup, setup_camera) .add_systems( Update, - ( - setup_camera.on_startup(), - // Spawn the dialogue runner once the Yarn project has finished compiling - spawn_dialogue_runner.run_if(resource_added::()), - ), + // Spawn the dialogue runner once the Yarn project has finished compiling + spawn_dialogue_runner.run_if(resource_added::()), ) .run(); } From 0a6ebb118627913a5dc957b6c3f9ac1d4277a947 Mon Sep 17 00:00:00 2001 From: Tim Jentzsch Date: Sun, 6 Aug 2023 18:37:55 +0200 Subject: [PATCH 19/24] Fix clippy warning --- .../attribute_marker_processor/no_markup_text_processor.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/runtime/src/markup/attribute_marker_processor/no_markup_text_processor.rs b/crates/runtime/src/markup/attribute_marker_processor/no_markup_text_processor.rs index 41755d4c..89b3c7eb 100644 --- a/crates/runtime/src/markup/attribute_marker_processor/no_markup_text_processor.rs +++ b/crates/runtime/src/markup/attribute_marker_processor/no_markup_text_processor.rs @@ -11,7 +11,7 @@ pub(crate) struct NoMarkupTextProcessor; impl NoMarkupTextProcessor { pub(crate) fn new() -> Self { - Self::default() + Self } } From 3731854573c37e0005d3ead3f8194b30f54b3878 Mon Sep 17 00:00:00 2001 From: Tim Jentzsch Date: Sun, 6 Aug 2023 18:56:59 +0200 Subject: [PATCH 20/24] Use git dependency for bevy_editor_pls temporarily Currently there is no bevy v0.11 compatible release available --- Cargo.lock | 1609 +++++++++++------------------------------------ demo/Cargo.toml | 3 +- 2 files changed, 354 insertions(+), 1258 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3b0f3495..143c7f9a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -18,46 +18,19 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" -[[package]] -name = "accesskit" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "704d532b1cd3d912bb37499c55a81ac748cc1afa737eedd100ba441acdd47d38" - [[package]] name = "accesskit" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d77020650e30e570cff04a3650872b9be650b79de494005da13809574a0d1fdb" -[[package]] -name = "accesskit_consumer" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ba8b23cfca3944012ee2e5c71c02077a400e034c720eed6bd927cb6b4d1fd9" -dependencies = [ - "accesskit 0.10.1", -] - [[package]] name = "accesskit_consumer" version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14346d6d9b9e88d03f42f21453977946dac425b3e962476931e1da8a959817b3" dependencies = [ - "accesskit 0.11.1", -] - -[[package]] -name = "accesskit_macos" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58d062544d6cc36f4213323b7cb3a0d74ddff4b0d2311ab5e7596f4278bb2cc9" -dependencies = [ - "accesskit 0.10.1", - "accesskit_consumer 0.14.1", - "objc2", - "once_cell", + "accesskit", ] [[package]] @@ -66,61 +39,35 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfa2fdecd5a520958deb7fd3614c2b6500d808a3acfc6ddd52211bf57ba8d6bc" dependencies = [ - "accesskit 0.11.1", - "accesskit_consumer 0.15.1", + "accesskit", + "accesskit_consumer", "objc2", "once_cell", ] -[[package]] -name = "accesskit_windows" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf5b3c3828397ee832ba4a72fb1a4ace10f781e31885f774cbd531014059115" -dependencies = [ - "accesskit 0.10.1", - "accesskit_consumer 0.14.1", - "arrayvec", - "once_cell", - "paste", - "windows 0.44.0", -] - [[package]] name = "accesskit_windows" version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a4ab2fad3575f5c77f21cddeaa0e156db6ce35f8f3522f7c69e0ac51e7bd0f4" dependencies = [ - "accesskit 0.11.1", - "accesskit_consumer 0.15.1", + "accesskit", + "accesskit_consumer", "arrayvec", "once_cell", "paste", "windows 0.44.0", ] -[[package]] -name = "accesskit_winit" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbcb615217efc79c4bed3094c4ca76c4bc554751d1da16f3ed4ba0459b1e8f31" -dependencies = [ - "accesskit 0.10.1", - "accesskit_macos 0.6.2", - "accesskit_windows 0.13.2", - "winit", -] - [[package]] name = "accesskit_winit" version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "badc92d61313d1e495edb0f1b3ec0fe6e337e1ea1e868bc1d02b9c245d46da5d" dependencies = [ - "accesskit 0.11.1", - "accesskit_macos 0.8.0", - "accesskit_windows 0.14.1", + "accesskit", + "accesskit_macos", + "accesskit_windows", "winit", ] @@ -234,12 +181,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" -[[package]] -name = "android_log-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e" - [[package]] name = "android_log-sys" version = "0.3.1" @@ -478,45 +419,36 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1795ebc740ea791ffbe6685e0688ab1effec16c2864e0476db40bfdf0c02cb3d" -[[package]] -name = "bevy" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93f906133305915d63f04108e6873c1b93a6605fe374b8f3391f6bda093e396" -dependencies = [ - "bevy_internal 0.10.1", -] - [[package]] name = "bevy" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04a90fe8e9c03fa2d30acf39a5178a48526df00c1ccea2fc43fa6d9ca4d8a168" dependencies = [ - "bevy_internal 0.11.0", + "bevy_internal", ] [[package]] name = "bevy-inspector-egui" -version = "0.18.3" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bda61dd72f879e8d4b0f57e94b86bd163bf558ac2e7ddea9ea075a47bdcd9af" +checksum = "fd2523be5ae7d482e5435dc75509b80a320989175768fb4b711603b9d2ab8fff" dependencies = [ "bevy-inspector-egui-derive", - "bevy_app 0.10.1", - "bevy_asset 0.10.1", - "bevy_core 0.10.1", - "bevy_core_pipeline 0.10.1", - "bevy_ecs 0.10.1", + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_core_pipeline", + "bevy_ecs", "bevy_egui", - "bevy_hierarchy 0.10.1", - "bevy_log 0.10.1", - "bevy_math 0.10.1", - "bevy_pbr 0.10.1", - "bevy_reflect 0.10.1", - "bevy_render 0.10.1", - "bevy_utils 0.10.1", - "bevy_window 0.10.1", + "bevy_hierarchy", + "bevy_log", + "bevy_math", + "bevy_pbr", + "bevy_reflect", + "bevy_render", + "bevy_utils", + "bevy_window", "egui", "image", "once_cell", @@ -526,37 +458,25 @@ dependencies = [ [[package]] name = "bevy-inspector-egui-derive" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7556c913daacbec7aa213eda82517673bf6c6b25e0d827a56efe17421ebaca35" +checksum = "0edba455601861b8e8b76128ae5d46dd968114edde60f0ac3d2c21535a947548" dependencies = [ "proc-macro2", "quote", "syn 2.0.28", ] -[[package]] -name = "bevy_a11y" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037c4063f7dac1a5d596eb47f40782a04ca5838dc4274dbbadc90eb81efe5169" -dependencies = [ - "accesskit 0.10.1", - "bevy_app 0.10.1", - "bevy_derive 0.10.1", - "bevy_ecs 0.10.1", -] - [[package]] name = "bevy_a11y" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f758f437d9d862bf10a8e3a0f76b426095c19a87d118c945dcb935358d856076" dependencies = [ - "accesskit 0.11.1", - "bevy_app 0.11.0", - "bevy_derive 0.11.0", - "bevy_ecs 0.11.0", + "accesskit", + "bevy_app", + "bevy_derive", + "bevy_ecs", ] [[package]] @@ -565,32 +485,17 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d130cb8b7e2b81304591c5c8e511accd2df58b8d8185ab4836ed2f377e6a61f" dependencies = [ - "bevy_app 0.11.0", - "bevy_asset 0.11.0", - "bevy_core 0.11.0", - "bevy_ecs 0.11.0", - "bevy_hierarchy 0.11.0", - "bevy_math 0.11.0", - "bevy_reflect 0.11.0", - "bevy_render 0.11.0", - "bevy_time 0.11.0", - "bevy_transform 0.11.0", - "bevy_utils 0.11.0", -] - -[[package]] -name = "bevy_app" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01db46963eb9486f7884121527ec69751d0e448f9e1d5329e80ea3424118a31a" -dependencies = [ - "bevy_derive 0.10.1", - "bevy_ecs 0.10.1", - "bevy_reflect 0.10.1", - "bevy_utils 0.10.1", - "downcast-rs", - "wasm-bindgen", - "web-sys", + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_ecs", + "bevy_hierarchy", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_time", + "bevy_transform", + "bevy_utils", ] [[package]] @@ -599,40 +504,13 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1817e8d5b1146ea9e7730a7264d3470394840e0754d15abded26473f867967a0" dependencies = [ - "bevy_derive 0.11.0", - "bevy_ecs 0.11.0", - "bevy_reflect 0.11.0", - "bevy_tasks 0.11.0", - "bevy_utils 0.11.0", - "downcast-rs", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "bevy_asset" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98609b4b0694a23bde0628aed626644967991f167aad9db2afb68dacb0017540" -dependencies = [ - "anyhow", - "bevy_app 0.10.1", - "bevy_diagnostic 0.10.1", - "bevy_ecs 0.10.1", - "bevy_log 0.10.1", - "bevy_reflect 0.10.1", - "bevy_tasks 0.10.1", - "bevy_utils 0.10.1", - "bevy_winit 0.10.1", - "crossbeam-channel", + "bevy_derive", + "bevy_ecs", + "bevy_reflect", + "bevy_tasks", + "bevy_utils", "downcast-rs", - "fastrand 1.9.0", - "js-sys", - "parking_lot 0.12.1", - "serde", - "thiserror", "wasm-bindgen", - "wasm-bindgen-futures", "web-sys", ] @@ -643,14 +521,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e12f951d4af2ad4ad230cd7bcb05248149c415eec17c34bf26731c4cd8b897f" dependencies = [ "anyhow", - "bevy_app 0.11.0", - "bevy_diagnostic 0.11.0", - "bevy_ecs 0.11.0", - "bevy_log 0.11.0", - "bevy_reflect 0.11.0", - "bevy_tasks 0.11.0", - "bevy_utils 0.11.0", - "bevy_winit 0.11.0", + "bevy_app", + "bevy_diagnostic", + "bevy_ecs", + "bevy_log", + "bevy_reflect", + "bevy_tasks", + "bevy_utils", + "bevy_winit", "crossbeam-channel", "downcast-rs", "fastrand 1.9.0", @@ -671,161 +549,80 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6bade3f5389f9463e150af874aebe672b5101df4268d28b0109a66f9cdce56e" dependencies = [ "anyhow", - "bevy_app 0.11.0", - "bevy_asset 0.11.0", - "bevy_derive 0.11.0", - "bevy_ecs 0.11.0", - "bevy_math 0.11.0", - "bevy_reflect 0.11.0", - "bevy_transform 0.11.0", - "bevy_utils 0.11.0", + "bevy_app", + "bevy_asset", + "bevy_derive", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_transform", + "bevy_utils", "oboe", "parking_lot 0.12.1", "rodio", ] -[[package]] -name = "bevy_core" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee53d7b4691b57207d72e996992c995a53f3e8d21ca7151ca3956d9ce7d232e" -dependencies = [ - "bevy_app 0.10.1", - "bevy_ecs 0.10.1", - "bevy_math 0.10.1", - "bevy_reflect 0.10.1", - "bevy_tasks 0.10.1", - "bevy_utils 0.10.1", - "bytemuck", -] - [[package]] name = "bevy_core" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "263b6a943ecba176c8390a1100615021f61a3b2d7a87e8eecf4009b6ed4457e0" dependencies = [ - "bevy_app 0.11.0", - "bevy_ecs 0.11.0", - "bevy_math 0.11.0", - "bevy_reflect 0.11.0", - "bevy_tasks 0.11.0", - "bevy_utils 0.11.0", + "bevy_app", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_tasks", + "bevy_utils", "bytemuck", "serde", ] -[[package]] -name = "bevy_core_pipeline" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "093ae5ced77251602ad6e43521e2acc1a5570bf85b80f232f1a7fdd43b50f8d8" -dependencies = [ - "bevy_app 0.10.1", - "bevy_asset 0.10.1", - "bevy_derive 0.10.1", - "bevy_ecs 0.10.1", - "bevy_math 0.10.1", - "bevy_reflect 0.10.1", - "bevy_render 0.10.1", - "bevy_transform 0.10.1", - "bevy_utils 0.10.1", - "bitflags 1.3.2", - "radsort", - "serde", -] - [[package]] name = "bevy_core_pipeline" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50c70113b5c4106855b888f96d8574697eb9082713f976c9b6487c1f5ab28589" dependencies = [ - "bevy_app 0.11.0", - "bevy_asset 0.11.0", - "bevy_core 0.11.0", - "bevy_derive 0.11.0", - "bevy_ecs 0.11.0", - "bevy_math 0.11.0", - "bevy_reflect 0.11.0", - "bevy_render 0.11.0", - "bevy_transform 0.11.0", - "bevy_utils 0.11.0", + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_derive", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", "bitflags 2.3.3", "radsort", "serde", ] -[[package]] -name = "bevy_derive" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff0add5ab4a6b2b7e86e18f9043bb48b6386faa3b56abaa0ed97a3d669a1992" -dependencies = [ - "bevy_macro_utils 0.10.1", - "quote", - "syn 1.0.109", -] - [[package]] name = "bevy_derive" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1477347b17df781756ba0dfd677e2975e57e930752cd3cd42e6cdd8fdaa3223" dependencies = [ - "bevy_macro_utils 0.11.0", + "bevy_macro_utils", "quote", "syn 2.0.28", ] -[[package]] -name = "bevy_diagnostic" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c778422643b0adee9e82abbd07e1e906eb9947c274a9b18e0f7fbf137d4c34" -dependencies = [ - "bevy_app 0.10.1", - "bevy_core 0.10.1", - "bevy_ecs 0.10.1", - "bevy_log 0.10.1", - "bevy_time 0.10.1", - "bevy_utils 0.10.1", - "sysinfo 0.28.4", -] - [[package]] name = "bevy_diagnostic" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37a594f970c261007cdd3edeccd61651c2cb4513de3d0b8b35d93f5d9c32c059" dependencies = [ - "bevy_app 0.11.0", - "bevy_core 0.11.0", - "bevy_ecs 0.11.0", - "bevy_log 0.11.0", - "bevy_time 0.11.0", - "bevy_utils 0.11.0", - "sysinfo 0.29.7", -] - -[[package]] -name = "bevy_ecs" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bed2f74687ccf13046c0f8e3b00dc61d7e656877b4a1380cf04635bb74d8e586" -dependencies = [ - "async-channel", - "bevy_ecs_macros 0.10.1", - "bevy_ptr 0.10.1", - "bevy_reflect 0.10.1", - "bevy_tasks 0.10.1", - "bevy_utils 0.10.1", - "downcast-rs", - "event-listener", - "fixedbitset", - "rustc-hash", - "serde", - "thread_local", + "bevy_app", + "bevy_core", + "bevy_ecs", + "bevy_log", + "bevy_time", + "bevy_utils", + "sysinfo", ] [[package]] @@ -835,11 +632,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "032c81ba7d919c1004b0abc33cc6c588c8f896a4d7c55a7c7aa1e46382242f43" dependencies = [ "async-channel", - "bevy_ecs_macros 0.11.0", - "bevy_ptr 0.11.0", - "bevy_reflect 0.11.0", - "bevy_tasks 0.11.0", - "bevy_utils 0.11.0", + "bevy_ecs_macros", + "bevy_ptr", + "bevy_reflect", + "bevy_tasks", + "bevy_utils", "downcast-rs", "event-listener", "fixedbitset", @@ -849,25 +646,13 @@ dependencies = [ "thread_local", ] -[[package]] -name = "bevy_ecs_macros" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97fd126a0db7b30fb1833614b3a657b44ac88485741c33b2780e25de0f96d78" -dependencies = [ - "bevy_macro_utils 0.10.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "bevy_ecs_macros" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a15ff7fcafdb8fe464ddd300b4860a76d5c6f9d684472e4bf21852d6f0ff3991" dependencies = [ - "bevy_macro_utils 0.11.0", + "bevy_macro_utils", "proc-macro2", "quote", "syn 2.0.28", @@ -876,13 +661,11 @@ dependencies = [ [[package]] name = "bevy_editor_pls" version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6750134dae54c3799ecf6130d6590a33751fabd021d4b94300ae3da856dceff" +source = "git+https://github.com/jakobhellermann/bevy_editor_pls?rev=f72483a#f72483a5d48ae61f01e05fbd3cfd6fc64ce54e34" dependencies = [ - "bevy 0.10.1", + "bevy", "bevy_editor_pls_core", "bevy_editor_pls_default_windows", - "bevy_framepace", "egui", "egui-gizmo", ] @@ -890,72 +673,50 @@ dependencies = [ [[package]] name = "bevy_editor_pls_core" version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b460290aaf413da0668569e904da974f33ae8fecd11d9d14a36043fa2c44e000" +source = "git+https://github.com/jakobhellermann/bevy_editor_pls?rev=f72483a#f72483a5d48ae61f01e05fbd3cfd6fc64ce54e34" dependencies = [ - "bevy 0.10.1", + "bevy", "bevy-inspector-egui", "egui_dock", - "indexmap 1.9.3", + "indexmap 2.0.0", ] [[package]] name = "bevy_editor_pls_default_windows" version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d7d2fe16e2bd47f6b8e5bab2d7d8da4975616e28b041cba658283cf1c66ba1f" +source = "git+https://github.com/jakobhellermann/bevy_editor_pls?rev=f72483a#f72483a5d48ae61f01e05fbd3cfd6fc64ce54e34" dependencies = [ - "bevy 0.10.1", + "bevy", "bevy-inspector-egui", "bevy_editor_pls_core", "bevy_mod_debugdump", "egui-gizmo", - "indexmap 1.9.3", + "indexmap 2.0.0", "opener", "pretty-type-name", ] [[package]] name = "bevy_egui" -version = "0.20.3" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5e269226c4a8fb659aa3161c19925650ebe2c23021ddf4dd9ed191cf708364f" +checksum = "1a73a93a8cf6b8c744281d1b88f5b0fa278d608e909af9bbf4eb491a7cb1ad2c" dependencies = [ "arboard", - "bevy 0.10.1", + "bevy", "egui", "thread_local", "webbrowser", ] -[[package]] -name = "bevy_encase_derive" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c086ebdc1f5522787d63772943277cc74a279445fb65db4d58c2c5330654648e" -dependencies = [ - "bevy_macro_utils 0.10.1", - "encase_derive_impl 0.5.0", -] - [[package]] name = "bevy_encase_derive" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bdf808dbdc68a0c519e09026c627bda85250205a40ac02794866bff254d6b56" dependencies = [ - "bevy_macro_utils 0.11.0", - "encase_derive_impl 0.6.1", -] - -[[package]] -name = "bevy_framepace" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1825c5a485aa2a2ffd91cc1faa1f4d621c804a893ead88cafedbe1ed6c51d34" -dependencies = [ - "bevy 0.10.1", - "spin_sleep", + "bevy_macro_utils", + "encase_derive_impl", ] [[package]] @@ -964,12 +725,12 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b877a371caa64edd6ec5d66b47c67b9e9e9acff2f3bcc51e31e175463e89f6ba" dependencies = [ - "bevy_app 0.11.0", - "bevy_ecs 0.11.0", - "bevy_input 0.11.0", - "bevy_log 0.11.0", - "bevy_time 0.11.0", - "bevy_utils 0.11.0", + "bevy_app", + "bevy_ecs", + "bevy_input", + "bevy_log", + "bevy_time", + "bevy_utils", "gilrs", "thiserror", ] @@ -980,18 +741,18 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7938b43b4bdf9d039b7d3b310f871ed5ffa5a185e861a9c85731c40182019f8d" dependencies = [ - "bevy_app 0.11.0", - "bevy_asset 0.11.0", - "bevy_core 0.11.0", - "bevy_core_pipeline 0.11.0", - "bevy_ecs 0.11.0", - "bevy_math 0.11.0", - "bevy_pbr 0.11.0", - "bevy_reflect 0.11.0", - "bevy_render 0.11.0", - "bevy_sprite 0.11.0", - "bevy_transform 0.11.0", - "bevy_utils 0.11.0", + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_core_pipeline", + "bevy_ecs", + "bevy_math", + "bevy_pbr", + "bevy_reflect", + "bevy_render", + "bevy_sprite", + "bevy_transform", + "bevy_utils", ] [[package]] @@ -1003,21 +764,21 @@ dependencies = [ "anyhow", "base64 0.13.1", "bevy_animation", - "bevy_app 0.11.0", - "bevy_asset 0.11.0", - "bevy_core 0.11.0", - "bevy_core_pipeline 0.11.0", - "bevy_ecs 0.11.0", - "bevy_hierarchy 0.11.0", - "bevy_log 0.11.0", - "bevy_math 0.11.0", - "bevy_pbr 0.11.0", - "bevy_reflect 0.11.0", - "bevy_render 0.11.0", - "bevy_scene 0.11.0", - "bevy_tasks 0.11.0", - "bevy_transform 0.11.0", - "bevy_utils 0.11.0", + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_core_pipeline", + "bevy_ecs", + "bevy_hierarchy", + "bevy_log", + "bevy_math", + "bevy_pbr", + "bevy_reflect", + "bevy_render", + "bevy_scene", + "bevy_tasks", + "bevy_transform", + "bevy_utils", "gltf", "percent-encoding", "serde", @@ -1025,152 +786,73 @@ dependencies = [ "thiserror", ] -[[package]] -name = "bevy_hierarchy" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d04099865a13d1fd8bf3c044a80148cb3d23bfe8c3d5f082dda2ce091d85532" -dependencies = [ - "bevy_app 0.10.1", - "bevy_core 0.10.1", - "bevy_ecs 0.10.1", - "bevy_log 0.10.1", - "bevy_reflect 0.10.1", - "bevy_utils 0.10.1", - "smallvec", -] - [[package]] name = "bevy_hierarchy" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba41e1bb0c367b31e59b53ab858de56764c78bee87c121843c1ff033efa0086c" dependencies = [ - "bevy_app 0.11.0", - "bevy_core 0.11.0", - "bevy_ecs 0.11.0", - "bevy_log 0.11.0", - "bevy_reflect 0.11.0", - "bevy_utils 0.11.0", + "bevy_app", + "bevy_core", + "bevy_ecs", + "bevy_log", + "bevy_reflect", + "bevy_utils", "smallvec", ] -[[package]] -name = "bevy_input" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15d40aa636bb656967ac16ca36066ab7a7bb9179e1b0390c5705e54208e8fd7" -dependencies = [ - "bevy_app 0.10.1", - "bevy_ecs 0.10.1", - "bevy_math 0.10.1", - "bevy_reflect 0.10.1", - "bevy_utils 0.10.1", - "thiserror", -] - [[package]] name = "bevy_input" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7221091c7b219a63a1f3f019512e8b72bed673230b97c3fcbca37ba566b1cffb" dependencies = [ - "bevy_app 0.11.0", - "bevy_ecs 0.11.0", - "bevy_math 0.11.0", - "bevy_reflect 0.11.0", - "bevy_utils 0.11.0", + "bevy_app", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_utils", "serde", "thiserror", ] -[[package]] -name = "bevy_internal" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862b11931c5874cb00778ffb715fc526ee49e52a493d3bcf50e8010f301858b3" -dependencies = [ - "bevy_a11y 0.10.1", - "bevy_app 0.10.1", - "bevy_asset 0.10.1", - "bevy_core 0.10.1", - "bevy_core_pipeline 0.10.1", - "bevy_derive 0.10.1", - "bevy_diagnostic 0.10.1", - "bevy_ecs 0.10.1", - "bevy_hierarchy 0.10.1", - "bevy_input 0.10.1", - "bevy_log 0.10.1", - "bevy_math 0.10.1", - "bevy_pbr 0.10.1", - "bevy_ptr 0.10.1", - "bevy_reflect 0.10.1", - "bevy_render 0.10.1", - "bevy_scene 0.10.1", - "bevy_sprite 0.10.1", - "bevy_tasks 0.10.1", - "bevy_text 0.10.1", - "bevy_time 0.10.1", - "bevy_transform 0.10.1", - "bevy_ui 0.10.1", - "bevy_utils 0.10.1", - "bevy_window 0.10.1", - "bevy_winit 0.10.1", -] - [[package]] name = "bevy_internal" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f232e7bd2566abd05656789e3c6278a5ca2a24f1232dff525e5b0233a99a610" dependencies = [ - "bevy_a11y 0.11.0", + "bevy_a11y", "bevy_animation", - "bevy_app 0.11.0", - "bevy_asset 0.11.0", + "bevy_app", + "bevy_asset", "bevy_audio", - "bevy_core 0.11.0", - "bevy_core_pipeline 0.11.0", - "bevy_derive 0.11.0", - "bevy_diagnostic 0.11.0", - "bevy_ecs 0.11.0", + "bevy_core", + "bevy_core_pipeline", + "bevy_derive", + "bevy_diagnostic", + "bevy_ecs", "bevy_gilrs", "bevy_gizmos", "bevy_gltf", - "bevy_hierarchy 0.11.0", - "bevy_input 0.11.0", - "bevy_log 0.11.0", - "bevy_math 0.11.0", - "bevy_pbr 0.11.0", - "bevy_ptr 0.11.0", - "bevy_reflect 0.11.0", - "bevy_render 0.11.0", - "bevy_scene 0.11.0", - "bevy_sprite 0.11.0", - "bevy_tasks 0.11.0", - "bevy_text 0.11.0", - "bevy_time 0.11.0", - "bevy_transform 0.11.0", - "bevy_ui 0.11.0", - "bevy_utils 0.11.0", - "bevy_window 0.11.0", - "bevy_winit 0.11.0", -] - -[[package]] -name = "bevy_log" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25980c90ceaad34d09a53291e72ca56fcc754a974cd4654fffcf5b68b283b7a7" -dependencies = [ - "android_log-sys 0.2.0", - "bevy_app 0.10.1", - "bevy_ecs 0.10.1", - "bevy_utils 0.10.1", - "console_error_panic_hook", - "tracing-log", - "tracing-subscriber", - "tracing-wasm", + "bevy_hierarchy", + "bevy_input", + "bevy_log", + "bevy_math", + "bevy_pbr", + "bevy_ptr", + "bevy_reflect", + "bevy_render", + "bevy_scene", + "bevy_sprite", + "bevy_tasks", + "bevy_text", + "bevy_time", + "bevy_transform", + "bevy_ui", + "bevy_utils", + "bevy_window", + "bevy_winit", ] [[package]] @@ -1179,27 +861,16 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "487dfd1fc75fada8f3f2f4773addf3fbba53a2a91cb913616e6dc6c26dd62995" dependencies = [ - "android_log-sys 0.3.1", - "bevy_app 0.11.0", - "bevy_ecs 0.11.0", - "bevy_utils 0.11.0", + "android_log-sys", + "bevy_app", + "bevy_ecs", + "bevy_utils", "console_error_panic_hook", "tracing-log", "tracing-subscriber", "tracing-wasm", ] -[[package]] -name = "bevy_macro_utils" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b2fee53b2497cdc3bffff2ddf52afa751242424a5fd0d51d227d4dab081d0d9" -dependencies = [ - "quote", - "syn 1.0.109", - "toml_edit", -] - [[package]] name = "bevy_macro_utils" version = "0.11.0" @@ -1212,149 +883,82 @@ dependencies = [ "toml_edit", ] -[[package]] -name = "bevy_math" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da6a1109d06fe947990db032e719e162414cf9bf7a478dcc52742f1c7136c42a" -dependencies = [ - "glam 0.23.0", - "serde", -] - [[package]] name = "bevy_math" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25088c6598fe0b8ded992c781dc49e613993c7a4e6a731c0f2ab0408add6afdb" dependencies = [ - "glam 0.24.1", + "glam", "serde", ] -[[package]] -name = "bevy_mikktspace" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39106bc2ee21fce9496d2e15e0ba7925dff63e3eae10f7c1fc0094b56ad9f2bb" -dependencies = [ - "glam 0.23.0", -] - [[package]] name = "bevy_mikktspace" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99dde80034660f7dbb473141c31f0a746acc7229f5a06ce769aba5f16fd592ab" dependencies = [ - "glam 0.24.1", + "glam", ] [[package]] name = "bevy_mod_debugdump" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e89dfbe148a165d3506eab7e7c0b5339ccc7f238a475def713026bc9e8c706" +checksum = "2e8e56ca0ed565ddc8c2507e105a63c277a5671bb5b27e3130ea8e138be18050" dependencies = [ - "bevy_app 0.10.1", - "bevy_ecs 0.10.1", - "bevy_render 0.10.1", - "bevy_utils 0.10.1", + "bevy_app", + "bevy_ecs", + "bevy_render", + "bevy_utils", "once_cell", "petgraph", "pretty-type-name", ] -[[package]] -name = "bevy_pbr" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f507cef55812aa70c2ec2b30fb996eb285fa7497d974cf03f76ec49c77fbe27" -dependencies = [ - "bevy_app 0.10.1", - "bevy_asset 0.10.1", - "bevy_core_pipeline 0.10.1", - "bevy_derive 0.10.1", - "bevy_ecs 0.10.1", - "bevy_math 0.10.1", - "bevy_reflect 0.10.1", - "bevy_render 0.10.1", - "bevy_transform 0.10.1", - "bevy_utils 0.10.1", - "bevy_window 0.10.1", - "bitflags 1.3.2", - "bytemuck", - "radsort", -] - [[package]] name = "bevy_pbr" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3efec2ae4b4f9fd38b82b93350499dac2dc6f07e63ef50a03c00c52075e2dea8" dependencies = [ - "bevy_app 0.11.0", - "bevy_asset 0.11.0", - "bevy_core_pipeline 0.11.0", - "bevy_derive 0.11.0", - "bevy_ecs 0.11.0", - "bevy_math 0.11.0", - "bevy_reflect 0.11.0", - "bevy_render 0.11.0", - "bevy_transform 0.11.0", - "bevy_utils 0.11.0", - "bevy_window 0.11.0", + "bevy_app", + "bevy_asset", + "bevy_core_pipeline", + "bevy_derive", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", + "bevy_window", "bitflags 2.3.3", "bytemuck", "naga_oil", "radsort", ] -[[package]] -name = "bevy_ptr" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b88451d4c5a353bff67dbaa937b6886efd26ae114769c17f2b35099c7a4de" - [[package]] name = "bevy_ptr" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c74fcf37593a0053f539c3b088f34f268cbefed031d8eb8ff0fb10d175160242" -[[package]] -name = "bevy_reflect" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc3979471890e336f3ba87961ef3ecd45c331cf2cb2f582c885e541af228b48" -dependencies = [ - "bevy_math 0.10.1", - "bevy_ptr 0.10.1", - "bevy_reflect_derive 0.10.1", - "bevy_utils 0.10.1", - "downcast-rs", - "erased-serde", - "glam 0.23.0", - "once_cell", - "parking_lot 0.12.1", - "serde", - "smallvec", - "thiserror", -] - [[package]] name = "bevy_reflect" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "362492a6b66f676176705cc06017b012320fa260a9cf4baf3513387e9c05693e" dependencies = [ - "bevy_math 0.11.0", - "bevy_ptr 0.11.0", - "bevy_reflect_derive 0.11.0", - "bevy_utils 0.11.0", + "bevy_math", + "bevy_ptr", + "bevy_reflect_derive", + "bevy_utils", "downcast-rs", "erased-serde", - "glam 0.24.1", + "glam", "once_cell", "parking_lot 0.12.1", "serde", @@ -1363,27 +967,13 @@ dependencies = [ "thiserror", ] -[[package]] -name = "bevy_reflect_derive" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc7ea7c9bc2c531eb29ba5619976613d6680453ff5dd4a7fcd08848e8bec5ad" -dependencies = [ - "bevy_macro_utils 0.10.1", - "bit-set", - "proc-macro2", - "quote", - "syn 1.0.109", - "uuid 1.4.1", -] - [[package]] name = "bevy_reflect_derive" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e974d78eaf1b45e1b4146711b5c16e37c24234e12f3a52f5f2e28332c969d3c" dependencies = [ - "bevy_macro_utils 0.11.0", + "bevy_macro_utils", "bit-set", "proc-macro2", "quote", @@ -1391,50 +981,6 @@ dependencies = [ "uuid 1.4.1", ] -[[package]] -name = "bevy_render" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee1e126226f0a4d439bf82fe07c1104f894a6a365888e3eba7356f9647e77a83" -dependencies = [ - "anyhow", - "async-channel", - "bevy_app 0.10.1", - "bevy_asset 0.10.1", - "bevy_core 0.10.1", - "bevy_derive 0.10.1", - "bevy_ecs 0.10.1", - "bevy_encase_derive 0.10.1", - "bevy_hierarchy 0.10.1", - "bevy_log 0.10.1", - "bevy_math 0.10.1", - "bevy_mikktspace 0.10.1", - "bevy_reflect 0.10.1", - "bevy_render_macros 0.10.1", - "bevy_tasks 0.10.1", - "bevy_time 0.10.1", - "bevy_transform 0.10.1", - "bevy_utils 0.10.1", - "bevy_window 0.10.1", - "bitflags 1.3.2", - "codespan-reporting", - "downcast-rs", - "encase 0.5.0", - "futures-lite", - "hexasphere 8.1.0", - "image", - "naga 0.11.1", - "once_cell", - "parking_lot 0.12.1", - "regex", - "serde", - "smallvec", - "thiserror", - "thread_local", - "wgpu 0.15.1", - "wgpu-hal 0.15.4", -] - [[package]] name = "bevy_render" version = "0.11.0" @@ -1443,34 +989,34 @@ checksum = "46e4b6a82c3a2be1c0d0cbecf62debb8251b72c0ae76285f66265aabc5bf2d37" dependencies = [ "anyhow", "async-channel", - "bevy_app 0.11.0", - "bevy_asset 0.11.0", - "bevy_core 0.11.0", - "bevy_derive 0.11.0", - "bevy_ecs 0.11.0", - "bevy_encase_derive 0.11.0", - "bevy_hierarchy 0.11.0", - "bevy_log 0.11.0", - "bevy_math 0.11.0", - "bevy_mikktspace 0.11.0", - "bevy_reflect 0.11.0", - "bevy_render_macros 0.11.0", - "bevy_tasks 0.11.0", - "bevy_time 0.11.0", - "bevy_transform 0.11.0", - "bevy_utils 0.11.0", - "bevy_window 0.11.0", + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_derive", + "bevy_ecs", + "bevy_encase_derive", + "bevy_hierarchy", + "bevy_log", + "bevy_math", + "bevy_mikktspace", + "bevy_reflect", + "bevy_render_macros", + "bevy_tasks", + "bevy_time", + "bevy_transform", + "bevy_utils", + "bevy_window", "bitflags 2.3.3", "bytemuck", "codespan-reporting", "downcast-rs", - "encase 0.6.1", + "encase", "futures-lite", - "hexasphere 9.1.0", + "hexasphere", "image", "js-sys", "ktx2", - "naga 0.12.3", + "naga", "naga_oil", "parking_lot 0.12.1", "regex", @@ -1481,20 +1027,8 @@ dependencies = [ "thread_local", "wasm-bindgen", "web-sys", - "wgpu 0.16.3", - "wgpu-hal 0.16.2", -] - -[[package]] -name = "bevy_render_macros" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "652f8c4d9577c6e6a8b3dfd8a4ce331e8b6ecdbb99636a4b2701dec50104d6bc" -dependencies = [ - "bevy_macro_utils 0.10.1", - "proc-macro2", - "quote", - "syn 1.0.109", + "wgpu", + "wgpu-hal", ] [[package]] @@ -1503,34 +1037,12 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07c4d937f966644f5e1e3c9157736acdd36286bcce06142ff9ad25cd71348c09" dependencies = [ - "bevy_macro_utils 0.11.0", + "bevy_macro_utils", "proc-macro2", "quote", "syn 2.0.28", ] -[[package]] -name = "bevy_scene" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1de59637d27726251091120ce6f63917328ffd60aaccbda4d65a615873aff631" -dependencies = [ - "anyhow", - "bevy_app 0.10.1", - "bevy_asset 0.10.1", - "bevy_derive 0.10.1", - "bevy_ecs 0.10.1", - "bevy_hierarchy 0.10.1", - "bevy_reflect 0.10.1", - "bevy_render 0.10.1", - "bevy_transform 0.10.1", - "bevy_utils 0.10.1", - "ron", - "serde", - "thiserror", - "uuid 1.4.1", -] - [[package]] name = "bevy_scene" version = "0.11.0" @@ -1538,63 +1050,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf1e00eb30e2053d9fff0802b2f557350b4e66bac58d531de30882048b4e3232" dependencies = [ "anyhow", - "bevy_app 0.11.0", - "bevy_asset 0.11.0", - "bevy_derive 0.11.0", - "bevy_ecs 0.11.0", - "bevy_hierarchy 0.11.0", - "bevy_reflect 0.11.0", - "bevy_render 0.11.0", - "bevy_transform 0.11.0", - "bevy_utils 0.11.0", + "bevy_app", + "bevy_asset", + "bevy_derive", + "bevy_ecs", + "bevy_hierarchy", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", "ron", "serde", "thiserror", "uuid 1.4.1", ] -[[package]] -name = "bevy_sprite" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c110358fe3651a5796fd1c07989635680738f5b5c7e9b8a463dd50d12bb78410" -dependencies = [ - "bevy_app 0.10.1", - "bevy_asset 0.10.1", - "bevy_core_pipeline 0.10.1", - "bevy_derive 0.10.1", - "bevy_ecs 0.10.1", - "bevy_log 0.10.1", - "bevy_math 0.10.1", - "bevy_reflect 0.10.1", - "bevy_render 0.10.1", - "bevy_transform 0.10.1", - "bevy_utils 0.10.1", - "bitflags 1.3.2", - "bytemuck", - "fixedbitset", - "guillotiere", - "rectangle-pack", - "thiserror", -] - [[package]] name = "bevy_sprite" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03f64119444ef9788dcdd05012a60f0fa3b7ddb396d434ebcfc3edefd76c91b5" dependencies = [ - "bevy_app 0.11.0", - "bevy_asset 0.11.0", - "bevy_core_pipeline 0.11.0", - "bevy_derive 0.11.0", - "bevy_ecs 0.11.0", - "bevy_log 0.11.0", - "bevy_math 0.11.0", - "bevy_reflect 0.11.0", - "bevy_render 0.11.0", - "bevy_transform 0.11.0", - "bevy_utils 0.11.0", + "bevy_app", + "bevy_asset", + "bevy_core_pipeline", + "bevy_derive", + "bevy_ecs", + "bevy_log", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", "bitflags 2.3.3", "bytemuck", "fixedbitset", @@ -1609,22 +1096,7 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11776a0721936f8b88e1d3ddacbbb1fa4da0c4c2412164bee03f1b0c49586536" dependencies = [ - "bevy 0.11.0", -] - -[[package]] -name = "bevy_tasks" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3de86364316e151aeb0897eaaa917c3ad5ee5ef1471a939023cf7f2d5ab76955" -dependencies = [ - "async-channel", - "async-executor", - "async-task", - "concurrent-queue", - "futures-lite", - "once_cell", - "wasm-bindgen-futures", + "bevy", ] [[package]] @@ -1641,29 +1113,6 @@ dependencies = [ "wasm-bindgen-futures", ] -[[package]] -name = "bevy_text" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "995188f59dc06da3fc951e1f58a105cde2c817d5330ae67ddc0a140f46482f6b" -dependencies = [ - "ab_glyph", - "anyhow", - "bevy_app 0.10.1", - "bevy_asset 0.10.1", - "bevy_ecs 0.10.1", - "bevy_math 0.10.1", - "bevy_reflect 0.10.1", - "bevy_render 0.10.1", - "bevy_sprite 0.10.1", - "bevy_transform 0.10.1", - "bevy_utils 0.10.1", - "bevy_window 0.10.1", - "glyph_brush_layout", - "serde", - "thiserror", -] - [[package]] name = "bevy_text" version = "0.11.0" @@ -1672,130 +1121,73 @@ checksum = "b52a19b3d0caf20acd1bdb47b6a00717accc834b46c4f204a63de15cea45ec4b" dependencies = [ "ab_glyph", "anyhow", - "bevy_app 0.11.0", - "bevy_asset 0.11.0", - "bevy_ecs 0.11.0", - "bevy_math 0.11.0", - "bevy_reflect 0.11.0", - "bevy_render 0.11.0", - "bevy_sprite 0.11.0", - "bevy_transform 0.11.0", - "bevy_utils 0.11.0", - "bevy_window 0.11.0", + "bevy_app", + "bevy_asset", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_sprite", + "bevy_transform", + "bevy_utils", + "bevy_window", "glyph_brush_layout", "serde", "thiserror", ] -[[package]] -name = "bevy_time" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3edbd605df1bced312eb9888d6be3d5a5fcac3d4140038bbe3233d218399eef" -dependencies = [ - "bevy_app 0.10.1", - "bevy_ecs 0.10.1", - "bevy_reflect 0.10.1", - "bevy_utils 0.10.1", - "crossbeam-channel", - "thiserror", -] - [[package]] name = "bevy_time" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d09225ad2ffef14da000080143730b36ba225844ae479e4791cdb9d08066d06a" dependencies = [ - "bevy_app 0.11.0", - "bevy_ecs 0.11.0", - "bevy_reflect 0.11.0", - "bevy_utils 0.11.0", + "bevy_app", + "bevy_ecs", + "bevy_reflect", + "bevy_utils", "crossbeam-channel", "serde", "thiserror", ] -[[package]] -name = "bevy_transform" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24383dfb97d8a14b17721ecfdf58556eff5ea9a4b2a3d91accf2b472783880b0" -dependencies = [ - "bevy_app 0.10.1", - "bevy_ecs 0.10.1", - "bevy_hierarchy 0.10.1", - "bevy_math 0.10.1", - "bevy_reflect 0.10.1", -] - [[package]] name = "bevy_transform" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da8a0cd3780e120e20be333cc48d41cb74620d798dc61bc18eb2a82d3545e184" dependencies = [ - "bevy_app 0.11.0", - "bevy_ecs 0.11.0", - "bevy_hierarchy 0.11.0", - "bevy_math 0.11.0", - "bevy_reflect 0.11.0", + "bevy_app", + "bevy_ecs", + "bevy_hierarchy", + "bevy_math", + "bevy_reflect", "serde", ] -[[package]] -name = "bevy_ui" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb597aeed4e1bf5e6913879c3e22a7d50a843b822a7f71a4a80ebdfdf79e68d4" -dependencies = [ - "bevy_a11y 0.10.1", - "bevy_app 0.10.1", - "bevy_asset 0.10.1", - "bevy_core_pipeline 0.10.1", - "bevy_derive 0.10.1", - "bevy_ecs 0.10.1", - "bevy_hierarchy 0.10.1", - "bevy_input 0.10.1", - "bevy_log 0.10.1", - "bevy_math 0.10.1", - "bevy_reflect 0.10.1", - "bevy_render 0.10.1", - "bevy_sprite 0.10.1", - "bevy_text 0.10.1", - "bevy_transform 0.10.1", - "bevy_utils 0.10.1", - "bevy_window 0.10.1", - "bytemuck", - "serde", - "smallvec", - "taffy", - "thiserror", -] - [[package]] name = "bevy_ui" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb85992eb5809936b3326940dc8d6e7b219af3dde1ecbca5948addd6a78694cc" dependencies = [ - "bevy_a11y 0.11.0", - "bevy_app 0.11.0", - "bevy_asset 0.11.0", - "bevy_core_pipeline 0.11.0", - "bevy_derive 0.11.0", - "bevy_ecs 0.11.0", - "bevy_hierarchy 0.11.0", - "bevy_input 0.11.0", - "bevy_log 0.11.0", - "bevy_math 0.11.0", - "bevy_reflect 0.11.0", - "bevy_render 0.11.0", - "bevy_sprite 0.11.0", - "bevy_text 0.11.0", - "bevy_transform 0.11.0", - "bevy_utils 0.11.0", - "bevy_window 0.11.0", + "bevy_a11y", + "bevy_app", + "bevy_asset", + "bevy_core_pipeline", + "bevy_derive", + "bevy_ecs", + "bevy_hierarchy", + "bevy_input", + "bevy_log", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_sprite", + "bevy_text", + "bevy_transform", + "bevy_utils", + "bevy_window", "bytemuck", "serde", "smallvec", @@ -1803,23 +1195,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "bevy_utils" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a88ebbca55d360d72e9fe78df0d22e25cd419933c9559e79dae2757f7c4d066" -dependencies = [ - "ahash 0.7.6", - "bevy_utils_proc_macros 0.10.1", - "getrandom", - "hashbrown 0.12.3", - "instant", - "petgraph", - "thiserror", - "tracing", - "uuid 1.4.1", -] - [[package]] name = "bevy_utils" version = "0.11.0" @@ -1827,7 +1202,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10bfde141f0cdd15e07bca72f4439a9db80877c283738f581d061972ef483b1b" dependencies = [ "ahash 0.8.3", - "bevy_utils_proc_macros 0.11.0", + "bevy_utils_proc_macros", "getrandom", "hashbrown 0.14.0", "instant", @@ -1837,17 +1212,6 @@ dependencies = [ "uuid 1.4.1", ] -[[package]] -name = "bevy_utils_proc_macros" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630b92e32fa5cd7917c7d4fdbf63a90af958b01e096239f71bc4f8f3cf40c0d2" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "bevy_utils_proc_macros" version = "0.11.0" @@ -1859,80 +1223,40 @@ dependencies = [ "syn 2.0.28", ] -[[package]] -name = "bevy_window" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad31234754268fbe12050290b0496e2296252a16995a38f94bfb9680a4f09fda" -dependencies = [ - "bevy_app 0.10.1", - "bevy_ecs 0.10.1", - "bevy_input 0.10.1", - "bevy_math 0.10.1", - "bevy_reflect 0.10.1", - "bevy_utils 0.10.1", - "raw-window-handle", -] - [[package]] name = "bevy_window" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0528832361e3d942df287c90537ef6fafb726c4934468a7c3a5d53d659bfbf54" dependencies = [ - "bevy_app 0.11.0", - "bevy_ecs 0.11.0", - "bevy_input 0.11.0", - "bevy_math 0.11.0", - "bevy_reflect 0.11.0", - "bevy_utils 0.11.0", + "bevy_app", + "bevy_ecs", + "bevy_input", + "bevy_math", + "bevy_reflect", + "bevy_utils", "raw-window-handle", "serde", ] -[[package]] -name = "bevy_winit" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf17bd6330f7e633b7c56754c776511a8f52cde4bf54c0278f34d7527548f253" -dependencies = [ - "accesskit_winit 0.12.4", - "approx", - "bevy_a11y 0.10.1", - "bevy_app 0.10.1", - "bevy_derive 0.10.1", - "bevy_ecs 0.10.1", - "bevy_hierarchy 0.10.1", - "bevy_input 0.10.1", - "bevy_math 0.10.1", - "bevy_utils 0.10.1", - "bevy_window 0.10.1", - "crossbeam-channel", - "once_cell", - "raw-window-handle", - "wasm-bindgen", - "web-sys", - "winit", -] - [[package]] name = "bevy_winit" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24c6709dc70cfee1eb94d5f125d29612c4a9345dfc1a70dd3189af927b2fd503" dependencies = [ - "accesskit_winit 0.14.2", + "accesskit_winit", "approx", - "bevy_a11y 0.11.0", - "bevy_app 0.11.0", - "bevy_derive 0.11.0", - "bevy_ecs 0.11.0", - "bevy_hierarchy 0.11.0", - "bevy_input 0.11.0", - "bevy_math 0.11.0", - "bevy_tasks 0.11.0", - "bevy_utils 0.11.0", - "bevy_window 0.11.0", + "bevy_a11y", + "bevy_app", + "bevy_derive", + "bevy_ecs", + "bevy_hierarchy", + "bevy_input", + "bevy_math", + "bevy_tasks", + "bevy_utils", + "bevy_window", "crossbeam-channel", "raw-window-handle", "wasm-bindgen", @@ -1945,7 +1269,7 @@ name = "bevy_yarn_slinger" version = "0.1.0" dependencies = [ "anyhow", - "bevy 0.11.0", + "bevy", "csv", "rand", "seldom_fn_plugin", @@ -1959,7 +1283,7 @@ dependencies = [ name = "bevy_yarn_slinger_demo" version = "0.1.0" dependencies = [ - "bevy 0.11.0", + "bevy", "bevy_editor_pls", "bevy_sprite3d", "bevy_yarn_slinger", @@ -1970,7 +1294,7 @@ dependencies = [ name = "bevy_yarn_slinger_example_dialogue_view" version = "0.1.0" dependencies = [ - "bevy 0.11.0", + "bevy", "bevy_yarn_slinger", "seldom_fn_plugin", "unicode-segmentation", @@ -2748,6 +2072,16 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +[[package]] +name = "duplicate" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de78e66ac9061e030587b2a2e75cc88f22304913c907b11307bca737141230cb" +dependencies = [ + "heck", + "proc-macro-error", +] + [[package]] name = "dynasm" version = "1.2.3" @@ -2776,18 +2110,18 @@ dependencies = [ [[package]] name = "ecolor" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f99fe3cac305af9d6d92971af60d0f7ea4d783201ef1673571567b6699964d9" +checksum = "2e479a7fa3f23d4e794f8b2f8b3568dd4e47886ad1b12c9c095e141cb591eb63" dependencies = [ "bytemuck", ] [[package]] name = "egui" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6412a21e0bde7c0918f7fb44bbbb86b5e1f88e63c026a4e747cc7af02f76dfbe" +checksum = "a3aef8ec3ae1b772f340170c65bf27d5b8c28f543a0116c844d2ac08d01123e7" dependencies = [ "ahash 0.8.3", "epaint", @@ -2796,21 +2130,23 @@ dependencies = [ [[package]] name = "egui-gizmo" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c043f3afe520e62a91da97cf718314c36dfdc75be4557ff0caca9a488e2fa0" +checksum = "b62be3408d2b5a3a866931a8b8b3357992c2e93cb72d220f65f663c63ac45f3a" dependencies = [ "egui", - "glam 0.22.0", + "glam", ] [[package]] name = "egui_dock" -version = "0.4.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be7e6eb63cb936413bd2a4f54be4a9ef53a48252f25864f5f946d4954d7332bd" +checksum = "1ec07302c1a474f37fe6ef2c6672427880025edc37ac33955e6ea4a11bc6972a" dependencies = [ + "duplicate", "egui", + "paste", ] [[package]] @@ -2830,25 +2166,13 @@ dependencies = [ [[package]] name = "emath" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ecd80612937e0267909d5351770fe150004e24dab93954f69ca62eecd3f77e" +checksum = "3857d743a6e0741cdd60b622a74c7a36ea75f5f8f11b793b41d905d2c9721a4b" dependencies = [ "bytemuck", ] -[[package]] -name = "encase" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6591f13a63571c4821802eb5b10fd1155b1290bce87086440003841c8c3909b" -dependencies = [ - "const_panic", - "encase_derive 0.5.0", - "glam 0.23.0", - "thiserror", -] - [[package]] name = "encase" version = "0.6.1" @@ -2856,38 +2180,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fce2eeef77fd4a293a54b62aa00ac9daebfbcda4bf8998c5a815635b004aa1c" dependencies = [ "const_panic", - "encase_derive 0.6.1", - "glam 0.24.1", + "encase_derive", + "glam", "thiserror", ] -[[package]] -name = "encase_derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1da6deed1f8b6f5909616ffa695f63a5de54d6a0f084fa715c70c8ed3abac9" -dependencies = [ - "encase_derive_impl 0.5.0", -] - [[package]] name = "encase_derive" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e520cde08cbf4f7cc097f61573ec06ce467019803de8ae82fb2823fa1554a0e" dependencies = [ - "encase_derive_impl 0.6.1", -] - -[[package]] -name = "encase_derive_impl" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae489d58959f3c4cdd1250866a05acfb341469affe4fced71aff3ba228be1693" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "encase_derive_impl", ] [[package]] @@ -2959,9 +2263,9 @@ dependencies = [ [[package]] name = "epaint" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12e78b5c58a1f7f621f9d546add2adce20636422c9b251e29f749e8a2f713c95" +checksum = "09333964d4d57f40a85338ba3ca5ed4716070ab184dcfed966b35491c5c64f3b" dependencies = [ "ab_glyph", "ahash 0.8.3", @@ -3232,15 +2536,6 @@ dependencies = [ "slab", ] -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - [[package]] name = "generational-arena" version = "0.2.9" @@ -3333,22 +2628,6 @@ version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" -[[package]] -name = "glam" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f597d56c1bd55a811a1be189459e8fad2bbc272616375602443bdfb37fa774" - -[[package]] -name = "glam" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e4afd9ad95555081e109fe1d21f2a30c691b5f0919c67dfa690a2e1eb6bd51c" -dependencies = [ - "bytemuck", - "serde", -] - [[package]] name = "glam" version = "0.24.1" @@ -3529,7 +2808,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ "ahash 0.7.6", - "serde", ] [[package]] @@ -3543,21 +2821,6 @@ dependencies = [ "serde", ] -[[package]] -name = "hassle-rs" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90601c6189668c7345fc53842cb3f3a3d872203d523be1b3cb44a36a3e62fb85" -dependencies = [ - "bitflags 1.3.2", - "com-rs", - "libc", - "libloading 0.7.4", - "thiserror", - "widestring 0.5.1", - "winapi", -] - [[package]] name = "hassle-rs" version = "0.10.0" @@ -3569,7 +2832,7 @@ dependencies = [ "libc", "libloading 0.7.4", "thiserror", - "widestring 1.0.2", + "widestring", "winapi", ] @@ -3585,16 +2848,6 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" -[[package]] -name = "hexasphere" -version = "8.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd41d443f978bfa380a6dad58b62a08c43bcb960631f13e9d015b911eaf73588" -dependencies = [ - "glam 0.23.0", - "once_cell", -] - [[package]] name = "hexasphere" version = "9.1.0" @@ -3602,7 +2855,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cb3df16a7bcb1b5bc092abd55e14f77ca70aea14445026e264586fc62889a10" dependencies = [ "constgebra", - "glam 0.24.1", + "glam", ] [[package]] @@ -4674,28 +3927,6 @@ dependencies = [ "byteorder", ] -[[package]] -name = "naga" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c3d4269bcb7d50121097702fde1afb75f4ea8083aeb7a55688dcf289a853271" -dependencies = [ - "bit-set", - "bitflags 1.3.2", - "codespan-reporting", - "hexf-parse", - "indexmap 1.9.3", - "log", - "num-traits", - "petgraph", - "pp-rs", - "rustc-hash", - "spirv", - "termcolor", - "thiserror", - "unicode-xid", -] - [[package]] name = "naga" version = "0.12.3" @@ -4727,7 +3958,7 @@ dependencies = [ "codespan-reporting", "data-encoding", "indexmap 1.9.3", - "naga 0.12.3", + "naga", "once_cell", "regex", "regex-syntax 0.6.29", @@ -5687,12 +4918,6 @@ dependencies = [ "bytecheck", ] -[[package]] -name = "renderdoc-sys" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157" - [[package]] name = "renderdoc-sys" version = "1.0.0" @@ -5901,7 +5126,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8b68f2d4518ce1f3db064454d1103f4b85f23edcdab4350312e8f4697e0cd46" dependencies = [ - "bevy 0.11.0", + "bevy", ] [[package]] @@ -6111,16 +5336,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "spin_sleep" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cafa7900db085f4354dbc7025e25d7a839a14360ea13b5fc4fd717f2d3b23134" -dependencies = [ - "once_cell", - "winapi", -] - [[package]] name = "spirv" version = "0.2.0+1.5.4" @@ -6278,20 +5493,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "sysinfo" -version = "0.28.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c2f3ca6693feb29a89724516f016488e9aafc7f37264f898593ee4b942f31b" -dependencies = [ - "cfg-if", - "core-foundation-sys 0.8.4", - "libc", - "ntapi", - "once_cell", - "winapi", -] - [[package]] name = "sysinfo" version = "0.29.7" @@ -7212,30 +6413,6 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" -[[package]] -name = "wgpu" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d745a1b6d91d85c33defbb29f0eee0450e1d2614d987e14bf6baf26009d132d7" -dependencies = [ - "arrayvec", - "cfg-if", - "js-sys", - "log", - "naga 0.11.1", - "parking_lot 0.12.1", - "profiling", - "raw-window-handle", - "smallvec", - "static_assertions", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "wgpu-core 0.15.1", - "wgpu-hal 0.15.4", - "wgpu-types 0.15.2", -] - [[package]] name = "wgpu" version = "0.16.3" @@ -7246,7 +6423,7 @@ dependencies = [ "cfg-if", "js-sys", "log", - "naga 0.12.3", + "naga", "parking_lot 0.12.1", "profiling", "raw-window-handle", @@ -7255,32 +6432,9 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "wgpu-core 0.16.1", - "wgpu-hal 0.16.2", - "wgpu-types 0.16.1", -] - -[[package]] -name = "wgpu-core" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7131408d940e335792645a98f03639573b0480e9e2e7cddbbab74f7c6d9f3fff" -dependencies = [ - "arrayvec", - "bit-vec", - "bitflags 1.3.2", - "codespan-reporting", - "fxhash", - "log", - "naga 0.11.1", - "parking_lot 0.12.1", - "profiling", - "raw-window-handle", - "smallvec", - "thiserror", - "web-sys", - "wgpu-hal 0.15.4", - "wgpu-types 0.15.2", + "wgpu-core", + "wgpu-hal", + "wgpu-types", ] [[package]] @@ -7294,7 +6448,7 @@ dependencies = [ "bitflags 2.3.3", "codespan-reporting", "log", - "naga 0.12.3", + "naga", "parking_lot 0.12.1", "profiling", "raw-window-handle", @@ -7302,50 +6456,8 @@ dependencies = [ "smallvec", "thiserror", "web-sys", - "wgpu-hal 0.16.2", - "wgpu-types 0.16.1", -] - -[[package]] -name = "wgpu-hal" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdcf61a283adc744bb5453dd88ea91f3f86d5ca6b027661c6c73c7734ae0288b" -dependencies = [ - "android_system_properties", - "arrayvec", - "ash", - "bit-set", - "bitflags 1.3.2", - "block", - "core-graphics-types", - "d3d12", - "foreign-types", - "fxhash", - "glow", - "gpu-alloc", - "gpu-allocator", - "gpu-descriptor", - "hassle-rs 0.9.0", - "js-sys", - "khronos-egl", - "libc", - "libloading 0.7.4", - "log", - "metal", - "naga 0.11.1", - "objc", - "parking_lot 0.12.1", - "profiling", - "range-alloc", - "raw-window-handle", - "renderdoc-sys 0.7.1", - "smallvec", - "thiserror", - "wasm-bindgen", - "web-sys", - "wgpu-types 0.15.2", - "winapi", + "wgpu-hal", + "wgpu-types", ] [[package]] @@ -7367,40 +6479,29 @@ dependencies = [ "gpu-alloc", "gpu-allocator", "gpu-descriptor", - "hassle-rs 0.10.0", + "hassle-rs", "js-sys", "khronos-egl", "libc", "libloading 0.8.0", "log", "metal", - "naga 0.12.3", + "naga", "objc", "parking_lot 0.12.1", "profiling", "range-alloc", "raw-window-handle", - "renderdoc-sys 1.0.0", + "renderdoc-sys", "rustc-hash", "smallvec", "thiserror", "wasm-bindgen", "web-sys", - "wgpu-types 0.16.1", + "wgpu-types", "winapi", ] -[[package]] -name = "wgpu-types" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32444e121b0bd00cb02c0de32fde457a9491bd44e03e7a5db6df9b1da2f6f110" -dependencies = [ - "bitflags 1.3.2", - "js-sys", - "web-sys", -] - [[package]] name = "wgpu-types" version = "0.16.1" @@ -7423,12 +6524,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "widestring" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" - [[package]] name = "widestring" version = "1.0.2" @@ -7878,7 +6973,7 @@ dependencies = [ "annotate-snippets", "antlr-rust", "better_any", - "bevy 0.11.0", + "bevy", "rand", "regex", "serde", @@ -7892,7 +6987,7 @@ dependencies = [ name = "yarn_slinger_core" version = "0.1.0" dependencies = [ - "bevy 0.11.0", + "bevy", "bytes", "paste", "prost", @@ -7907,7 +7002,7 @@ dependencies = [ name = "yarn_slinger_examples" version = "0.1.0" dependencies = [ - "bevy 0.11.0", + "bevy", "bevy_yarn_slinger", "bevy_yarn_slinger_example_dialogue_view", ] @@ -7925,7 +7020,7 @@ dependencies = [ name = "yarn_slinger_runtime" version = "0.1.0" dependencies = [ - "bevy 0.11.0", + "bevy", "fixed_decimal", "icu_locid", "icu_plurals", diff --git a/demo/Cargo.toml b/demo/Cargo.toml index e0f9b674..28acfeb0 100644 --- a/demo/Cargo.toml +++ b/demo/Cargo.toml @@ -12,7 +12,8 @@ editor = ["bevy_editor_pls"] bevy_yarn_slinger = { path = "../crates/bevy_plugin" } bevy_yarn_slinger_example_dialogue_view = { path = "../crates/example_dialogue_view" } bevy_sprite3d = "2.5" -bevy_editor_pls = { version = "0.4", optional = true } +# No bevy v0.11 compatible release yet, see +bevy_editor_pls = { git = "https://github.com/jakobhellermann/bevy_editor_pls", rev = "f72483a", version = "0.4", optional = true } [dependencies.bevy] version = "0.11" From cb0050061e646b87b5030c23f16cbe285d640716 Mon Sep 17 00:00:00 2001 From: Tim Jentzsch Date: Sun, 6 Aug 2023 18:59:00 +0200 Subject: [PATCH 21/24] Replace remaining deprecated function calls --- crates/bevy_plugin/src/lib.rs | 6 +++--- crates/bevy_plugin/src/plugin.rs | 2 +- crates/bevy_plugin/tests/test_asset_provider.rs | 12 ++++++------ .../tests/test_dialogue_runner_delivers_lines.rs | 4 ++-- .../tests/test_dialogue_runner_delivers_options.rs | 4 ++-- .../tests/test_dialogue_runner_runs_commands.rs | 4 ++-- crates/bevy_plugin/tests/test_strings_tables.rs | 14 +++++++------- crates/bevy_plugin/tests/test_text_provider.rs | 14 +++++++------- crates/bevy_plugin/tests/utils/mod.rs | 4 ++-- crates/example_dialogue_view/src/lib.rs | 4 ++-- .../yarn_files/running_examples.md | 4 ++-- examples/bevy_yarn_slinger/src/bin/hello_world.rs | 2 +- 12 files changed, 37 insertions(+), 37 deletions(-) diff --git a/crates/bevy_plugin/src/lib.rs b/crates/bevy_plugin/src/lib.rs index 3a670e80..49dd2be8 100644 --- a/crates/bevy_plugin/src/lib.rs +++ b/crates/bevy_plugin/src/lib.rs @@ -63,10 +63,10 @@ //! app.add_plugins(DefaultPlugins) //! // Register the Yarn Slinger plugin using its default settings, which will look for Yarn files in the "dialogue" folder //! // If this app should support Wasm or Android, we cannot load files without specifying them, so use the following instead. -//! // .add_plugin(YarnSlingerPlugin::with_yarn_source(YarnFileSource::file("dialogue/hello_world.yarn"))) -//! .add_plugin(YarnSlingerPlugin::new()) +//! // .add_plugins(YarnSlingerPlugin::with_yarn_source(YarnFileSource::file("dialogue/hello_world.yarn"))) +//! .add_plugins(YarnSlingerPlugin::new()) //! // Initialize the bundled example UI. Requires the `bevy_yarn_slinger_example_dialogue_view` crate. -//! // .add_plugin(ExampleYarnSlingerDialogueViewPlugin::new()) +//! // .add_plugins(ExampleYarnSlingerDialogueViewPlugin::new()) //! .add_systems( //! Update, //! ( diff --git a/crates/bevy_plugin/src/plugin.rs b/crates/bevy_plugin/src/plugin.rs index 79f3bdfa..9962f40c 100644 --- a/crates/bevy_plugin/src/plugin.rs +++ b/crates/bevy_plugin/src/plugin.rs @@ -22,7 +22,7 @@ mod yarn_file_source; /// App::new() /// .add_plugins(DefaultPlugins) /// // Load all Yarn files from the "assets/dialogue" folder by default. -/// .add_plugin(YarnSlingerPlugin::new()); +/// .add_plugins(YarnSlingerPlugin::new()); /// ``` /// /// Note that the above does not work on Wasm or Android, since Bevy cannot query folders on these platforms. See [`YarnSlingerPlugin::new`] for more information. diff --git a/crates/bevy_plugin/tests/test_asset_provider.rs b/crates/bevy_plugin/tests/test_asset_provider.rs index 77f4bdb8..f00059d8 100644 --- a/crates/bevy_plugin/tests/test_asset_provider.rs +++ b/crates/bevy_plugin/tests/test_asset_provider.rs @@ -13,7 +13,7 @@ fn does_not_load_asset_without_localizations() -> Result<()> { let mut app = App::new(); app.setup_default_plugins() - .add_plugin(YarnSlingerPlugin::with_yarn_source(YarnFileSource::file( + .add_plugins(YarnSlingerPlugin::with_yarn_source(YarnFileSource::file( "lines_with_ids.yarn", ))); @@ -40,7 +40,7 @@ fn does_not_load_asset_without_localizations() -> Result<()> { fn does_not_load_invalid_asset_id() -> Result<()> { let mut app = App::new(); - app.setup_default_plugins().add_plugin( + app.setup_default_plugins().add_plugins( YarnSlingerPlugin::with_yarn_source(YarnFileSource::file("lines_with_ids.yarn")) .with_localizations(Localizations { base_localization: "en-US".into(), @@ -69,7 +69,7 @@ fn does_not_load_invalid_asset_id() -> Result<()> { fn loads_asset_from_base_language_localization() -> Result<()> { let mut app = App::new(); - app.setup_default_plugins().add_plugin( + app.setup_default_plugins().add_plugins( YarnSlingerPlugin::with_yarn_source(YarnFileSource::file("lines_with_ids.yarn")) .with_localizations(Localizations { base_localization: "en-US".into(), @@ -103,7 +103,7 @@ fn loads_asset_from_base_language_localization() -> Result<()> { fn loads_asset_from_translated_localization() -> Result<()> { let mut app = App::new(); - app.setup_default_plugins().add_plugin( + app.setup_default_plugins().add_plugins( YarnSlingerPlugin::with_yarn_source(YarnFileSource::file("lines_with_ids.yarn")) .with_localizations(Localizations { base_localization: "en-US".into(), @@ -139,7 +139,7 @@ fn loads_asset_from_translated_localization() -> Result<()> { fn panics_on_invalid_language() { let mut app = App::new(); - app.setup_default_plugins().add_plugin( + app.setup_default_plugins().add_plugins( YarnSlingerPlugin::with_yarn_source(YarnFileSource::file("lines_with_ids.yarn")) .with_localizations(Localizations { base_localization: "en-US".into(), @@ -164,7 +164,7 @@ fn panics_on_invalid_language() { fn does_not_load_asset_with_invalid_type() -> Result<()> { let mut app = App::new(); - app.setup_default_plugins().add_plugin( + app.setup_default_plugins().add_plugins( YarnSlingerPlugin::with_yarn_source(YarnFileSource::file("lines_with_ids.yarn")) .with_localizations(Localizations { base_localization: "en-US".into(), diff --git a/crates/bevy_plugin/tests/test_dialogue_runner_delivers_lines.rs b/crates/bevy_plugin/tests/test_dialogue_runner_delivers_lines.rs index cca27f0d..f71764f4 100644 --- a/crates/bevy_plugin/tests/test_dialogue_runner_delivers_lines.rs +++ b/crates/bevy_plugin/tests/test_dialogue_runner_delivers_lines.rs @@ -262,7 +262,7 @@ fn default_language_is_base_language() { fn setup_dialogue_runner_without_localizations(app: &mut App) -> Mut { app.setup_default_plugins() - .add_plugin(YarnSlingerPlugin::with_yarn_source(YarnFileSource::file( + .add_plugins(YarnSlingerPlugin::with_yarn_source(YarnFileSource::file( "lines.yarn", ))) .dialogue_runner_mut() @@ -272,7 +272,7 @@ fn setup_dialogue_runner_with_localizations(app: &mut App) -> Mut Mut { self.setup_default_plugins() - .add_plugin(YarnSlingerPlugin::with_yarn_source(YarnFileSource::file( + .add_plugins(YarnSlingerPlugin::with_yarn_source(YarnFileSource::file( "options.yarn", ))) .dialogue_runner_mut() } fn setup_dialogue_runner_in_dev_mode(&mut self) -> Mut { - self.add_plugin( + self.add_plugins( YarnSlingerPlugin::with_yarn_source(YarnFileSource::file("options.yarn")) .with_localizations(Localizations { base_localization: "en-US".into(), diff --git a/crates/bevy_plugin/tests/test_dialogue_runner_runs_commands.rs b/crates/bevy_plugin/tests/test_dialogue_runner_runs_commands.rs index 7beac434..3364a2c3 100644 --- a/crates/bevy_plugin/tests/test_dialogue_runner_runs_commands.rs +++ b/crates/bevy_plugin/tests/test_dialogue_runner_runs_commands.rs @@ -122,7 +122,7 @@ impl CommandAppExt for App { fn setup_dialogue_runner(&mut self) -> Mut { let mut dialogue_runner = self .setup_default_plugins() - .add_plugin(YarnSlingerPlugin::with_yarn_source(YarnFileSource::file( + .add_plugins(YarnSlingerPlugin::with_yarn_source(YarnFileSource::file( "commands.yarn", ))) .dialogue_runner_mut(); @@ -142,7 +142,7 @@ impl CommandAppExt for App { fn setup_dialogue_runner_for_wait(&mut self) -> Mut { self.setup_default_plugins() - .add_plugin(YarnSlingerPlugin::with_yarn_source(YarnFileSource::file( + .add_plugins(YarnSlingerPlugin::with_yarn_source(YarnFileSource::file( "wait.yarn", ))) .dialogue_runner_mut() diff --git a/crates/bevy_plugin/tests/test_strings_tables.rs b/crates/bevy_plugin/tests/test_strings_tables.rs index 375e0485..ce00f6b8 100644 --- a/crates/bevy_plugin/tests/test_strings_tables.rs +++ b/crates/bevy_plugin/tests/test_strings_tables.rs @@ -12,7 +12,7 @@ mod utils; fn loads_yarn_assets() { let mut app = App::new(); - app.setup_default_plugins().add_plugin( + app.setup_default_plugins().add_plugins( YarnSlingerPlugin::with_yarn_source(YarnFileSource::file("lines.yarn")) .with_localizations(None), ); @@ -33,7 +33,7 @@ fn loads_yarn_assets() { fn panics_on_localization_without_line_ids_in_production() { let mut app = App::new(); - app.setup_default_plugins().add_plugin( + app.setup_default_plugins().add_plugins( YarnSlingerPlugin::with_yarn_source(YarnFileSource::file("lines.yarn")) .with_localizations(Localizations { base_localization: "en-US".into(), @@ -54,7 +54,7 @@ fn generates_line_ids() -> anyhow::Result<()> { let mut app = App::new(); - app.setup_default_plugins_for_path(dir.path()).add_plugin( + app.setup_default_plugins_for_path(dir.path()).add_plugins( YarnSlingerPlugin::with_yarn_source(YarnFileSource::file("lines.yarn")) .with_localizations(Localizations { base_localization: "en-US".into(), @@ -101,7 +101,7 @@ fn generates_strings_file() -> anyhow::Result<()> { let mut app = App::new(); - app.setup_default_plugins_for_path(dir.path()).add_plugin( + app.setup_default_plugins_for_path(dir.path()).add_plugins( YarnSlingerPlugin::with_yarn_source(YarnFileSource::file("lines.yarn")) .with_localizations(Localizations { base_localization: "en-US".into(), @@ -158,7 +158,7 @@ fn appends_to_pre_existing_strings_file() -> anyhow::Result<()> { let mut app = App::new(); - app.setup_default_plugins_for_path(dir.path()).add_plugin( + app.setup_default_plugins_for_path(dir.path()).add_plugins( YarnSlingerPlugin::with_yarn_source(YarnFileSource::file("options.yarn")) .with_localizations(Localizations { base_localization: "en-US".into(), @@ -211,7 +211,7 @@ fn replaces_entries_in_strings_file() -> anyhow::Result<()> { let mut app = App::new(); - app.setup_default_plugins_for_path(dir.path()).add_plugin( + app.setup_default_plugins_for_path(dir.path()).add_plugins( YarnSlingerPlugin::with_yarn_source(YarnFileSource::file("lines_with_ids.yarn")) .with_localizations(Localizations { base_localization: "en-US".into(), @@ -282,7 +282,7 @@ fn replaces_entries_in_strings_file() -> anyhow::Result<()> { fn does_not_panic_on_missing_language_when_not_selected() { let mut app = App::new(); - app.setup_default_plugins().add_plugin( + app.setup_default_plugins().add_plugins( YarnSlingerPlugin::with_yarn_source(YarnFileSource::file("lines_with_ids.yarn")) .with_localizations(Localizations { base_localization: "en-US".into(), diff --git a/crates/bevy_plugin/tests/test_text_provider.rs b/crates/bevy_plugin/tests/test_text_provider.rs index f6bde374..3a82f51a 100644 --- a/crates/bevy_plugin/tests/test_text_provider.rs +++ b/crates/bevy_plugin/tests/test_text_provider.rs @@ -9,7 +9,7 @@ fn loads_line_without_localization() { let mut app = App::new(); app.setup_default_plugins() - .add_plugin(YarnSlingerPlugin::with_yarn_source(YarnFileSource::file( + .add_plugins(YarnSlingerPlugin::with_yarn_source(YarnFileSource::file( "lines_with_ids.yarn", ))); @@ -26,7 +26,7 @@ fn fails_to_get_invalid_line() { let mut app = App::new(); app.setup_default_plugins() - .add_plugin(YarnSlingerPlugin::with_yarn_source(YarnFileSource::file( + .add_plugins(YarnSlingerPlugin::with_yarn_source(YarnFileSource::file( "lines_with_ids.yarn", ))); @@ -41,7 +41,7 @@ fn fails_to_get_invalid_line() { fn loads_line_from_base_language_without_explicit_language() { let mut app = App::new(); - app.setup_default_plugins().add_plugin( + app.setup_default_plugins().add_plugins( YarnSlingerPlugin::with_yarn_source(YarnFileSource::file("lines_with_ids.yarn")) .with_localizations(Localizations { base_localization: "en-US".into(), @@ -64,7 +64,7 @@ fn loads_line_from_base_language_without_explicit_language() { fn loads_line_from_base_language_with_explicit_language() { let mut app = App::new(); - app.setup_default_plugins().add_plugin( + app.setup_default_plugins().add_plugins( YarnSlingerPlugin::with_yarn_source(YarnFileSource::file("lines_with_ids.yarn")) .with_localizations(Localizations { base_localization: "en-US".into(), @@ -90,7 +90,7 @@ fn loads_line_from_base_language_with_explicit_language() { fn panics_when_loading_missing_language() { let mut app = App::new(); - app.setup_default_plugins().add_plugin( + app.setup_default_plugins().add_plugins( YarnSlingerPlugin::with_yarn_source(YarnFileSource::file("lines_with_ids.yarn")) .with_localizations(Localizations { base_localization: "en-US".into(), @@ -108,7 +108,7 @@ fn panics_when_loading_missing_language() { fn loads_line_from_fallback_on_missing_line() { let mut app = App::new(); - app.setup_default_plugins().add_plugin( + app.setup_default_plugins().add_plugins( YarnSlingerPlugin::with_yarn_source(YarnFileSource::file("lines_with_ids.yarn")) .with_localizations(Localizations { base_localization: "en-US".into(), @@ -133,7 +133,7 @@ fn loads_line_from_fallback_on_missing_line() { fn loads_line_from_translated_language() { let mut app = App::new(); - app.setup_default_plugins().add_plugin( + app.setup_default_plugins().add_plugins( YarnSlingerPlugin::with_yarn_source(YarnFileSource::file("lines_with_ids.yarn")) .with_localizations(Localizations { base_localization: "en-US".into(), diff --git a/crates/bevy_plugin/tests/utils/mod.rs b/crates/bevy_plugin/tests/utils/mod.rs index 3cd2129e..503dbd4d 100644 --- a/crates/bevy_plugin/tests/utils/mod.rs +++ b/crates/bevy_plugin/tests/utils/mod.rs @@ -112,13 +112,13 @@ impl AppExt for App { } fn setup_default_plugins_for_path(&mut self, asset_folder: impl AsRef) -> &mut App { - self.add_plugins(MinimalPlugins).add_plugin(AssetPlugin { + self.add_plugins(MinimalPlugins).add_plugins(AssetPlugin { asset_folder: asset_folder.as_ref().to_string_lossy().to_string(), ..default() }); #[cfg(feature = "audio_assets")] - self.add_plugin(AudioPlugin::default()); + self.add_plugins(AudioPlugin::default()); self } } diff --git a/crates/example_dialogue_view/src/lib.rs b/crates/example_dialogue_view/src/lib.rs index 889789f4..d509549d 100644 --- a/crates/example_dialogue_view/src/lib.rs +++ b/crates/example_dialogue_view/src/lib.rs @@ -19,8 +19,8 @@ //! //! App::new() //! .add_plugins(DefaultPlugins) -//! .add_plugin(YarnSlingerPlugin::new()) -//! .add_plugin(ExampleYarnSlingerDialogueViewPlugin::new()); +//! .add_plugins(YarnSlingerPlugin::new()) +//! .add_plugins(ExampleYarnSlingerDialogueViewPlugin::new()); //! ``` //! //! This crate also exposes the [`SpeakerChangeEvent`] which you can use to animate characters while they are speaking, diff --git a/docs/src/working_with_yarn_slinger/yarn_files/running_examples.md b/docs/src/working_with_yarn_slinger/yarn_files/running_examples.md index ba6f2a3e..b866b308 100644 --- a/docs/src/working_with_yarn_slinger/yarn_files/running_examples.md +++ b/docs/src/working_with_yarn_slinger/yarn_files/running_examples.md @@ -31,8 +31,8 @@ fn main() { watch_for_changes: true, ..default() })) - .add_plugin(YarnSlingerPlugin::new()) - .add_plugin(ExampleYarnSlingerDialogueViewPlugin::new()) + .add_plugins(YarnSlingerPlugin::new()) + .add_plugins(ExampleYarnSlingerDialogueViewPlugin::new()) .add_systems(Update, ( setup_camera.on_startup(), spawn_dialogue_runner.run_if(resource_added::()), diff --git a/examples/bevy_yarn_slinger/src/bin/hello_world.rs b/examples/bevy_yarn_slinger/src/bin/hello_world.rs index 8bd1650d..61da8442 100644 --- a/examples/bevy_yarn_slinger/src/bin/hello_world.rs +++ b/examples/bevy_yarn_slinger/src/bin/hello_world.rs @@ -7,7 +7,7 @@ fn main() { app.add_plugins(DefaultPlugins) // Register the Yarn Slinger plugin using its default settings, which will look for Yarn files in the "dialogue" folder. // If this app should support Wasm or Android, we cannot load files without specifying them, so use the following instead. - // .add_plugin(YarnSlingerPlugin::with_yarn_source(YarnFileSource::file("dialogue/hello_world.yarn"))) + // .add_plugins(YarnSlingerPlugin::with_yarn_source(YarnFileSource::file("dialogue/hello_world.yarn"))) .add_plugins(YarnSlingerPlugin::new()) // Initialize the bundled example UI .add_plugins(ExampleYarnSlingerDialogueViewPlugin::new()) From 504af199985133aa402d6ff1685c17f9a94bfaf8 Mon Sep 17 00:00:00 2001 From: Tim Jentzsch Date: Sun, 6 Aug 2023 19:41:41 +0200 Subject: [PATCH 22/24] Fix path assertion in test --- crates/bevy_plugin/src/commands/command_registry.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/crates/bevy_plugin/src/commands/command_registry.rs b/crates/bevy_plugin/src/commands/command_registry.rs index 7b092003..268878bc 100644 --- a/crates/bevy_plugin/src/commands/command_registry.rs +++ b/crates/bevy_plugin/src/commands/command_registry.rs @@ -270,9 +270,6 @@ mod tests { let element = &debug_string[element_start..element_end]; // Not testing the part after because its stability is not guaranteed. - assert_eq!( - element, - "{\"test\": fn(bevy_ecs::system::function_system::In<(f32, f32)>)" - ); + assert_eq!(element, "{\"test\": fn(bevy_ecs::system::In<(f32, f32)>)"); } } From fdfaf5be7a1992837c706e3dd5ca416de79995bb Mon Sep 17 00:00:00 2001 From: Tim Jentzsch Date: Mon, 7 Aug 2023 15:09:41 +0200 Subject: [PATCH 23/24] Remove trailing commata in derives --- crates/compiler/src/output/declaration.rs | 4 ++-- crates/core/src/generated/ext.rs | 2 +- crates/core/src/line_id.rs | 2 +- crates/core/src/operator.rs | 2 +- crates/core/src/position.rs | 2 +- crates/core/src/yarn_value.rs | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/crates/compiler/src/output/declaration.rs b/crates/compiler/src/output/declaration.rs index 53bffc09..9bc8129d 100644 --- a/crates/compiler/src/output/declaration.rs +++ b/crates/compiler/src/output/declaration.rs @@ -19,7 +19,7 @@ use yarn_slinger_core::types::Type; /// You do not create instances of this class yourself. They are /// generated by the [`Compiler`]. #[derive(Debug, Clone, PartialEq)] -#[cfg_attr(feature = "bevy", derive(Reflect,))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] #[cfg_attr( @@ -179,7 +179,7 @@ impl Declaration { /// /// In the original implementation, [`DeclarationSource::External`] is just a magic string. #[derive(Debug, Clone, PartialEq, Eq, Default)] -#[cfg_attr(feature = "bevy", derive(Reflect,))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq, Default))] #[cfg_attr( diff --git a/crates/core/src/generated/ext.rs b/crates/core/src/generated/ext.rs index 75ebcd6e..dfe1b843 100644 --- a/crates/core/src/generated/ext.rs +++ b/crates/core/src/generated/ext.rs @@ -122,7 +122,7 @@ impl TryFrom for OpCode { } #[derive(Debug, Clone, Copy, PartialEq, Eq, Error)] -#[cfg_attr(feature = "bevy", derive(Reflect,))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] #[cfg_attr( diff --git a/crates/core/src/line_id.rs b/crates/core/src/line_id.rs index b1382de2..c72cec02 100644 --- a/crates/core/src/line_id.rs +++ b/crates/core/src/line_id.rs @@ -8,7 +8,7 @@ use std::fmt::Display; /// Luke: Noooooo #line:nooooo /// ``` #[derive(Debug, Clone, PartialEq, Eq, Hash)] -#[cfg_attr(feature = "bevy", derive(Reflect,))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq, Hash))] #[cfg_attr( diff --git a/crates/core/src/operator.rs b/crates/core/src/operator.rs index 0a1f9106..71b6eced 100644 --- a/crates/core/src/operator.rs +++ b/crates/core/src/operator.rs @@ -4,7 +4,7 @@ use std::borrow::Cow; /// The available operators that can be used with Yarn values. #[derive(Debug, Clone, Copy, PartialEq, Eq, strum_macros::Display)] -#[cfg_attr(feature = "bevy", derive(Reflect,))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] #[cfg_attr( diff --git a/crates/core/src/position.rs b/crates/core/src/position.rs index 4a508011..fd044e99 100644 --- a/crates/core/src/position.rs +++ b/crates/core/src/position.rs @@ -3,7 +3,7 @@ use crate::prelude::*; /// Represents a position in a multi-line string. #[derive(Debug, Clone, Copy, Eq, PartialEq, Hash)] -#[cfg_attr(feature = "bevy", derive(Reflect,))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq, Hash))] #[cfg_attr( diff --git a/crates/core/src/yarn_value.rs b/crates/core/src/yarn_value.rs index 3779c704..71069404 100644 --- a/crates/core/src/yarn_value.rs +++ b/crates/core/src/yarn_value.rs @@ -14,7 +14,7 @@ use thiserror::Error; /// /// Corresponds to C#'s [`Convert`](https://docs.microsoft.com/en-us/dotnet/api/system.convert?view=net-5.0) class. #[derive(Debug, Clone, PartialEq)] -#[cfg_attr(feature = "bevy", derive(Reflect,))] +#[cfg_attr(feature = "bevy", derive(Reflect))] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "bevy", reflect(Debug, PartialEq))] #[cfg_attr( From 4b65e4172d725d625596ea0f9fd3b855a8528278 Mon Sep 17 00:00:00 2001 From: Tim Jentzsch Date: Mon, 7 Aug 2023 15:11:34 +0200 Subject: [PATCH 24/24] Fix min height mistakenly being changed to max height --- crates/example_dialogue_view/src/setup.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/example_dialogue_view/src/setup.rs b/crates/example_dialogue_view/src/setup.rs index 6dc818a2..f2f6354a 100644 --- a/crates/example_dialogue_view/src/setup.rs +++ b/crates/example_dialogue_view/src/setup.rs @@ -100,7 +100,7 @@ fn setup(mut commands: Commands) { NodeBundle { style: Style { width: Val::Px(DIALOG_WIDTH), - max_height: Val::Px(50.0), + min_height: Val::Px(50.0), flex_direction: FlexDirection::Column, justify_content: JustifyContent::SpaceAround, align_items: AlignItems::FlexStart,