From 3e31b27d6e77c0299da64e19e1987c59297910a9 Mon Sep 17 00:00:00 2001 From: kitsunecafe Date: Sun, 24 Mar 2024 22:38:08 -0400 Subject: [PATCH] update to 0.13.1 --- Cargo.lock | 1698 +++++++++++++++++++-------------------- Cargo.toml | 47 +- examples/demo.rs | 18 +- src/apply_mutations.rs | 6 +- src/ecs_hooks.rs | 14 +- src/events.rs | 9 +- src/lib.rs | 9 +- src/parse_attributes.rs | 8 +- 8 files changed, 876 insertions(+), 933 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0bbae4d..bcd81f2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -41,7 +41,7 @@ checksum = "cd3b6ae1eabbfbced10e840fd3fce8a93ae84f174b3e4ba892ab7bcb42e477a7" dependencies = [ "accesskit", "accesskit_consumer", - "objc2", + "objc2 0.3.0-beta.3.patch-leaks.3", "once_cell", ] @@ -61,25 +61,17 @@ dependencies = [ [[package]] name = "accesskit_winit" -version = "0.15.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88e39fcec2e10971e188730b7a76bab60647dacc973d4591855ebebcadfaa738" +checksum = "45f8f7c9f66d454d5fd8e344c8c8c7324b57194e1041b955519fc58a01e77a25" dependencies = [ "accesskit", "accesskit_macos", "accesskit_windows", + "raw-window-handle 0.6.0", "winit", ] -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - [[package]] name = "adler" version = "1.0.2" @@ -88,20 +80,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.7.7" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "getrandom", @@ -149,20 +130,23 @@ dependencies = [ [[package]] name = "android-activity" -version = "0.4.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0" +checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" dependencies = [ "android-properties", - "bitflags 1.3.2", + "bitflags 2.4.1", "cc", + "cesu8", + "jni 0.21.1", "jni-sys", "libc", "log", - "ndk", + "ndk 0.8.0", "ndk-context", - "ndk-sys", - "num_enum 0.6.1", + "ndk-sys 0.5.0+25.2.9519653", + "num_enum 0.7.2", + "thiserror", ] [[package]] @@ -171,12 +155,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - [[package]] name = "android_log-sys" version = "0.3.1" @@ -213,6 +191,12 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +[[package]] +name = "as-raw-xcb-connection" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" + [[package]] name = "ash" version = "0.37.3+1.3.251" @@ -262,33 +246,23 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" dependencies = [ - "async-lock 3.2.0", + "async-lock", "async-task", "concurrent-queue", - "fastrand 2.0.1", - "futures-lite 2.1.0", + "fastrand", + "futures-lite", "slab", ] [[package]] name = "async-fs" -version = "1.6.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +checksum = "bc19683171f287921f2405677dd2ed2549c3b3bda697a563ebc3a121ace2aba1" dependencies = [ - "async-lock 2.8.0", - "autocfg", + "async-lock", "blocking", - "futures-lite 1.13.0", -] - -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", + "futures-lite", ] [[package]] @@ -316,7 +290,7 @@ checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.55", ] [[package]] @@ -331,27 +305,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - [[package]] name = "base64" version = "0.21.5" @@ -360,27 +313,30 @@ checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "bevy" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea370412c322af887c9115442d8f2ec991b652f163a1d8920ecaf08cae63f2bc" dependencies = [ "bevy_internal", ] [[package]] name = "bevy_a11y" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6192db480a04d4a0ad5d89a2fbd78ccca5ce902829a49ec2d1dbc213222ed8b1" dependencies = [ "accesskit", "bevy_app", - "bevy_derive 0.12.0", + "bevy_derive", "bevy_ecs", ] [[package]] name = "bevy_animation" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef3bbaf9233c428d8dd4b66a41b5381e41c67da860d9dc2118a8e6610ec874c" dependencies = [ "bevy_app", "bevy_asset", @@ -397,10 +353,11 @@ dependencies = [ [[package]] name = "bevy_app" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b508824497f3a3a2fab8398dc3944a4d4adddcc30ee25cd6d45b0a57336549ce" dependencies = [ - "bevy_derive 0.12.0", + "bevy_derive", "bevy_ecs", "bevy_reflect", "bevy_tasks", @@ -412,12 +369,13 @@ dependencies = [ [[package]] name = "bevy_asset" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf224b57fb65e1cde921afe0b343c2d595531dbf882c41abad01bbc665a05c4" dependencies = [ "async-broadcast", "async-fs", - "async-lock 2.8.0", + "async-lock", "bevy_app", "bevy_asset_macros", "bevy_ecs", @@ -430,7 +388,7 @@ dependencies = [ "crossbeam-channel", "downcast-rs", "futures-io", - "futures-lite 1.13.0", + "futures-lite", "js-sys", "parking_lot", "ron", @@ -443,36 +401,39 @@ dependencies = [ [[package]] name = "bevy_asset_macros" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "684c855651e7734740b76ada0e7daed116c46d393f9031cc45c4fe9ad5829548" dependencies = [ - "bevy_macro_utils 0.12.0", + "bevy_macro_utils", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.55", ] [[package]] name = "bevy_audio" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0af1796b7e56c2f49de5be72fb2aadb8f9310d6173d70040fd2eff1c7cb29009" dependencies = [ "bevy_app", "bevy_asset", - "bevy_derive 0.12.0", + "bevy_derive", "bevy_ecs", "bevy_math", "bevy_reflect", "bevy_transform", "bevy_utils", - "oboe", + "cpal", "rodio", ] [[package]] name = "bevy_core" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1a8f4722fb978d308b6311f3dd61f6885165055ad05ce3dfc1b2fd001bb017e" dependencies = [ "bevy_app", "bevy_ecs", @@ -485,13 +446,14 @@ dependencies = [ [[package]] name = "bevy_core_pipeline" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "568659c43c8f1805f434b5fc0f8e700c263391403f899312bb0e4bc8d8b9ca70" dependencies = [ "bevy_app", "bevy_asset", "bevy_core", - "bevy_derive 0.12.0", + "bevy_derive", "bevy_ecs", "bevy_log", "bevy_math", @@ -506,29 +468,20 @@ dependencies = [ [[package]] name = "bevy_derive" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" -dependencies = [ - "bevy_macro_utils 0.12.0", - "quote", - "syn 2.0.41", -] - -[[package]] -name = "bevy_derive" -version = "0.12.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f484318350462c58ba3942a45a656c1fd6b6e484a6b6b7abc3a787ad1a51e500" +checksum = "7de77523d154e220a740e568a89f52fac7de481374bdecbbbeb283a37580ba34" dependencies = [ - "bevy_macro_utils 0.12.1", + "bevy_macro_utils", "quote", - "syn 2.0.41", + "syn 2.0.55", ] [[package]] name = "bevy_diagnostic" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b5b031eeafc17bed997313ca15c8e4ed8b97fe2e9ef48e980833e4bf5cfa0e7" dependencies = [ "bevy_app", "bevy_core", @@ -536,6 +489,7 @@ dependencies = [ "bevy_log", "bevy_time", "bevy_utils", + "const-fnv1a-hash", "sysinfo", ] @@ -546,23 +500,21 @@ dependencies = [ "bevy", "bevy_mod_picking", "dioxus", - "dioxus-hot-reload", - "dioxus-rsx", ] [[package]] name = "bevy_ecs" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a027175613f630a51273c0f8ae909dd54ea3ce72eb573f456056553f79918ac" dependencies = [ - "async-channel 1.9.0", + "async-channel 2.1.1", "bevy_ecs_macros", "bevy_ptr", "bevy_reflect", "bevy_tasks", "bevy_utils", "downcast-rs", - "event-listener 2.5.3", "fixedbitset", "rustc-hash", "serde", @@ -572,61 +524,55 @@ dependencies = [ [[package]] name = "bevy_ecs_macros" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55dbbb6300f08cef5983497970db8545d3cbda6ee4f410a6c6742b7b6bbfd3af" dependencies = [ - "bevy_macro_utils 0.12.0", + "bevy_macro_utils", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.55", ] [[package]] name = "bevy_encase_derive" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df72ac1273fcdb8105736c42815442ae1291f1f577e34cb7e9d18f732103e2f0" dependencies = [ - "bevy_macro_utils 0.12.0", + "bevy_macro_utils", "encase_derive_impl", ] [[package]] name = "bevy_eventlistener" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8ee25ddf3d72e8501eb11d99870f7b6a484a111a91f52cef22c3e39302c9b0" -dependencies = [ - "bevy_eventlistener_core", - "bevy_eventlistener_derive", -] - -[[package]] -name = "bevy_eventlistener_core" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "790c6a7ff1f6857a2927becb24b24fe16817bb998903f44342e73c1ed720c369" +checksum = "d9d65c75b4f81818cacdc8a4302c5413910c5fb7727564deaf95e56e0dea4bd0" dependencies = [ "bevy_app", "bevy_ecs", + "bevy_eventlistener_derive", "bevy_hierarchy", "bevy_utils", ] [[package]] name = "bevy_eventlistener_derive" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1150b00713155ef8e9ba879ebbaaaaba43192eaf7fb87555ba1ceb21f71708" +checksum = "fa29be733a02a5d7ca4507ef15f294711c1a0884b9a9a2730640ff4e7d0200ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.55", ] [[package]] name = "bevy_gilrs" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02146d8a92ac322717185005a17b488e74b2ec08ca3f9eb8a7cadb7f0486cb70" dependencies = [ "bevy_app", "bevy_ecs", @@ -640,14 +586,17 @@ dependencies = [ [[package]] name = "bevy_gizmos" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66e9965860d505e2ea4144850904cefd8b528f59477061df8563194dc954ad58" dependencies = [ "bevy_app", "bevy_asset", "bevy_core", "bevy_core_pipeline", "bevy_ecs", + "bevy_gizmos_macros", + "bevy_log", "bevy_math", "bevy_pbr", "bevy_reflect", @@ -658,11 +607,24 @@ dependencies = [ ] [[package]] -name = "bevy_gltf" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +name = "bevy_gizmos_macros" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e689be764256a5a0d1f01c5f1dbaa3439e98a1338bf88b496db184d28e00c9" dependencies = [ - "base64 0.13.1", + "bevy_macro_utils", + "proc-macro2", + "quote", + "syn 2.0.55", +] + +[[package]] +name = "bevy_gltf" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0cd8fd1c1ce3a57ca96eaee05f406ad65865efd02606e5f288b5f7767d8c6f" +dependencies = [ + "base64", "bevy_animation", "bevy_app", "bevy_asset", @@ -688,8 +650,9 @@ dependencies = [ [[package]] name = "bevy_hierarchy" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b2999d1e5bb877b475c9b2d17643d5fb47fc4cc49ea48ba3ab5a6b00ed850a6" dependencies = [ "bevy_app", "bevy_core", @@ -697,26 +660,28 @@ dependencies = [ "bevy_log", "bevy_reflect", "bevy_utils", - "smallvec", ] [[package]] name = "bevy_input" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c22481e4290e2eca68b0c1f5f0a826f185d8f5e40e05c86bb6044dcfe3a04b3" dependencies = [ "bevy_app", "bevy_ecs", "bevy_math", "bevy_reflect", "bevy_utils", + "smol_str", "thiserror", ] [[package]] name = "bevy_internal" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ac9275cc7f4bce41dff1e62b853933e242f9e5c076d89f06156cf743097d6a0" dependencies = [ "bevy_a11y", "bevy_animation", @@ -725,7 +690,7 @@ dependencies = [ "bevy_audio", "bevy_core", "bevy_core_pipeline", - "bevy_derive 0.12.0", + "bevy_derive", "bevy_diagnostic", "bevy_ecs", "bevy_gilrs", @@ -753,8 +718,9 @@ dependencies = [ [[package]] name = "bevy_log" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20c7b4e2443654d68b6f8c54e5f1ce3a16c8a9af10f4832390dcae36c1323307" dependencies = [ "android_log-sys", "bevy_app", @@ -768,33 +734,22 @@ dependencies = [ [[package]] name = "bevy_macro_utils" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" -dependencies = [ - "proc-macro2", - "quote", - "rustc-hash", - "syn 2.0.41", - "toml_edit 0.20.7", -] - -[[package]] -name = "bevy_macro_utils" -version = "0.12.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e566640c6b6dced73d2006c764c2cffebe1a82be4809486c4a5d7b4b50efed4d" +checksum = "3bbbf88fc577a21ee9994feed2253ee9838b63fb976783b7a549edfbe07c6764" dependencies = [ "proc-macro2", "quote", "rustc-hash", - "syn 2.0.41", - "toml_edit 0.20.7", + "syn 2.0.55", + "toml_edit 0.21.1", ] [[package]] name = "bevy_math" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d30721f36a0b5f9ad39deb140c50b85cbbaefebab8d10bd20d9de1c9572f968" dependencies = [ "glam", "serde", @@ -802,42 +757,71 @@ dependencies = [ [[package]] name = "bevy_mikktspace" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc081a695c3513f09fdc640bf7f66cd73c47eb479da50312bf9710ee6927729d" dependencies = [ "glam", ] [[package]] name = "bevy_mod_picking" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2392df63bc272d5a546633e0a19ef6d428173e3dd22bad0da0a59c6fddd6f2cf" +checksum = "d79f17a34025d95e2e3525207ec73090647c6f40c3136fc674f87e167a9ae6be" dependencies = [ "bevy_app", "bevy_core", + "bevy_core_pipeline", "bevy_ecs", "bevy_eventlistener", "bevy_math", "bevy_picking_core", + "bevy_picking_highlight", "bevy_picking_input", + "bevy_picking_raycast", + "bevy_picking_selection", + "bevy_picking_sprite", "bevy_picking_ui", "bevy_reflect", "bevy_render", + "bevy_text", "bevy_ui", "bevy_utils", "bevy_window", ] +[[package]] +name = "bevy_mod_raycast" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ca646aeaab4a170e1f3e8284b925e2f990eb18616e95d7826c873c8e26ee945" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_derive", + "bevy_ecs", + "bevy_gizmos", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_sprite", + "bevy_transform", + "bevy_utils", + "bevy_window", + "crossbeam-channel", +] + [[package]] name = "bevy_pbr" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d90401eb58acb1c9627f11f75b076bfdeab2af9a4aea4540cb525efc5782b613" dependencies = [ "bevy_app", "bevy_asset", "bevy_core_pipeline", - "bevy_derive 0.12.0", + "bevy_derive", "bevy_ecs", "bevy_math", "bevy_reflect", @@ -848,7 +832,6 @@ dependencies = [ "bitflags 2.4.1", "bytemuck", "fixedbitset", - "naga_oil", "radsort", "smallvec", "thread_local", @@ -856,26 +839,44 @@ dependencies = [ [[package]] name = "bevy_picking_core" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0799488c4505d68886209afd77ff9c898b634abf7f97fffa8ae37a356cbc8ab2" +checksum = "41c8cdca408508a7d006bf077c6cbb6660a65895323333f206b7cce7b801a8e2" dependencies = [ "bevy_app", - "bevy_derive 0.12.1", + "bevy_derive", "bevy_ecs", "bevy_eventlistener", "bevy_math", "bevy_reflect", "bevy_render", + "bevy_transform", "bevy_utils", "bevy_window", ] [[package]] -name = "bevy_picking_input" -version = "0.17.0" +name = "bevy_picking_highlight" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16a2b375461e3965c2bd4357d53c772eeafa4747812f54be09de373c0c203da4" +checksum = "e684569b5f7dae06d1ff66e2287cee808b3862d9ae0d01dbe114d7d199d40cfd" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_ecs", + "bevy_pbr", + "bevy_picking_core", + "bevy_picking_selection", + "bevy_reflect", + "bevy_render", + "bevy_sprite", +] + +[[package]] +name = "bevy_picking_input" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60182209f48943de6c8bc3305a70f52012a18ef26f92f460f9436441b8badf0b" dependencies = [ "bevy_app", "bevy_ecs", @@ -883,6 +884,7 @@ dependencies = [ "bevy_input", "bevy_math", "bevy_picking_core", + "bevy_picking_selection", "bevy_reflect", "bevy_render", "bevy_utils", @@ -890,30 +892,82 @@ dependencies = [ ] [[package]] -name = "bevy_picking_ui" -version = "0.17.0" +name = "bevy_picking_raycast" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a020364f01021b1faf9cc4de85b592505440d5b6274fb39c9d9a916b7639872b" +checksum = "2677d0a3402fea3327a216649c104f969685a5c01d969d274c89facba86c164d" dependencies = [ "bevy_app", "bevy_ecs", + "bevy_mod_raycast", + "bevy_picking_core", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_window", +] + +[[package]] +name = "bevy_picking_selection" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc986eefd38058918322418d1e6ae398e74d48730e623a55dc20be78d5ee24b" +dependencies = [ + "bevy_app", + "bevy_ecs", + "bevy_eventlistener", + "bevy_input", + "bevy_picking_core", + "bevy_reflect", + "bevy_utils", +] + +[[package]] +name = "bevy_picking_sprite" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ac5309026e8c7f5aed2afec3aa2f21fb0a0487e9bb3d851860377891459df75" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_ecs", + "bevy_math", + "bevy_picking_core", + "bevy_render", + "bevy_sprite", + "bevy_transform", + "bevy_window", +] + +[[package]] +name = "bevy_picking_ui" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85ad6d40e33203115af38adc984341cf5637911baa940028b6a43a9917d64e79" +dependencies = [ + "bevy_app", + "bevy_ecs", + "bevy_hierarchy", "bevy_math", "bevy_picking_core", "bevy_render", "bevy_transform", "bevy_ui", + "bevy_utils", "bevy_window", ] [[package]] name = "bevy_ptr" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea003584000ef02b73800cc7cb62ee74792fff431e6a8df36863c43bf56fb491" [[package]] name = "bevy_reflect" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1101dbd44ae35e5c66802e46cfba1182e49f6163c824bee380d4acab5b2f640" dependencies = [ "bevy_math", "bevy_ptr", @@ -923,33 +977,34 @@ dependencies = [ "erased-serde", "glam", "serde", - "smallvec", "smol_str", "thiserror", ] [[package]] name = "bevy_reflect_derive" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2a8791d5841a6db862571f709d7ee70c2a5eb1634c3a4329817d04f0e307c2d" dependencies = [ - "bevy_macro_utils 0.12.0", + "bevy_macro_utils", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.55", "uuid", ] [[package]] name = "bevy_render" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75bbb48471f8cd06f5253e271f9b793695f5b821fc9d39a875497905578d9867" dependencies = [ - "async-channel 1.9.0", + "async-channel 2.1.1", "bevy_app", "bevy_asset", "bevy_core", - "bevy_derive 0.12.0", + "bevy_derive", "bevy_ecs", "bevy_encase_derive", "bevy_hierarchy", @@ -968,7 +1023,7 @@ dependencies = [ "codespan-reporting", "downcast-rs", "encase", - "futures-lite 1.13.0", + "futures-lite", "hexasphere", "image", "js-sys", @@ -977,7 +1032,6 @@ dependencies = [ "naga_oil", "ruzstd", "serde", - "smallvec", "thiserror", "thread_local", "wasm-bindgen", @@ -987,30 +1041,31 @@ dependencies = [ [[package]] name = "bevy_render_macros" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffd61a89e7a1b55c78a0aef1fcadd0247fe74a101c00f831791db73d63465051" dependencies = [ - "bevy_macro_utils 0.12.0", + "bevy_macro_utils", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.55", ] [[package]] name = "bevy_scene" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368b989251241efb590976e309e4778ed9d04eb896c37ea6b874a374432a0b3e" dependencies = [ "bevy_app", "bevy_asset", - "bevy_derive 0.12.0", + "bevy_derive", "bevy_ecs", "bevy_hierarchy", "bevy_reflect", "bevy_render", "bevy_transform", "bevy_utils", - "ron", "serde", "thiserror", "uuid", @@ -1018,13 +1073,14 @@ dependencies = [ [[package]] name = "bevy_sprite" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f52d807086d2c92bc37ee770aa6dbb442b62cdc5665b9c6dd32629b8fae05e4" dependencies = [ "bevy_app", "bevy_asset", "bevy_core_pipeline", - "bevy_derive 0.12.0", + "bevy_derive", "bevy_ecs", "bevy_log", "bevy_math", @@ -1043,21 +1099,23 @@ dependencies = [ [[package]] name = "bevy_tasks" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40be36aeec06b8f0eb87894922c6a7fbd8f2a5c8e77dcb9dcbf77641046988c0" dependencies = [ - "async-channel 1.9.0", + "async-channel 2.1.1", "async-executor", "async-task", "concurrent-queue", - "futures-lite 1.13.0", + "futures-lite", "wasm-bindgen-futures", ] [[package]] name = "bevy_text" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48f0e51919e13c0c39ecdffcf843e8a8d95fd8861023b02b3ee486d3fa4b6003" dependencies = [ "ab_glyph", "bevy_app", @@ -1077,8 +1135,9 @@ dependencies = [ [[package]] name = "bevy_time" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06fc48cf59acd2b1c52e61787b5bb3db1a0f923cc6ccc68c0d8ab2b5894cfd28" dependencies = [ "bevy_app", "bevy_ecs", @@ -1090,8 +1149,9 @@ dependencies = [ [[package]] name = "bevy_transform" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b962ae4253f5413b64a839ab8e8d63bc3e3db45f41d06b6ddc7886acdcb5d0f5" dependencies = [ "bevy_app", "bevy_ecs", @@ -1103,14 +1163,15 @@ dependencies = [ [[package]] name = "bevy_ui" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3449b963573a56b484cf4f8883f1b5b8eaccaaeda8f28a70c006e3291450f77" dependencies = [ "bevy_a11y", "bevy_app", "bevy_asset", "bevy_core_pipeline", - "bevy_derive 0.12.0", + "bevy_derive", "bevy_ecs", "bevy_hierarchy", "bevy_input", @@ -1124,43 +1185,45 @@ dependencies = [ "bevy_utils", "bevy_window", "bytemuck", - "serde", - "smallvec", "taffy", "thiserror", ] [[package]] name = "bevy_utils" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac758c2e8509a4a260b7a91f920be3beee6ab9e76e388494240ac5d672779159" dependencies = [ - "ahash 0.8.6", + "ahash", "bevy_utils_proc_macros", "getrandom", - "hashbrown 0.14.3", - "instant", + "hashbrown", "nonmax", "petgraph", + "smallvec", "thiserror", "tracing", "uuid", + "web-time", ] [[package]] name = "bevy_utils_proc_macros" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "014c80f466ed01821a2e602d63cd5076915c1af5de5fa3c074cc4a9ca898ada7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.55", ] [[package]] name = "bevy_window" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa0c2a1e580b3b0ad0c928a5e250c8375c6a8a70d8b0f483b23d3bf5b670cc1a" dependencies = [ "bevy_a11y", "bevy_app", @@ -1169,19 +1232,21 @@ dependencies = [ "bevy_math", "bevy_reflect", "bevy_utils", - "raw-window-handle", + "raw-window-handle 0.6.0", + "smol_str", ] [[package]] name = "bevy_winit" -version = "0.12.0" -source = "git+https://github.com/JMS55/bevy?branch=query_new_12#2dc833144dffd98bf4633fb206f2c30e7f92bdb6" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2c408d459172758a4cfa37e3452d4ea0898101ec2b6d92aa3eb698511bef389" dependencies = [ "accesskit_winit", "approx", "bevy_a11y", "bevy_app", - "bevy_derive 0.12.0", + "bevy_derive", "bevy_ecs", "bevy_hierarchy", "bevy_input", @@ -1190,7 +1255,7 @@ dependencies = [ "bevy_utils", "bevy_window", "crossbeam-channel", - "raw-window-handle", + "raw-window-handle 0.6.0", "wasm-bindgen", "web-sys", "winit", @@ -1213,7 +1278,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.41", + "syn 2.0.55", ] [[package]] @@ -1271,7 +1336,16 @@ version = "0.1.0-beta.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146" dependencies = [ - "objc-sys", + "objc-sys 0.2.0-beta.2", +] + +[[package]] +name = "block-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" +dependencies = [ + "objc-sys 0.3.2", ] [[package]] @@ -1280,8 +1354,18 @@ version = "0.2.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42" dependencies = [ - "block-sys", - "objc2-encode", + "block-sys 0.1.0-beta.1", + "objc2-encode 2.0.0-pre.2", +] + +[[package]] +name = "block2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +dependencies = [ + "block-sys 0.2.1", + "objc2 0.4.1", ] [[package]] @@ -1291,25 +1375,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ "async-channel 2.1.1", - "async-lock 3.2.0", + "async-lock", "async-task", - "fastrand 2.0.1", + "fastrand", "futures-io", - "futures-lite 2.1.0", + "futures-lite", "piper", "tracing", ] -[[package]] -name = "bstr" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" -dependencies = [ - "memchr", - "serde", -] - [[package]] name = "bumpalo" version = "3.14.0" @@ -1333,7 +1407,7 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.55", ] [[package]] @@ -1349,34 +1423,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] -name = "camino" -version = "1.1.6" +name = "calloop" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e34637b3140142bdf929fb439e8aa4ebad7651ebf7b1080b3930aa16ac1459ff" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", + "bitflags 2.4.1", + "log", + "polling", + "rustix", + "slab", "thiserror", ] @@ -1405,15 +1461,6 @@ dependencies = [ "nom", ] -[[package]] -name = "cfg-expr" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bbc13bf6290a6b202cc3efb36f7ec2b739a80634215630c8053a313edf6abef" -dependencies = [ - "smallvec", -] - [[package]] name = "cfg-if" version = "1.0.0" @@ -1426,18 +1473,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" -[[package]] -name = "chrono" -version = "0.4.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "num-traits", - "windows-targets 0.48.5", -] - [[package]] name = "clang-sys" version = "1.6.1" @@ -1466,10 +1501,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] -name = "com-rs" -version = "0.2.1" +name = "com" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" +checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6" +dependencies = [ + "com_macros", +] + +[[package]] +name = "com_macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" +dependencies = [ + "com_macros_support", + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "com_macros_support" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] name = "combine" @@ -1500,6 +1560,12 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "const-fnv1a-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b13ea120a812beba79e34316b3942a857c86ec1593cb34f27bb28272ce2cca" + [[package]] name = "const_panic" version = "0.2.8" @@ -1551,14 +1617,14 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" -version = "0.22.3" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" dependencies = [ "bitflags 1.3.2", "core-foundation", "core-graphics-types", - "foreign-types 0.3.2", + "foreign-types", "libc", ] @@ -1607,7 +1673,7 @@ dependencies = [ "js-sys", "libc", "mach2", - "ndk", + "ndk 0.7.0", "ndk-context", "oboe", "once_cell", @@ -1637,30 +1703,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - [[package]] name = "crossbeam-utils" version = "0.8.16" @@ -1671,10 +1713,16 @@ dependencies = [ ] [[package]] -name = "d3d12" -version = "0.7.0" +name = "cursor-icon" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] +name = "d3d12" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307" dependencies = [ "bitflags 2.4.1", "libloading 0.8.1", @@ -1701,7 +1749,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.55", ] [[package]] @@ -1712,7 +1760,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.41", + "syn 2.0.55", ] [[package]] @@ -1727,22 +1775,36 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "dioxus" version = "0.4.3" -source = "git+https://github.com/ealmloff/dioxus?branch=fix-event-bubbling#7b45a3a98bde103e5c86a469159e2432da96bdda" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d9e3b0725e520250bf23213f996d241cca29cea4360a9bf08a44e0033f8e569" dependencies = [ "dioxus-core", "dioxus-core-macro", "dioxus-hooks", "dioxus-hot-reload", + "dioxus-html", "dioxus-rsx", ] [[package]] name = "dioxus-core" version = "0.4.3" -source = "git+https://github.com/ealmloff/dioxus?branch=fix-event-bubbling#7b45a3a98bde103e5c86a469159e2432da96bdda" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f33186615b2e90bceab24a195b3cfad4e0b4d91a33ec44a94845876bfb25c13" dependencies = [ "bumpalo", "futures-channel", @@ -1758,7 +1820,8 @@ dependencies = [ [[package]] name = "dioxus-core-macro" version = "0.4.3" -source = "git+https://github.com/ealmloff/dioxus?branch=fix-event-bubbling#7b45a3a98bde103e5c86a469159e2432da96bdda" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21afaccb28587aed0ba98856335912f5ce7052c0aafa74b213829a3b8bfd2345" dependencies = [ "constcat", "dioxus-core", @@ -1766,7 +1829,7 @@ dependencies = [ "prettyplease", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.55", ] [[package]] @@ -1778,7 +1841,8 @@ checksum = "2ea539174bb236e0e7dc9c12b19b88eae3cb574dedbd0252a2d43ea7e6de13e2" [[package]] name = "dioxus-hooks" version = "0.4.3" -source = "git+https://github.com/ealmloff/dioxus?branch=fix-event-bubbling#7b45a3a98bde103e5c86a469159e2432da96bdda" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bb23ce82df4fb13e9ddaa01d1469f1f32d683dd4636204bd0a0eaf434b65946" dependencies = [ "dioxus-core", "dioxus-debug-cell", @@ -1791,17 +1855,13 @@ dependencies = [ [[package]] name = "dioxus-hot-reload" version = "0.4.3" -source = "git+https://github.com/ealmloff/dioxus?branch=fix-event-bubbling#7b45a3a98bde103e5c86a469159e2432da96bdda" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7d8c9e89e866a6b84b8ad696f0ff2f6f6563d2235eb99acc6952f19e516cc09" dependencies = [ - "chrono", "dioxus-core", "dioxus-html", "dioxus-rsx", - "execute", - "ignore", "interprocess-docfix", - "notify", - "once_cell", "serde", "serde_json", ] @@ -1809,7 +1869,8 @@ dependencies = [ [[package]] name = "dioxus-html" version = "0.4.3" -source = "git+https://github.com/ealmloff/dioxus?branch=fix-event-bubbling#7b45a3a98bde103e5c86a469159e2432da96bdda" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "828a42a2d70688a2412a8538c8b5a5eceadf68f682f899dc4455a0169db39dfd" dependencies = [ "async-channel 1.9.0", "async-trait", @@ -1827,15 +1888,13 @@ dependencies = [ [[package]] name = "dioxus-rsx" version = "0.4.3" -source = "git+https://github.com/ealmloff/dioxus?branch=fix-event-bubbling#7b45a3a98bde103e5c86a469159e2432da96bdda" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c974133c7c95497a486d587e40449927711430b308134b9cd374b8d35eceafb3" dependencies = [ "dioxus-core", - "internment", - "krates", "proc-macro2", "quote", - "syn 2.0.41", - "tracing", + "syn 2.0.55", ] [[package]] @@ -1844,6 +1903,15 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.1", +] + [[package]] name = "downcast-rs" version = "1.2.0" @@ -1852,9 +1920,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "encase" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fce2eeef77fd4a293a54b62aa00ac9daebfbcda4bf8998c5a815635b004aa1c" +checksum = "95ed933078d2e659745df651f4c180511cd582e5b9414ff896e7d50d207e3103" dependencies = [ "const_panic", "encase_derive", @@ -1864,22 +1932,22 @@ dependencies = [ [[package]] name = "encase_derive" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e520cde08cbf4f7cc097f61573ec06ce467019803de8ae82fb2823fa1554a0e" +checksum = "f4ce1449c7d19eba6cc0abd231150ad81620a8dce29601d7f8d236e5d431d72a" dependencies = [ "encase_derive_impl", ] [[package]] name = "encase_derive_impl" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fe2568f851fd6144a45fa91cfed8fe5ca8fc0b56ba6797bfc1ed2771b90e37c" +checksum = "92959a9e8d13eaa13b8ae8c7b583c3bf1669ca7a8e7708a088d12587ba86effc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.55", ] [[package]] @@ -1900,7 +1968,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.55", ] [[package]] @@ -1911,13 +1979,23 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "erased-serde" -version = "0.3.31" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" +checksum = "2b73807008a3c7f171cc40312f37d95ef0396e048b5848d775f54b1a4dd4a0d3" dependencies = [ "serde", ] +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "euclid" version = "0.22.9" @@ -1955,52 +2033,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "execute" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a82608ee96ce76aeab659e9b8d3c2b787bffd223199af88c674923d861ada10" -dependencies = [ - "execute-command-macro", - "execute-command-tokens", - "generic-array", -] - -[[package]] -name = "execute-command-macro" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90dec53d547564e911dc4ff3ecb726a64cf41a6fa01a2370ebc0d95175dd08bd" -dependencies = [ - "execute-command-macro-impl", -] - -[[package]] -name = "execute-command-macro-impl" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce8cd46a041ad005ab9c71263f9a0ff5b529eac0fe4cc9b4a20f4f0765d8cf4b" -dependencies = [ - "execute-command-tokens", - "quote", - "syn 2.0.41", -] - -[[package]] -name = "execute-command-tokens" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69dc321eb6be977f44674620ca3aa21703cb20ffbe560e1ae97da08401ffbcad" - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - [[package]] name = "fastrand" version = "2.0.1" @@ -2016,18 +2048,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "filetime" -version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", -] - [[package]] name = "fixedbitset" version = "0.4.2" @@ -2050,15 +2070,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared 0.1.1", -] - [[package]] name = "foreign-types" version = "0.5.0" @@ -2066,7 +2077,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" dependencies = [ "foreign-types-macros", - "foreign-types-shared 0.3.1", + "foreign-types-shared", ] [[package]] @@ -2077,30 +2088,15 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.55", ] -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "foreign-types-shared" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" -[[package]] -name = "fsevent-sys" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" -dependencies = [ - "libc", -] - [[package]] name = "futures-channel" version = "0.3.29" @@ -2122,28 +2118,13 @@ version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - [[package]] name = "futures-lite" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" dependencies = [ - "fastrand 2.0.1", + "fastrand", "futures-core", "futures-io", "parking", @@ -2169,12 +2150,13 @@ dependencies = [ ] [[package]] -name = "generic-array" -version = "1.0.0" +name = "gethostname" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe739944a5406424e080edccb6add95685130b9f160d5407c639c7df0c5836b0" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" dependencies = [ - "typenum", + "libc", + "windows-targets 0.48.5", ] [[package]] @@ -2210,7 +2192,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "178769da179a47b187837d1ab2b5b9b684a21180166a77a4ca37e7e58ee3833d" dependencies = [ "core-foundation", - "inotify 0.10.2", + "inotify", "io-kit-sys", "js-sys", "libc", @@ -2225,16 +2207,21 @@ dependencies = [ ] [[package]] -name = "gimli" -version = "0.28.1" +name = "gl_generator" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] [[package]] name = "glam" -version = "0.24.2" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" +checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3" dependencies = [ "bytemuck", "serde", @@ -2246,24 +2233,11 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -[[package]] -name = "globset" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" -dependencies = [ - "aho-corasick", - "bstr", - "log", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", -] - [[package]] name = "glow" -version = "0.12.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" dependencies = [ "js-sys", "slotmap", @@ -2273,32 +2247,33 @@ dependencies = [ [[package]] name = "gltf" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad2dcfb6dd7a66f9eb3d181a29dcfb22d146b0bcdc2e1ed1713cbf03939a88ea" +checksum = "3b78f069cf941075835822953c345b9e1edd67ae347b81ace3aea9de38c2ef33" dependencies = [ "byteorder", "gltf-json", "lazy_static", + "serde_json", ] [[package]] name = "gltf-derive" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cbcea5dd47e7ad4e9ee6f040384fcd7204bbf671aa4f9e7ca7dfc9bfa1de20" +checksum = "438ffe1a5540d75403feaf23636b164e816e93f6f03131674722b3886ce32a57" dependencies = [ "inflections", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.55", ] [[package]] name = "gltf-json" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5b810806b78dde4b71a95cc0e6fdcab34c4c617da3574df166f9987be97d03" +checksum = "655951ba557f2bc69ea4b0799446bae281fa78efae6319968bdd2c3e9a06d8e1" dependencies = [ "gltf-derive", "serde", @@ -2306,6 +2281,15 @@ dependencies = [ "serde_json", ] +[[package]] +name = "glutin_wgl_sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +dependencies = [ + "gl_generator", +] + [[package]] name = "glyph_brush_layout" version = "0.2.3" @@ -2338,15 +2322,15 @@ dependencies = [ [[package]] name = "gpu-allocator" -version = "0.22.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8" +checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" dependencies = [ - "backtrace", "log", + "presser", "thiserror", "winapi", - "windows 0.44.0", + "windows 0.52.0", ] [[package]] @@ -2357,7 +2341,7 @@ checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" dependencies = [ "bitflags 2.4.1", "gpu-descriptor-types", - "hashbrown 0.14.3", + "hashbrown", ] [[package]] @@ -2385,36 +2369,27 @@ dependencies = [ "svg_fmt", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.7", -] - [[package]] name = "hashbrown" version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ - "ahash 0.8.6", + "ahash", "allocator-api2", "serde", ] [[package]] name = "hassle-rs" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" +checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" dependencies = [ - "bitflags 1.3.2", - "com-rs", + "bitflags 2.4.1", + "com", "libc", - "libloading 0.7.4", + "libloading 0.8.1", "thiserror", "widestring", "winapi", @@ -2422,9 +2397,9 @@ dependencies = [ [[package]] name = "hexasphere" -version = "9.1.0" +version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cb3df16a7bcb1b5bc092abd55e14f77ca70aea14445026e264586fc62889a10" +checksum = "f33ddb7f7143d9e703c072e88b98cd8b9719f174137a671429351bd2ee43c02a" dependencies = [ "constgebra", "glam", @@ -2437,26 +2412,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" [[package]] -name = "iana-time-zone" -version = "0.1.58" +name = "icrate" +version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", + "block2 0.3.0", + "dispatch", + "objc2 0.4.1", ] [[package]] @@ -2465,22 +2428,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "ignore" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060" -dependencies = [ - "crossbeam-deque", - "globset", - "log", - "memchr", - "regex-automata 0.4.3", - "same-file", - "walkdir", - "winapi-util", -] - [[package]] name = "image" version = "0.24.7" @@ -2495,16 +2442,6 @@ dependencies = [ "png", ] -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - [[package]] name = "indexmap" version = "2.1.0" @@ -2512,7 +2449,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown", ] [[package]] @@ -2521,17 +2458,6 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a" -[[package]] -name = "inotify" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" -dependencies = [ - "bitflags 1.3.2", - "inotify-sys", - "libc", -] - [[package]] name = "inotify" version = "0.10.2" @@ -2552,28 +2478,6 @@ dependencies = [ "libc", ] -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "internment" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e976188335292f66a1533fd41d5c2ce24b32dc2c000569b8dccf4e57f489806" -dependencies = [ - "hashbrown 0.12.3", - "parking_lot", -] - [[package]] name = "interprocess-docfix" version = "1.2.2" @@ -2644,6 +2548,22 @@ dependencies = [ "walkdir", ] +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + [[package]] name = "jni-sys" version = "0.3.0" @@ -2661,9 +2581,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -2681,46 +2601,20 @@ dependencies = [ [[package]] name = "khronos-egl" -version = "4.1.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.7.4", + "libloading 0.8.1", "pkg-config", ] [[package]] -name = "kqueue" -version = "1.0.8" +name = "khronos_api" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" -dependencies = [ - "kqueue-sys", - "libc", -] - -[[package]] -name = "kqueue-sys" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" -dependencies = [ - "bitflags 1.3.2", - "libc", -] - -[[package]] -name = "krates" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942c43a6cba1c201dfe81a943c89fa5c9140b34993e0c027f542c80b92e319a7" -dependencies = [ - "cargo_metadata", - "cfg-expr", - "petgraph", - "semver", -] +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] name = "ktx2" @@ -2801,6 +2695,12 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + [[package]] name = "lock_api" version = "0.4.11" @@ -2856,25 +2756,16 @@ version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - [[package]] name = "metal" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "623b5e6cefd76e58f774bd3cc0c6f5c7615c58c03a97815245a25c3c9bdee318" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" dependencies = [ "bitflags 2.4.1", "block", "core-graphics-types", - "foreign-types 0.5.0", + "foreign-types", "log", "objc", "paste", @@ -2896,29 +2787,17 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "mio" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys 0.48.0", -] - [[package]] name = "naga" -version = "0.13.0" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ceaaa4eedaece7e4ec08c55c640ba03dbb73fb812a6570a59bcf1930d0f70e" +checksum = "50e3524642f53d9af419ab5e8dd29d3ba155708267667c2f3f06c88c9e130843" dependencies = [ "bit-set", "bitflags 2.4.1", "codespan-reporting", "hexf-parse", - "indexmap 1.9.3", + "indexmap", "log", "num-traits", "pp-rs", @@ -2931,18 +2810,18 @@ dependencies = [ [[package]] name = "naga_oil" -version = "0.10.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac54c77b3529887f9668d3dd81e955e58f252b31a333f836e3548c06460b958" +checksum = "c0ea62ae0f2787456afca7209ca180522b41f00cbe159ee369eba1e07d365cd1" dependencies = [ "bit-set", "codespan-reporting", "data-encoding", - "indexmap 1.9.3", + "indexmap", "naga", "once_cell", "regex", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", "rustc-hash", "thiserror", "tracing", @@ -2957,9 +2836,24 @@ checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" dependencies = [ "bitflags 1.3.2", "jni-sys", - "ndk-sys", + "ndk-sys 0.4.1+23.1.7779620", "num_enum 0.5.11", - "raw-window-handle", + "raw-window-handle 0.5.2", + "thiserror", +] + +[[package]] +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.4.1", + "jni-sys", + "log", + "ndk-sys 0.5.0+25.2.9519653", + "num_enum 0.7.2", + "raw-window-handle 0.6.0", "thiserror", ] @@ -2978,6 +2872,15 @@ dependencies = [ "jni-sys", ] +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + [[package]] name = "nix" version = "0.24.3" @@ -3016,24 +2919,6 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "610a5acd306ec67f907abe5567859a3c693fb9886eb1f012ab8f2a47bef3db51" -[[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 0.9.6", - "kqueue", - "libc", - "mio", - "walkdir", - "windows-sys 0.45.0", -] - [[package]] name = "ntapi" version = "0.4.1" @@ -3105,11 +2990,11 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.6.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ - "num_enum_derive 0.6.1", + "num_enum_derive 0.7.2", ] [[package]] @@ -3126,14 +3011,14 @@ dependencies = [ [[package]] name = "num_enum_derive" -version = "0.6.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.55", ] [[package]] @@ -3152,15 +3037,31 @@ version = "0.2.0-beta.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" +[[package]] +name = "objc-sys" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c71324e4180d0899963fc83d9d241ac39e699609fc1025a850aadac8257459" + [[package]] name = "objc2" version = "0.3.0-beta.3.patch-leaks.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468" dependencies = [ - "block2", - "objc-sys", - "objc2-encode", + "block2 0.2.0-alpha.6", + "objc-sys 0.2.0-beta.2", + "objc2-encode 2.0.0-pre.2", +] + +[[package]] +name = "objc2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +dependencies = [ + "objc-sys 0.3.2", + "objc2-encode 3.0.0", ] [[package]] @@ -3169,9 +3070,15 @@ version = "2.0.0-pre.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" dependencies = [ - "objc-sys", + "objc-sys 0.2.0-beta.2", ] +[[package]] +name = "objc2-encode" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" + [[package]] name = "objc_exception" version = "0.1.2" @@ -3181,15 +3088,6 @@ dependencies = [ "cc", ] -[[package]] -name = "object" -version = "0.32.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" -dependencies = [ - "memchr", -] - [[package]] name = "oboe" version = "0.5.0" @@ -3197,7 +3095,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0" dependencies = [ "jni 0.20.0", - "ndk", + "ndk 0.7.0", "ndk-context", "num-derive", "num-traits", @@ -3315,7 +3213,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.1.0", + "indexmap", ] [[package]] @@ -3337,7 +3235,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand", "futures-io", ] @@ -3360,6 +3258,20 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "polling" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30054e72317ab98eddd8561db0f6524df3367636884b7b21b703e4b280a84a14" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "pp-rs" version = "0.2.1" @@ -3369,6 +3281,12 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "presser" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" + [[package]] name = "prettyplease" version = "0.2.15" @@ -3376,7 +3294,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.41", + "syn 2.0.55", ] [[package]] @@ -3391,9 +3309,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -3406,9 +3324,9 @@ checksum = "1de09527cd2ea2c2d59fb6c2f8c1ab8c71709ed9d1b6d60b0e1c9fbb6fdcb33c" [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -3431,6 +3349,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" +[[package]] +name = "raw-window-handle" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" + [[package]] name = "rectangle-pack" version = "0.4.2" @@ -3493,12 +3417,6 @@ version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" -[[package]] -name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - [[package]] name = "regex-syntax" version = "0.8.2" @@ -3527,18 +3445,12 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ - "base64 0.21.5", + "base64", "bitflags 2.4.1", "serde", "serde_derive", ] -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - [[package]] name = "rustc-hash" version = "1.1.0" @@ -3555,13 +3467,26 @@ dependencies = [ ] [[package]] -name = "ruzstd" -version = "0.4.0" +name = "rustix" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "ruzstd" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d" dependencies = [ "byteorder", - "thiserror-core", + "derive_more", "twox-hash", ] @@ -3591,15 +3516,12 @@ name = "semver" version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" -dependencies = [ - "serde", -] [[package]] name = "serde" -version = "1.0.193" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] @@ -3616,13 +3538,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.55", ] [[package]] @@ -3644,7 +3566,7 @@ checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.55", ] [[package]] @@ -3721,12 +3643,11 @@ dependencies = [ [[package]] name = "spirv" -version = "0.2.0+1.5.4" +version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 1.3.2", - "num-traits", + "bitflags 2.4.1", ] [[package]] @@ -3754,9 +3675,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.41" +version = "2.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" +checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0" dependencies = [ "proc-macro2", "quote", @@ -3765,16 +3686,16 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.29.11" +version = "0.30.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" +checksum = "1fb4f3438c8f6389c864e61221cbc97e9bca98b4daf39a5beb7bea660f528bb2" dependencies = [ "cfg-if", "core-foundation-sys", "libc", "ntapi", "once_cell", - "winapi", + "windows 0.52.0", ] [[package]] @@ -3791,51 +3712,31 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] -[[package]] -name = "thiserror-core" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c001ee18b7e5e3f62cbf58c7fe220119e68d902bb7443179c0c8aef30090e999" -dependencies = [ - "thiserror-core-impl", -] - -[[package]] -name = "thiserror-core-impl" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c60d69f36615a077cc7663b9cb8e42275722d23e58a7fa3d2c7f2915d09d04" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.41", -] - [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.55", ] [[package]] @@ -3881,18 +3782,18 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.1.0", + "indexmap", "toml_datetime", "winnow", ] [[package]] name = "toml_edit" -version = "0.20.7" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.1.0", + "indexmap", "toml_datetime", "winnow", ] @@ -3916,7 +3817,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.55", ] [[package]] @@ -3996,12 +3897,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - [[package]] name = "unicode-ident" version = "1.0.12" @@ -4054,12 +3949,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "waker-fn" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" - [[package]] name = "walkdir" version = "2.4.0" @@ -4078,9 +3967,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4088,24 +3977,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.55", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -4115,9 +4004,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4125,39 +4014,38 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.55", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" - -[[package]] -name = "wayland-scanner" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" -dependencies = [ - "proc-macro2", - "quote", - "xml-rs", -] +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" dependencies = [ "js-sys", "wasm-bindgen", @@ -4165,18 +4053,19 @@ dependencies = [ [[package]] name = "wgpu" -version = "0.17.2" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "752e44d3998ef35f71830dd1ad3da513e628e2e4d4aedb0ab580f850827a0b41" +checksum = "a4b1213b52478a7631d6e387543ed8f642bc02c578ef4e3b49aca2a29a7df0cb" dependencies = [ "arrayvec", "cfg-if", + "cfg_aliases", "js-sys", "log", "naga", "parking_lot", "profiling", - "raw-window-handle", + "raw-window-handle 0.6.0", "smallvec", "static_assertions", "wasm-bindgen", @@ -4189,19 +4078,22 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.17.1" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f8a44dd301a30ceeed3c27d8c0090433d3da04d7b2a4042738095a424d12ae7" +checksum = "f9f6b033c2f00ae0bc8ea872c5989777c60bc241aac4e58b24774faa8b391f78" dependencies = [ "arrayvec", "bit-vec", "bitflags 2.4.1", + "cfg_aliases", "codespan-reporting", + "indexmap", "log", "naga", + "once_cell", "parking_lot", "profiling", - "raw-window-handle", + "raw-window-handle 0.6.0", "rustc-hash", "smallvec", "thiserror", @@ -4212,9 +4104,9 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.17.2" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a80bf0e3c77399bb52850cb0830af9bad073d5cfcb9dd8253bef8125c42db17" +checksum = "49f972c280505ab52ffe17e94a7413d9d54b58af0114ab226b9fc4999a47082e" dependencies = [ "android_system_properties", "arrayvec", @@ -4222,9 +4114,11 @@ dependencies = [ "bit-set", "bitflags 2.4.1", "block", + "cfg_aliases", "core-graphics-types", "d3d12", "glow", + "glutin_wgl_sys", "gpu-alloc", "gpu-allocator", "gpu-descriptor", @@ -4236,11 +4130,13 @@ dependencies = [ "log", "metal", "naga", + "ndk-sys 0.5.0+25.2.9519653", "objc", + "once_cell", "parking_lot", "profiling", "range-alloc", - "raw-window-handle", + "raw-window-handle 0.6.0", "renderdoc-sys", "rustc-hash", "smallvec", @@ -4253,9 +4149,9 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.17.0" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee64d7398d0c2f9ca48922c902ef69c42d000c759f3db41e355f4a570b052b67" +checksum = "b671ff9fb03f78b46ff176494ee1ebe7d603393f42664be55b64dc8d53969805" dependencies = [ "bitflags 2.4.1", "js-sys", @@ -4299,15 +4195,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.44.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" -dependencies = [ - "windows-targets 0.42.2", -] - [[package]] name = "windows" version = "0.46.0" @@ -4334,10 +4221,20 @@ version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ - "windows-core", + "windows-core 0.51.1", "windows-targets 0.48.5", ] +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core 0.52.0", + "windows-targets 0.52.0", +] + [[package]] name = "windows-core" version = "0.51.1" @@ -4347,6 +4244,15 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", +] + [[package]] name = "windows-implement" version = "0.48.0" @@ -4569,32 +4475,42 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winit" -version = "0.28.7" +version = "0.29.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94" +checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" dependencies = [ "android-activity", - "bitflags 1.3.2", + "atomic-waker", + "bitflags 2.4.1", + "bytemuck", + "calloop", "cfg_aliases", "core-foundation", "core-graphics", - "dispatch", - "instant", + "cursor-icon", + "icrate", + "js-sys", "libc", "log", - "mio", - "ndk", - "objc2", + "ndk 0.8.0", + "ndk-sys 0.5.0+25.2.9519653", + "objc2 0.4.1", "once_cell", "orbclient", "percent-encoding", - "raw-window-handle", + "raw-window-handle 0.6.0", "redox_syscall 0.3.5", + "rustix", + "smol_str", + "unicode-segmentation", "wasm-bindgen", - "wayland-scanner", + "wasm-bindgen-futures", "web-sys", - "windows-sys 0.45.0", + "web-time", + "windows-sys 0.48.0", "x11-dl", + "x11rb", + "xkbcommon-dl", ] [[package]] @@ -4617,12 +4533,52 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "x11rb" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" +dependencies = [ + "as-raw-xcb-connection", + "gethostname", + "libc", + "libloading 0.8.1", + "once_cell", + "rustix", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" + [[package]] name = "xi-unicode" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" +[[package]] +name = "xkbcommon-dl" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" +dependencies = [ + "bitflags 2.4.1", + "dlib", + "log", + "once_cell", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" + [[package]] name = "xml-rs" version = "0.8.19" @@ -4631,20 +4587,20 @@ checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" [[package]] name = "zerocopy" -version = "0.7.30" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "306dca4455518f1f31635ec308b6b3e4eb1b11758cefafc782827d0aa7acb5c7" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.30" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be912bf68235a88fbefd1b73415cb218405958d1655b2ece9035a19920bdf6ba" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.41", + "syn 2.0.55", ] diff --git a/Cargo.toml b/Cargo.toml index 4357a3a..4e5fb8c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,38 +4,25 @@ version = "0.1.0" edition = "2021" [dependencies] -bevy = { git = "https://github.com/JMS55/bevy", branch = "query_new_12" } -dioxus = { git = "https://github.com/ealmloff/dioxus", branch = "fix-event-bubbling", default-features = false, features = [ - "macro", - "hooks", -] } -dioxus-rsx = { git = "https://github.com/ealmloff/dioxus", branch = "fix-event-bubbling", default-features = false, features = [ - "hot_reload", -], optional = true } -dioxus-hot-reload = { git = "https://github.com/ealmloff/dioxus", branch = "fix-event-bubbling", default-features = false, features = [ - "custom_file_watcher", -], optional = true } -bevy_mod_picking = { version = "0.17", default-features = false, features = [ - "backend_bevy_ui", -] } +bevy = "0.13.1" +bevy_mod_picking = "0.18.2" +dioxus = "0.4.3" +#dioxus = { git = "https://github.com/ealmloff/dioxus", branch = "fix-event-bubbling", default-features = false, features = [ +# "macro", +# "hooks", +#] } +#dioxus-rsx = { git = "https://github.com/ealmloff/dioxus", branch = "fix-event-bubbling", default-features = false, features = [ +# "hot_reload", +#], optional = true } +#dioxus-hot-reload = { git = "https://github.com/ealmloff/dioxus", branch = "fix-event-bubbling", default-features = false, features = [ +# "custom_file_watcher", +#], optional = true } +#bevy_mod_picking = { version = "0.17", default-features = false, features = [ +# "backend_bevy_ui", +#] } [features] -hot_reload = ["dioxus/hot-reload", "dioxus-rsx", "dioxus-hot-reload"] - -[patch.crates-io] -bevy_app = { git = "https://github.com/JMS55/bevy", branch = "query_new_12" } -bevy_asset = { git = "https://github.com/JMS55/bevy", branch = "query_new_12" } -bevy_core = { git = "https://github.com/JMS55/bevy", branch = "query_new_12" } -bevy_ecs = { git = "https://github.com/JMS55/bevy", branch = "query_new_12" } -bevy_hierarchy = { git = "https://github.com/JMS55/bevy", branch = "query_new_12" } -bevy_input = { git = "https://github.com/JMS55/bevy", branch = "query_new_12" } -bevy_math = { git = "https://github.com/JMS55/bevy", branch = "query_new_12" } -bevy_reflect = { git = "https://github.com/JMS55/bevy", branch = "query_new_12" } -bevy_render = { git = "https://github.com/JMS55/bevy", branch = "query_new_12" } -bevy_transform = { git = "https://github.com/JMS55/bevy", branch = "query_new_12" } -bevy_ui = { git = "https://github.com/JMS55/bevy", branch = "query_new_12" } -bevy_utils = { git = "https://github.com/JMS55/bevy", branch = "query_new_12" } -bevy_window = { git = "https://github.com/JMS55/bevy", branch = "query_new_12" } +#hot_reload = ["dioxus/hot-reload", "dioxus-rsx", "dioxus-hot-reload"] [[example]] name = "demo" diff --git a/examples/demo.rs b/examples/demo.rs index 087d829..f4978c5 100644 --- a/examples/demo.rs +++ b/examples/demo.rs @@ -1,6 +1,6 @@ use bevy::{prelude::*, reflect::TypeInfo}; use bevy_dioxus::{colors::*, prelude::*}; -use bevy_mod_picking::DefaultPickingPlugins; +use bevy_mod_picking::{debug::DebugName, DefaultPickingPlugins}; fn main() { App::new() @@ -33,7 +33,7 @@ fn Editor(cx: Scope) -> Element { #[component] fn SceneTree<'a>(cx: Scope, selected_entity: &'a UseStateSendable>) -> Element { - let mut entities = use_query_filtered::<(Entity, DebugName), Without>(cx); + let mut entities = use_query_filtered::<(Entity, &Name), ()>(cx); let entities = entities.query(); let mut entities = entities.into_iter().collect::>(); entities.sort_by_key(|(entity, _)| *entity); @@ -58,13 +58,13 @@ fn SceneTree<'a>(cx: Scope, selected_entity: &'a UseStateSendable } event.stop_propagation(); }, - base_color: if Some(entity) == *selected_entity.read() { Some(VIOLET_700) } else { None }, - click_color: if Some(entity) == *selected_entity.read() { Some(VIOLET_400) } else { None }, - hover_color: if Some(entity) == *selected_entity.read() { Some(VIOLET_500) } else { None }, - match name.name { - Some(name) => format!("{name}"), - _ => format!("Entity ({:?})", name.entity) - } + base_color: VIOLET_700, + click_color: VIOLET_400, + hover_color: VIOLET_500, + //base_color: if Some(entity) == *selected_entity.read() { Some(VIOLET_700) } else { None }, + //click_color: if Some(entity) == *selected_entity.read() { Some(VIOLET_400) } else { None }, + //hover_color: if Some(entity) == *selected_entity.read() { Some(VIOLET_500) } else { None }, + name } } } diff --git a/src/apply_mutations.rs b/src/apply_mutations.rs index 5d6f209..139c281 100644 --- a/src/apply_mutations.rs +++ b/src/apply_mutations.rs @@ -4,7 +4,7 @@ use crate::{ }; use bevy::{ asset::AssetServer, - ecs::{entity::Entity, system::Command, world::World}, + ecs::{entity::{Entity, EntityHashMap}, system::Command, world::World}, hierarchy::{BuildWorldChildren, Children, DespawnRecursive, Parent}, prelude::default, render::{color::Color, view::Visibility}, @@ -15,7 +15,7 @@ use bevy::{ widget::TextFlags, *, }, - utils::{EntityHashMap, HashMap}, + utils::HashMap, }; use dioxus::core::{ BorrowedAttributeValue, ElementId, Mutation, Mutations, Template, TemplateAttribute, @@ -25,7 +25,7 @@ use dioxus::core::{ pub fn apply_mutations( mutations: Mutations, element_id_to_bevy_ui_entity: &mut HashMap, - bevy_ui_entity_to_element_id: &mut EntityHashMap, + bevy_ui_entity_to_element_id: &mut EntityHashMap, templates: &mut HashMap, root_entity: Entity, world: &mut World, diff --git a/src/ecs_hooks.rs b/src/ecs_hooks.rs index 339f49a..b6bcbd7 100644 --- a/src/ecs_hooks.rs +++ b/src/ecs_hooks.rs @@ -3,7 +3,7 @@ use bevy::{ ecs::{ component::ComponentId, event::{Event, EventIterator, Events, ManualEventReader}, - query::ReadOnlyWorldQuery, + query::{QueryData, QueryFilter, ReadOnlyQueryData, WorldQuery}, system::{Query, Resource, SystemState}, world::World, }, @@ -89,15 +89,15 @@ pub fn use_resource(cx: &ScopeState) -> &T { pub fn use_query(cx: &ScopeState) -> UseQuery<'_, Q, ()> where - Q: ReadOnlyWorldQuery, + Q: ReadOnlyQueryData, { use_query_filtered(cx) } pub fn use_query_filtered(cx: &ScopeState) -> UseQuery<'_, Q, F> where - Q: ReadOnlyWorldQuery, - F: ReadOnlyWorldQuery, + Q: ReadOnlyQueryData, + F: ReadOnlyQueryData + QueryFilter, { let world = EcsContext::get_world(cx); @@ -128,15 +128,15 @@ pub fn use_event_reader(cx: &ScopeState) -> EventIterator<'_, E> { event_reader.read(events) } -pub struct UseQuery<'a, Q: ReadOnlyWorldQuery + 'static, F: ReadOnlyWorldQuery + 'static> { +pub struct UseQuery<'a, Q: ReadOnlyQueryData + 'static, F: ReadOnlyQueryData + QueryFilter + 'static> { system_state: SystemState>, world_ref: &'a World, } impl<'a, Q, F> UseQuery<'a, Q, F> where - Q: ReadOnlyWorldQuery, - F: ReadOnlyWorldQuery, + Q: ReadOnlyQueryData, + F: ReadOnlyQueryData + QueryFilter, { pub fn query(&mut self) -> Query { self.system_state.get(self.world_ref) diff --git a/src/events.rs b/src/events.rs index 3fea54a..4cda4df 100644 --- a/src/events.rs +++ b/src/events.rs @@ -1,7 +1,7 @@ use bevy::{ ecs::{ component::Component, - entity::Entity, + entity::{Entity, EntityHashSet}, event::{Event, EventWriter, Events, ManualEventReader}, system::{Local, Query, Resource}, world::World, @@ -9,7 +9,6 @@ use bevy::{ hierarchy::Parent, prelude::EntityWorldMut, ui::RelativeCursorPosition, - utils::EntityHashSet, }; use bevy_mod_picking::events::{Click, Down, Out, Over, Pointer, Up}; use dioxus::core::ScopeState; @@ -166,12 +165,12 @@ fn bubble_event_helper(target_entity: &mut Entity, world: &World) pub fn generate_mouse_enter_leave_events( entities: Query<(Entity, &RelativeCursorPosition)>, - mut previous_over: Local>, - mut over: Local>, + mut previous_over: Local, + mut over: Local, mut enter: EventWriter, mut leave: EventWriter, ) { - mem::swap::>(&mut previous_over, &mut over); + mem::swap::(&mut previous_over, &mut over); over.clear(); for (entity, relative_cursor_position) in &entities { diff --git a/src/lib.rs b/src/lib.rs index 8ff2e38..c412880 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,3 +1,4 @@ +#![feature(trait_alias)] mod apply_mutations; pub mod colors; mod deferred_system; @@ -20,10 +21,10 @@ use self::{ }; use bevy::{ app::{App, Last, Plugin, PreUpdate}, - ecs::{bundle::Bundle, component::Component, entity::Entity, schedule::IntoSystemConfigs}, + ecs::{bundle::Bundle, component::Component, entity::{Entity, EntityHashMap}, schedule::IntoSystemConfigs}, prelude::Deref, ui::{node_bundles::NodeBundle, ui_focus_system}, - utils::{EntityHashMap, HashMap}, + utils::HashMap, }; use dioxus::core::{Element, ElementId, Scope, VirtualDom}; @@ -32,7 +33,7 @@ pub mod prelude { pub use super::ecs_hooks::{ use_event_reader, use_query, use_query_filtered, use_resource, use_world, }; - pub use super::elements::*; + pub use super::elements::dioxus_elements; pub use super::use_state_sendable::*; pub use super::{DioxusUiBundle, DioxusUiPlugin, DioxusUiRoot}; pub use bevy_mod_picking::pointer::PointerButton; @@ -80,7 +81,7 @@ struct UiContext { struct UiRoot { virtual_dom: VirtualDom, element_id_to_bevy_ui_entity: HashMap, - bevy_ui_entity_to_element_id: EntityHashMap, + bevy_ui_entity_to_element_id: EntityHashMap, templates: HashMap, needs_rebuild: bool, } diff --git a/src/parse_attributes.rs b/src/parse_attributes.rs index 6bd0f1a..d34cd9c 100644 --- a/src/parse_attributes.rs +++ b/src/parse_attributes.rs @@ -2,7 +2,7 @@ use bevy::{ asset::{AssetPath, AssetServer}, math::Quat, render::{color::Color, view::Visibility}, - text::{Text, TextAlignment}, + text::{JustifyText, Text}, transform::components::Transform, ui::*, }; @@ -188,13 +188,13 @@ pub fn set_attribute( style.direction = Direction::RightToLeft; } ("text_multiline_alignment", "left") if text.is_some() => { - text.unwrap().alignment = TextAlignment::Left; + text.unwrap().justify = JustifyText::Left; } ("text_multiline_alignment", "center") if text.is_some() => { - text.unwrap().alignment = TextAlignment::Center; + text.unwrap().justify = JustifyText::Center; } ("text_multiline_alignment", "right") if text.is_some() => { - text.unwrap().alignment = TextAlignment::Right; + text.unwrap().justify = JustifyText::Right; } ("text_size", value) if text.is_some() => { text.unwrap().sections[0].style.font_size = parse_f32(value);