From 7b3415bb37822ca018c669425ea88fcc837dd348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Thu, 11 Jan 2024 15:07:23 +0000 Subject: [PATCH 01/10] update to bevy-0.12 and iced 0.10 --- .gitignore | 1 - Cargo.lock | 5022 +++++++++++++++++++++++++++++++++++++++ Cargo.toml | 45 +- examples/interactive.rs | 6 +- examples/toggle.rs | 2 +- src/conversions.rs | 236 +- src/lib.rs | 17 +- src/render.rs | 11 +- src/systems.rs | 82 +- 9 files changed, 5266 insertions(+), 156 deletions(-) create mode 100644 Cargo.lock diff --git a/.gitignore b/.gitignore index c1d9ee7..fd20bf8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ /target -Cargo.lock .cargo/ .idea/ diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 index 0000000..91289f9 --- /dev/null +++ b/Cargo.lock @@ -0,0 +1,5022 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ab_glyph" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" + +[[package]] +name = "accesskit" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cb10ed32c63247e4e39a8f42e8e30fb9442fbf7878c8e4a9849e7e381619bea" + +[[package]] +name = "accesskit_consumer" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c17cca53c09fbd7288667b22a201274b9becaa27f0b91bf52a526db95de45e6" +dependencies = [ + "accesskit", +] + +[[package]] +name = "accesskit_macos" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd3b6ae1eabbfbced10e840fd3fce8a93ae84f174b3e4ba892ab7bcb42e477a7" +dependencies = [ + "accesskit", + "accesskit_consumer", + "objc2 0.3.0-beta.3.patch-leaks.3", + "once_cell", +] + +[[package]] +name = "accesskit_windows" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afcae27ec0974fc7c3b0b318783be89fd1b2e66dd702179fe600166a38ff4a0b" +dependencies = [ + "accesskit", + "accesskit_consumer", + "once_cell", + "paste", + "static_assertions", + "windows 0.48.0", +] + +[[package]] +name = "accesskit_winit" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45f8f7c9f66d454d5fd8e344c8c8c7324b57194e1041b955519fc58a01e77a25" +dependencies = [ + "accesskit", + "accesskit_macos", + "accesskit_windows", + "raw-window-handle", + "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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "alsa" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2562ad8dcf0f789f65c6fdaad8a8a9708ed6b488e649da28c01656ad66b8b47" +dependencies = [ + "alsa-sys", + "bitflags 1.3.2", + "libc", + "nix 0.24.3", +] + +[[package]] +name = "alsa-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "android-activity" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39b801912a977c3fd52d80511fe1c0c8480c6f957f21ae2ce1b92ffe970cf4b9" +dependencies = [ + "android-properties", + "bitflags 2.4.1", + "cc", + "cesu8", + "jni 0.21.1", + "jni-sys", + "libc", + "log", + "ndk 0.8.0", + "ndk-context", + "ndk-sys 0.5.0+25.2.9519653", + "num_enum 0.7.2", + "thiserror", +] + +[[package]] +name = "android-properties" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + +[[package]] +name = "android_log-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +dependencies = [ + "concurrent-queue", + "event-listener 4.0.3", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand 2.0.1", + "futures-lite", + "slab", +] + +[[package]] +name = "async-fs" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd1f344136bad34df1f83a47f3fd7f2ab85d75cb8a940af4ccf6d482a84ea01b" +dependencies = [ + "async-lock", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-lock" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +dependencies = [ + "event-listener 4.0.3", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-task" +version = "4.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +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.21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" + +[[package]] +name = "bevy" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "bevy_internal", +] + +[[package]] +name = "bevy_a11y" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "accesskit", + "bevy_app", + "bevy_derive", + "bevy_ecs", +] + +[[package]] +name = "bevy_animation" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_ecs", + "bevy_hierarchy", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_time", + "bevy_transform", + "bevy_utils", +] + +[[package]] +name = "bevy_app" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "bevy_derive", + "bevy_ecs", + "bevy_reflect", + "bevy_tasks", + "bevy_utils", + "downcast-rs", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "bevy_asset" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "async-broadcast", + "async-fs", + "async-lock", + "bevy_app", + "bevy_asset_macros", + "bevy_ecs", + "bevy_log", + "bevy_reflect", + "bevy_tasks", + "bevy_utils", + "bevy_winit", + "blake3", + "crossbeam-channel", + "downcast-rs", + "futures-io", + "futures-lite", + "js-sys", + "parking_lot 0.12.1", + "ron", + "serde", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "bevy_asset_macros" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "bevy_macro_utils", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "bevy_audio" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_derive", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_transform", + "bevy_utils", + "oboe", + "rodio", +] + +[[package]] +name = "bevy_core" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "bevy_app", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_tasks", + "bevy_utils", + "bytemuck", +] + +[[package]] +name = "bevy_core_pipeline" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_derive", + "bevy_ecs", + "bevy_log", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", + "bitflags 2.4.1", + "radsort", + "serde", +] + +[[package]] +name = "bevy_derive" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "bevy_macro_utils", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "bevy_diagnostic" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "bevy_app", + "bevy_core", + "bevy_ecs", + "bevy_log", + "bevy_time", + "bevy_utils", + "sysinfo", +] + +[[package]] +name = "bevy_ecs" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "async-channel 1.9.0", + "bevy_ecs_macros", + "bevy_ptr", + "bevy_reflect", + "bevy_tasks", + "bevy_utils", + "downcast-rs", + "fixedbitset", + "rustc-hash", + "serde", + "thiserror", + "thread_local", +] + +[[package]] +name = "bevy_ecs_macros" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "bevy_macro_utils", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "bevy_encase_derive" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "bevy_macro_utils", + "encase_derive_impl 0.6.1", +] + +[[package]] +name = "bevy_gilrs" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "bevy_app", + "bevy_ecs", + "bevy_input", + "bevy_log", + "bevy_time", + "bevy_utils", + "gilrs", + "thiserror", +] + +[[package]] +name = "bevy_gizmos" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_core_pipeline", + "bevy_ecs", + "bevy_math", + "bevy_pbr", + "bevy_reflect", + "bevy_render", + "bevy_sprite", + "bevy_transform", + "bevy_utils", +] + +[[package]] +name = "bevy_gltf" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "base64", + "bevy_animation", + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_core_pipeline", + "bevy_ecs", + "bevy_hierarchy", + "bevy_log", + "bevy_math", + "bevy_pbr", + "bevy_reflect", + "bevy_render", + "bevy_scene", + "bevy_tasks", + "bevy_transform", + "bevy_utils", + "gltf", + "percent-encoding", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "bevy_hierarchy" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "bevy_app", + "bevy_core", + "bevy_ecs", + "bevy_log", + "bevy_reflect", + "bevy_utils", +] + +[[package]] +name = "bevy_iced" +version = "0.4.0" +dependencies = [ + "bevy", + "bevy_app", + "bevy_derive", + "bevy_ecs", + "bevy_input", + "bevy_math", + "bevy_render", + "bevy_utils", + "bevy_window", + "iced_core", + "iced_renderer", + "iced_runtime", + "iced_wgpu", + "iced_widget", + "rand", +] + +[[package]] +name = "bevy_input" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "bevy_app", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_utils", + "thiserror", +] + +[[package]] +name = "bevy_internal" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "bevy_a11y", + "bevy_animation", + "bevy_app", + "bevy_asset", + "bevy_audio", + "bevy_core", + "bevy_core_pipeline", + "bevy_derive", + "bevy_diagnostic", + "bevy_ecs", + "bevy_gilrs", + "bevy_gizmos", + "bevy_gltf", + "bevy_hierarchy", + "bevy_input", + "bevy_log", + "bevy_math", + "bevy_pbr", + "bevy_ptr", + "bevy_reflect", + "bevy_render", + "bevy_scene", + "bevy_sprite", + "bevy_tasks", + "bevy_text", + "bevy_time", + "bevy_transform", + "bevy_ui", + "bevy_utils", + "bevy_window", + "bevy_winit", +] + +[[package]] +name = "bevy_log" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "android_log-sys", + "bevy_app", + "bevy_ecs", + "bevy_utils", + "console_error_panic_hook", + "tracing-log 0.1.4", + "tracing-subscriber", + "tracing-wasm", +] + +[[package]] +name = "bevy_macro_utils" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "proc-macro2", + "quote", + "rustc-hash", + "syn 2.0.48", + "toml_edit 0.20.7", +] + +[[package]] +name = "bevy_math" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "glam 0.25.0", + "serde", +] + +[[package]] +name = "bevy_mikktspace" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "glam 0.25.0", +] + +[[package]] +name = "bevy_pbr" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_core_pipeline", + "bevy_derive", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", + "bevy_window", + "bitflags 2.4.1", + "bytemuck", + "fixedbitset", + "naga_oil", + "radsort", + "smallvec", + "thread_local", +] + +[[package]] +name = "bevy_ptr" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" + +[[package]] +name = "bevy_reflect" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "bevy_math", + "bevy_ptr", + "bevy_reflect_derive", + "bevy_utils", + "downcast-rs", + "erased-serde", + "glam 0.25.0", + "serde", + "smol_str", + "thiserror", +] + +[[package]] +name = "bevy_reflect_derive" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "bevy_macro_utils", + "proc-macro2", + "quote", + "syn 2.0.48", + "uuid", +] + +[[package]] +name = "bevy_render" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "async-channel 1.9.0", + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_derive", + "bevy_ecs", + "bevy_encase_derive", + "bevy_hierarchy", + "bevy_log", + "bevy_math", + "bevy_mikktspace", + "bevy_reflect", + "bevy_render_macros", + "bevy_tasks", + "bevy_time", + "bevy_transform", + "bevy_utils", + "bevy_window", + "bitflags 2.4.1", + "bytemuck", + "codespan-reporting", + "downcast-rs", + "encase", + "futures-lite", + "hexasphere", + "image", + "js-sys", + "ktx2", + "naga", + "naga_oil", + "ruzstd", + "serde", + "thiserror", + "thread_local", + "wasm-bindgen", + "web-sys", + "wgpu", +] + +[[package]] +name = "bevy_render_macros" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "bevy_macro_utils", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "bevy_scene" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_derive", + "bevy_ecs", + "bevy_hierarchy", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", + "serde", + "thiserror", + "uuid", +] + +[[package]] +name = "bevy_sprite" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_core_pipeline", + "bevy_derive", + "bevy_ecs", + "bevy_log", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", + "bitflags 2.4.1", + "bytemuck", + "fixedbitset", + "guillotiere", + "radsort", + "rectangle-pack", + "thiserror", +] + +[[package]] +name = "bevy_tasks" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "async-channel 1.9.0", + "async-executor", + "async-task", + "concurrent-queue", + "futures-lite", + "wasm-bindgen-futures", +] + +[[package]] +name = "bevy_text" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "ab_glyph", + "bevy_app", + "bevy_asset", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_sprite", + "bevy_transform", + "bevy_utils", + "bevy_window", + "glyph_brush_layout", + "serde", + "thiserror", +] + +[[package]] +name = "bevy_time" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "bevy_app", + "bevy_ecs", + "bevy_reflect", + "bevy_utils", + "crossbeam-channel", + "thiserror", +] + +[[package]] +name = "bevy_transform" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "bevy_app", + "bevy_ecs", + "bevy_hierarchy", + "bevy_math", + "bevy_reflect", + "thiserror", +] + +[[package]] +name = "bevy_ui" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "bevy_a11y", + "bevy_app", + "bevy_asset", + "bevy_core_pipeline", + "bevy_derive", + "bevy_ecs", + "bevy_hierarchy", + "bevy_input", + "bevy_log", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_sprite", + "bevy_text", + "bevy_transform", + "bevy_utils", + "bevy_window", + "bytemuck", + "taffy", + "thiserror", +] + +[[package]] +name = "bevy_utils" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "ahash", + "bevy_utils_proc_macros", + "getrandom", + "hashbrown", + "nonmax", + "petgraph", + "smallvec", + "thiserror", + "tracing", + "uuid", + "web-time", +] + +[[package]] +name = "bevy_utils_proc_macros" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "bevy_window" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "bevy_a11y", + "bevy_app", + "bevy_ecs", + "bevy_input", + "bevy_math", + "bevy_reflect", + "bevy_utils", + "raw-window-handle", + "smol_str", +] + +[[package]] +name = "bevy_winit" +version = "0.12.0" +source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +dependencies = [ + "accesskit_winit", + "approx", + "bevy_a11y", + "bevy_app", + "bevy_derive", + "bevy_ecs", + "bevy_hierarchy", + "bevy_input", + "bevy_math", + "bevy_tasks", + "bevy_utils", + "bevy_window", + "crossbeam-channel", + "raw-window-handle", + "wasm-bindgen", + "web-sys", + "winit", +] + +[[package]] +name = "bindgen" +version = "0.69.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2" +dependencies = [ + "bitflags 2.4.1", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.48", +] + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +dependencies = [ + "serde", +] + +[[package]] +name = "blake3" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", +] + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-sys" +version = "0.1.0-beta.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146" +dependencies = [ + "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]] +name = "block2" +version = "0.2.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42" +dependencies = [ + "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]] +name = "blocking" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +dependencies = [ + "async-channel 2.1.1", + "async-lock", + "async-task", + "fastrand 2.0.1", + "futures-io", + "futures-lite", + "piper", + "tracing", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "calloop" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b50b5a44d59a98c55a9eeb518f39bf7499ba19fd98ee7d22618687f3f10adbf" +dependencies = [ + "bitflags 2.4.1", + "log", + "polling", + "rustix", + "slab", + "thiserror", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "jobserver", + "libc", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "clang-sys" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +dependencies = [ + "glob", + "libc", + "libloading 0.8.1", +] + +[[package]] +name = "cocoa" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics 0.22.3", + "foreign-types 0.3.2", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation", + "core-graphics-types", + "libc", + "objc", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "com-rs" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" + +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concurrent-queue" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "console_error_panic_hook" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" +dependencies = [ + "cfg-if", + "wasm-bindgen", +] + +[[package]] +name = "const_panic" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b" + +[[package]] +name = "const_soft_float" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ca1caa64ef4ed453e68bb3db612e51cf1b2f5b871337f0fcab1c8f87cc3dff" + +[[package]] +name = "constant_time_eq" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" + +[[package]] +name = "constgebra" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd23e864550e6dafc1e41ac78ce4f1ccddc8672b40c403524a04ff3f0518420" +dependencies = [ + "const_soft_float", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.3.2", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "coreaudio-rs" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" +dependencies = [ + "bitflags 1.3.2", + "core-foundation-sys", + "coreaudio-sys", +] + +[[package]] +name = "coreaudio-sys" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9" +dependencies = [ + "bindgen", +] + +[[package]] +name = "cosmic-text" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75acbfb314aeb4f5210d379af45ed1ec2c98c7f1790bf57b8a4c562ac0c51b71" +dependencies = [ + "fontdb", + "libm", + "log", + "rangemap", + "rustc-hash", + "rustybuzz", + "self_cell", + "swash", + "sys-locale", + "unicode-bidi", + "unicode-linebreak", + "unicode-script", + "unicode-segmentation", +] + +[[package]] +name = "cpal" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c" +dependencies = [ + "alsa", + "core-foundation-sys", + "coreaudio-rs", + "dasp_sample", + "jni 0.19.0", + "js-sys", + "libc", + "mach2", + "ndk 0.7.0", + "ndk-context", + "oboe", + "once_cell", + "parking_lot 0.12.1", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows 0.46.0", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82a9b73a36529d9c47029b9fb3a6f0ea3cc916a261195352ba19e770fc1748b2" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] +name = "d3d12" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20" +dependencies = [ + "bitflags 2.4.1", + "libloading 0.8.1", + "winapi", +] + +[[package]] +name = "dasp_sample" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" + +[[package]] +name = "data-encoding" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" + +[[package]] +name = "dispatch" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] +name = "encase" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95ed933078d2e659745df651f4c180511cd582e5b9414ff896e7d50d207e3103" +dependencies = [ + "const_panic", + "encase_derive", + "glam 0.25.0", + "thiserror", +] + +[[package]] +name = "encase_derive" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4ce1449c7d19eba6cc0abd231150ad81620a8dce29601d7f8d236e5d431d72a" +dependencies = [ + "encase_derive_impl 0.7.0", +] + +[[package]] +name = "encase_derive_impl" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fe2568f851fd6144a45fa91cfed8fe5ca8fc0b56ba6797bfc1ed2771b90e37c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "encase_derive_impl" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92959a9e8d13eaa13b8ae8c7b583c3bf1669ca7a8e7708a088d12587ba86effc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "erased-serde" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" +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 = "etagere" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "306960881d6c46bd0dd6b7f07442a441418c08d0d3e63d8d080b0f64c6343e4e" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "euclid" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" +dependencies = [ + "num-traits", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "fast-srgb8" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fdeflate" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "209098dd6dfc4445aa6111f0e98653ac323eaa4dfd212c9ca3931bf9955c31bd" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "fontconfig-parser" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" +dependencies = [ + "roxmltree", +] + +[[package]] +name = "fontdb" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "020e203f177c0fb250fb19455a252e838d2bbbce1f80f25ecc42402aafa8cd38" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2", + "slotmap", + "tinyvec", + "ttf-parser 0.19.2", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[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 = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", + "num_cpus", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" +dependencies = [ + "fastrand 2.0.1", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "gethostname" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.5", +] + +[[package]] +name = "getrandom" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gilrs" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8b2e57a9cb946b5d04ae8638c5f554abb5a9f82c4c950fd5b1fee6d119592fb" +dependencies = [ + "fnv", + "gilrs-core", + "log", + "uuid", + "vec_map", +] + +[[package]] +name = "gilrs-core" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0af1827b7dd2f36d740ae804c1b3ea0d64c12533fb61ff91883005143a0e8c5a" +dependencies = [ + "core-foundation", + "inotify", + "io-kit-sys", + "js-sys", + "libc", + "libudev-sys", + "log", + "nix 0.27.1", + "uuid", + "vec_map", + "wasm-bindgen", + "web-sys", + "windows 0.52.0", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] + +[[package]] +name = "glam" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" + +[[package]] +name = "glam" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3" +dependencies = [ + "bytemuck", + "serde", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "glow" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "886c2a30b160c4c6fec8f987430c26b526b7988ca71f664e6a699ddf6f9601e4" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gltf" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b78f069cf941075835822953c345b9e1edd67ae347b81ace3aea9de38c2ef33" +dependencies = [ + "byteorder", + "gltf-json", + "lazy_static", + "serde_json", +] + +[[package]] +name = "gltf-derive" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "438ffe1a5540d75403feaf23636b164e816e93f6f03131674722b3886ce32a57" +dependencies = [ + "inflections", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "gltf-json" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "655951ba557f2bc69ea4b0799446bae281fa78efae6319968bdd2c3e9a06d8e1" +dependencies = [ + "gltf-derive", + "serde", + "serde_derive", + "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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc32c2334f00ca5ac3695c5009ae35da21da8c62d255b5b96d56e2597a637a38" +dependencies = [ + "ab_glyph", + "approx", + "xi-unicode", +] + +[[package]] +name = "glyphon" +version = "0.3.0" +source = "git+https://github.com/grovesNL/glyphon.git?rev=2caa9fc5e5923c1d827d177c3619cab7e9885b85#2caa9fc5e5923c1d827d177c3619cab7e9885b85" +dependencies = [ + "cosmic-text", + "etagere", + "lru", + "wgpu", +] + +[[package]] +name = "gpu-alloc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" +dependencies = [ + "bitflags 2.4.1", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" +dependencies = [ + "bitflags 2.4.1", +] + +[[package]] +name = "gpu-allocator" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40fe17c8a05d60c38c0a4e5a3c802f2f1ceb66b76c67d96ffb34bef0475a7fad" +dependencies = [ + "backtrace", + "log", + "presser", + "thiserror", + "winapi", + "windows 0.51.1", +] + +[[package]] +name = "gpu-descriptor" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +dependencies = [ + "bitflags 2.4.1", + "gpu-descriptor-types", + "hashbrown", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +dependencies = [ + "bitflags 2.4.1", +] + +[[package]] +name = "grid" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eec1c01eb1de97451ee0d60de7d81cf1e72aabefb021616027f3d1c3ec1c723c" + +[[package]] +name = "guillotiere" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "half" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +dependencies = [ + "ahash", + "allocator-api2", + "serde", +] + +[[package]] +name = "hassle-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" +dependencies = [ + "bitflags 1.3.2", + "com-rs", + "libc", + "libloading 0.7.4", + "thiserror", + "widestring", + "winapi", +] + +[[package]] +name = "hermit-abi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "hexasphere" +version = "10.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f33ddb7f7143d9e703c072e88b98cd8b9719f174137a671429351bd2ee43c02a" +dependencies = [ + "constgebra", + "glam 0.25.0", +] + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] +name = "iced_core" +version = "0.12.0" +source = "git+https://github.com/tzemanovic/iced/?branch=wgpu-renderer-send#3c6bb0a076c4433abe2a381856250c9d9693404e" +dependencies = [ + "bitflags 1.3.2", + "instant", + "log", + "num-traits", + "palette", + "raw-window-handle", + "thiserror", + "xxhash-rust", +] + +[[package]] +name = "iced_futures" +version = "0.12.0" +source = "git+https://github.com/tzemanovic/iced/?branch=wgpu-renderer-send#3c6bb0a076c4433abe2a381856250c9d9693404e" +dependencies = [ + "futures", + "iced_core", + "log", + "wasm-bindgen-futures", + "wasm-timer", +] + +[[package]] +name = "iced_graphics" +version = "0.12.0" +source = "git+https://github.com/tzemanovic/iced/?branch=wgpu-renderer-send#3c6bb0a076c4433abe2a381856250c9d9693404e" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "cosmic-text", + "glam 0.24.2", + "half", + "iced_core", + "log", + "once_cell", + "raw-window-handle", + "rustc-hash", + "thiserror", + "unicode-segmentation", + "xxhash-rust", +] + +[[package]] +name = "iced_renderer" +version = "0.12.0" +source = "git+https://github.com/tzemanovic/iced/?branch=wgpu-renderer-send#3c6bb0a076c4433abe2a381856250c9d9693404e" +dependencies = [ + "iced_graphics", + "iced_tiny_skia", + "iced_wgpu", + "log", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "iced_runtime" +version = "0.12.0" +source = "git+https://github.com/tzemanovic/iced/?branch=wgpu-renderer-send#3c6bb0a076c4433abe2a381856250c9d9693404e" +dependencies = [ + "iced_core", + "iced_futures", + "thiserror", +] + +[[package]] +name = "iced_style" +version = "0.12.0" +source = "git+https://github.com/tzemanovic/iced/?branch=wgpu-renderer-send#3c6bb0a076c4433abe2a381856250c9d9693404e" +dependencies = [ + "iced_core", + "once_cell", + "palette", +] + +[[package]] +name = "iced_tiny_skia" +version = "0.12.0" +source = "git+https://github.com/tzemanovic/iced/?branch=wgpu-renderer-send#3c6bb0a076c4433abe2a381856250c9d9693404e" +dependencies = [ + "bytemuck", + "cosmic-text", + "iced_graphics", + "kurbo", + "log", + "raw-window-handle", + "rustc-hash", + "softbuffer", + "tiny-skia", + "xxhash-rust", +] + +[[package]] +name = "iced_wgpu" +version = "0.12.0" +source = "git+https://github.com/tzemanovic/iced/?branch=wgpu-renderer-send#3c6bb0a076c4433abe2a381856250c9d9693404e" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "futures", + "glam 0.24.2", + "glyphon", + "guillotiere", + "iced_graphics", + "log", + "once_cell", + "raw-window-handle", + "wgpu", +] + +[[package]] +name = "iced_widget" +version = "0.12.0" +source = "git+https://github.com/tzemanovic/iced/?branch=wgpu-renderer-send#3c6bb0a076c4433abe2a381856250c9d9693404e" +dependencies = [ + "iced_renderer", + "iced_runtime", + "iced_style", + "num-traits", + "thiserror", + "unicode-segmentation", +] + +[[package]] +name = "icrate" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" +dependencies = [ + "block2 0.3.0", + "dispatch", + "objc2 0.4.1", +] + +[[package]] +name = "image" +version = "0.24.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "num-rational", + "num-traits", + "png", +] + +[[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "inflections" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a" + +[[package]] +name = "inotify" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-kit-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4769cb30e5dcf1710fc6730d3e94f78c47723a014a567de385e113c737394640" +dependencies = [ + "core-foundation-sys", + "mach2", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "jni" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "khronos-egl" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" +dependencies = [ + "libc", + "libloading 0.8.1", + "pkg-config", +] + +[[package]] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + +[[package]] +name = "ktx2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87d65e08a9ec02e409d27a0139eaa6b9756b4d81fe7cde71f6941a83730ce838" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "kurbo" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "lewton" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030" +dependencies = [ + "byteorder", + "ogg", + "tinyvec", +] + +[[package]] +name = "libc" +version = "0.2.151" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libredox" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] +name = "libudev-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "lru" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" +dependencies = [ + "hashbrown", +] + +[[package]] +name = "mach2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +dependencies = [ + "libc", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "memmap2" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metal" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +dependencies = [ + "bitflags 2.4.1", + "block", + "core-graphics-types", + "foreign-types 0.5.0", + "log", + "objc", + "paste", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "naga" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae585df4b6514cf8842ac0f1ab4992edc975892704835b549cf818dc0191249e" +dependencies = [ + "bit-set", + "bitflags 2.4.1", + "codespan-reporting", + "hexf-parse", + "indexmap", + "log", + "num-traits", + "pp-rs", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid", +] + +[[package]] +name = "naga_oil" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fff3f369dd665ee365daeab786466a6f70ff53e4a95a76117363b1077e1b0492" +dependencies = [ + "bit-set", + "codespan-reporting", + "data-encoding", + "indexmap", + "naga", + "once_cell", + "regex", + "regex-syntax 0.7.5", + "rustc-hash", + "thiserror", + "tracing", + "unicode-ident", +] + +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] + +[[package]] +name = "ndk" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" +dependencies = [ + "bitflags 1.3.2", + "jni-sys", + "ndk-sys 0.4.1+23.1.7779620", + "num_enum 0.5.11", + "raw-window-handle", + "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", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.4.1+23.1.7779620" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", +] + +[[package]] +name = "nix" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", + "pin-utils", +] + +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.4.1", + "cfg-if", + "libc", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nonmax" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "610a5acd306ec67f907abe5567859a3c693fb9886eb1f012ab8f2a47bef3db51" + +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +dependencies = [ + "num_enum_derive 0.5.11", +] + +[[package]] +name = "num_enum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +dependencies = [ + "num_enum_derive 0.7.2", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc-sys" +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 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]] +name = "objc2-encode" +version = "2.0.0-pre.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" +dependencies = [ + "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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "oboe" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0" +dependencies = [ + "jni 0.20.0", + "ndk 0.7.0", + "ndk-context", + "num-derive", + "num-traits", + "oboe-sys", +] + +[[package]] +name = "oboe-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2" +dependencies = [ + "cc", +] + +[[package]] +name = "ogg" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e" +dependencies = [ + "byteorder", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "orbclient" +version = "0.3.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" +dependencies = [ + "libredox", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owned_ttf_parser" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" +dependencies = [ + "ttf-parser 0.20.0", +] + +[[package]] +name = "palette" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc" +dependencies = [ + "approx", + "fast-srgb8", + "palette_derive", + "phf", +] + +[[package]] +name = "palette_derive" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "petgraph" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +dependencies = [ + "fixedbitset", + "indexmap", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" + +[[package]] +name = "png" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "pp-rs" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb458bb7f6e250e6eb79d5026badc10a3ebb8f9a15d1fff0f13d17c71f4d6dee" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "presser" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro2" +version = "1.0.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiling" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d135ede8821cf6376eb7a64148901e1690b788c11ae94dc297ae917dbc91dc0e" + +[[package]] +name = "quick-xml" +version = "0.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radsort" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17fd96390ed3feda12e1dfe2645ed587e0bea749e319333f104a33ff62f77a0b" + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + +[[package]] +name = "rangemap" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "977b1e897f9d764566891689e642653e5ed90c6895106acd005eb4c1d0203991" + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "rectangle-pack" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0d463f2884048e7153449a55166f91028d5b0ea53c79377099ce4e8cf0cf9bb" + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-syntax" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "renderdoc-sys" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" + +[[package]] +name = "rodio" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b1bb7b48ee48471f55da122c0044fcc7600cfcc85db88240b89cb832935e611" +dependencies = [ + "cpal", + "lewton", +] + +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64", + "bitflags 2.4.1", + "serde", + "serde_derive", +] + +[[package]] +name = "roxmltree" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" +dependencies = [ + "xmlparser", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.38.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustybuzz" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ee8fe2a8461a0854a37101fe7a1b13998d0cfa987e43248e81d2a5f4570f6fa" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "libm", + "smallvec", + "ttf-parser 0.20.0", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-properties", + "unicode-script", +] + +[[package]] +name = "ruzstd" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc" +dependencies = [ + "byteorder", + "thiserror-core", + "twox-hash", +] + +[[package]] +name = "ryu" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "self_cell" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" + +[[package]] +name = "serde" +version = "1.0.195" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.195" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "serde_json" +version = "1.0.111" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shlex" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slotmap" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallvec" +version = "1.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +dependencies = [ + "serde", +] + +[[package]] +name = "smol_str" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" +dependencies = [ + "serde", +] + +[[package]] +name = "softbuffer" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2b953f6ba7285f0af131eb748aabd8ddaf53e0b81dda3ba5d803b0847d6559f" +dependencies = [ + "bytemuck", + "cfg_aliases", + "cocoa", + "core-graphics 0.22.3", + "fastrand 1.9.0", + "foreign-types 0.3.2", + "log", + "nix 0.26.4", + "objc", + "raw-window-handle", + "redox_syscall 0.3.5", + "thiserror", + "wasm-bindgen", + "wayland-backend", + "wayland-client", + "wayland-sys", + "web-sys", + "windows-sys 0.48.0", + "x11-dl", + "x11rb 0.11.1", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spirv" +version = "0.2.0+1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +dependencies = [ + "bitflags 1.3.2", + "num-traits", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" + +[[package]] +name = "svg_fmt" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2" + +[[package]] +name = "swash" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b7c73c813353c347272919aa1af2885068b05e625e5532b43049e4f641ae77f" +dependencies = [ + "yazi", + "zeno", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sys-locale" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" +dependencies = [ + "libc", +] + +[[package]] +name = "sysinfo" +version = "0.30.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fb4f3438c8f6389c864e61221cbc97e9bca98b4daf39a5beb7bea660f528bb2" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "windows 0.52.0", +] + +[[package]] +name = "taffy" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c2287b6d7f721ada4cddf61ade5e760b2c6207df041cac9bfaa192897362fd3" +dependencies = [ + "arrayvec", + "grid", + "num-traits", + "slotmap", +] + +[[package]] +name = "termcolor" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-core" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c001ee18b7e5e3f62cbf58c7fe220119e68d902bb7443179c0c8aef30090e999" +dependencies = [ + "thiserror-core-impl", +] + +[[package]] +name = "thiserror-core-impl" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4c60d69f36615a077cc7663b9cb8e42275722d23e58a7fa3d2c7f2915d09d04" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tiny-skia" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6a067b809476893fce6a254cf285850ff69c847e6cfbade6a20b655b6c7e80d" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "png", + "tiny-skia-path", +] + +[[package]] +name = "tiny-skia-path" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de35e8a90052baaaf61f171680ac2f8e925a1e43ea9d2e3a00514772250e541" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log 0.2.0", +] + +[[package]] +name = "tracing-wasm" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4575c663a174420fa2d78f4108ff68f65bf2fbb7dd89f33749b6e826b3626e07" +dependencies = [ + "tracing", + "tracing-subscriber", + "wasm-bindgen", +] + +[[package]] +name = "ttf-parser" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" + +[[package]] +name = "ttf-parser" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" + +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if", + "static_assertions", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" + +[[package]] +name = "unicode-bidi-mirroring" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" + +[[package]] +name = "unicode-ccc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-linebreak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" + +[[package]] +name = "unicode-properties" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f91c8b21fbbaa18853c3d0801c78f4fc94cdb976699bb03e832e75f7fd22f0" + +[[package]] +name = "unicode-script" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "uuid" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.48", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" + +[[package]] +name = "wasm-timer" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" +dependencies = [ + "futures", + "js-sys", + "parking_lot 0.11.2", + "pin-utils", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "wayland-backend" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b48e27457e8da3b2260ac60d0a94512f5cba36448679f3747c0865b7893ed8" +dependencies = [ + "cc", + "downcast-rs", + "io-lifetimes", + "nix 0.26.4", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.30.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8" +dependencies = [ + "bitflags 1.3.2", + "nix 0.26.4", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9b873b257fbc32ec909c0eb80dea312076a67014e65e245f5eb69a6b8ab330e" +dependencies = [ + "proc-macro2", + "quick-xml", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" +dependencies = [ + "dlib", + "lazy_static", + "log", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +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", +] + +[[package]] +name = "wgpu" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30e7d227c9f961f2061c26f4cb0fbd4df0ef37e056edd0931783599d6c94ef24" +dependencies = [ + "arrayvec", + "cfg-if", + "flume", + "js-sys", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-core" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef91c1d62d1e9e81c79e600131a258edf75c9531cbdbde09c44a011a47312726" +dependencies = [ + "arrayvec", + "bit-vec", + "bitflags 2.4.1", + "codespan-reporting", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle", + "rustc-hash", + "smallvec", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b84ecc802da3eb67b4cf3dd9ea6fe45bbb47ef13e6c49c5c3240868a9cc6cdd9" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.4.1", + "block", + "core-graphics-types", + "d3d12", + "glow", + "glutin_wgl_sys", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.1", + "log", + "metal", + "naga", + "objc", + "once_cell", + "parking_lot 0.12.1", + "profiling", + "range-alloc", + "raw-window-handle", + "renderdoc-sys", + "rustc-hash", + "smallvec", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi", +] + +[[package]] +name = "wgpu-types" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d5ed5f0edf0de351fe311c53304986315ce866f394a2e6df0c4b3c70774bcdd" +dependencies = [ + "bitflags 2.4.1", + "js-sys", + "web-sys", +] + +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-wsapoll" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +dependencies = [ + "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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "windows-interface" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "winit" +version = "0.29.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2376dab13e09c01ad8b679f0dbc7038af4ec43d9a91344338e37bd686481550" +dependencies = [ + "android-activity", + "atomic-waker", + "bitflags 2.4.1", + "bytemuck", + "calloop", + "cfg_aliases", + "core-foundation", + "core-graphics 0.23.1", + "cursor-icon", + "icrate", + "js-sys", + "libc", + "log", + "ndk 0.8.0", + "ndk-sys 0.5.0+25.2.9519653", + "objc2 0.4.1", + "once_cell", + "orbclient", + "percent-encoding", + "raw-window-handle", + "redox_syscall 0.3.5", + "rustix", + "smol_str", + "unicode-segmentation", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "web-time", + "windows-sys 0.48.0", + "x11-dl", + "x11rb 0.13.0", + "xkbcommon-dl", +] + +[[package]] +name = "winnow" +version = "0.5.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7520bbdec7211caa7c4e682eb1fbe07abe20cee6756b6e00f537c82c11816aa" +dependencies = [ + "memchr", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf3c79412dd91bae7a7366b8ad1565a85e35dd049affc3a6a2c549e97419617" +dependencies = [ + "gethostname 0.2.3", + "libc", + "libloading 0.7.4", + "nix 0.25.1", + "once_cell", + "winapi", + "winapi-wsapoll", + "x11rb-protocol 0.11.1", +] + +[[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 0.4.3", + "libc", + "libloading 0.8.1", + "once_cell", + "rustix", + "x11rb-protocol 0.13.0", +] + +[[package]] +name = "x11rb-protocol" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0b1513b141123073ce54d5bb1d33f801f17508fbd61e02060b1214e96d39c56" +dependencies = [ + "nix 0.25.1", +] + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6924668544c48c0133152e7eec86d644a056ca3d09275eb8d5cdb9855f9d8699" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" + +[[package]] +name = "xmlparser" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" + +[[package]] +name = "xxhash-rust" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53be06678ed9e83edb1745eb72efc0bbcd7b5c3c35711a860906aed827a13d61" + +[[package]] +name = "yazi" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" + +[[package]] +name = "zeno" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] diff --git a/Cargo.toml b/Cargo.toml index f97fd11..26b1a9f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,21 +13,38 @@ documentation = "https://docs.rs/bevy_iced" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bevy_app = "0.11" -bevy_derive = "0.11" -bevy_ecs = "0.11" -bevy_input = "0.11" -bevy_math = "0.11" -bevy_render = "0.11" -bevy_utils = "0.11" -bevy_window = "0.11" +# NOTE: temp using "main" branch until a release with wgpu version matching iced +# bevy_app = "0.12" +# bevy_derive = "0.12" +# bevy_ecs = "0.12" +# bevy_input = "0.12" +# bevy_math = "0.12" +# bevy_render = "0.12" +# bevy_utils = "0.12" +# bevy_window = "0.12" +bevy_app = { git = "https://github.com/bevyengine/bevy", branch = "main" } +bevy_derive = { git = "https://github.com/bevyengine/bevy", branch = "main" } +bevy_ecs = { git = "https://github.com/bevyengine/bevy", branch = "main" } +bevy_input = { git = "https://github.com/bevyengine/bevy", branch = "main" } +bevy_math = { git = "https://github.com/bevyengine/bevy", branch = "main" } +bevy_render = { git = "https://github.com/bevyengine/bevy", branch = "main" } +bevy_utils = { git = "https://github.com/bevyengine/bevy", branch = "main" } +bevy_window = { git = "https://github.com/bevyengine/bevy", branch = "main" } -iced_core = "0.10" -iced_runtime = "0.1" -iced_wgpu = "0.11" -iced_widget = "0.1" -iced_renderer = { version = "0.1", features = ["wgpu"] } +# NOTE: temp using "master" branch until a release with wgpu version matching bevy +# NOTE: temp using "wgpu-renderer-send" because the `wgpu::Renderer` is no longer `Send` on master +# iced_core = "0.10" +# iced_runtime = "0.1" +# iced_wgpu = "0.11" +# iced_widget = "0.1" +# iced_renderer = { version = "0.1", features = ["wgpu"] } +iced_core = { git = "https://github.com/tzemanovic/iced/", branch = "wgpu-renderer-send" } +iced_runtime = { git = "https://github.com/tzemanovic/iced/", branch = "wgpu-renderer-send" } +iced_wgpu = { git = "https://github.com/tzemanovic/iced/", branch = "wgpu-renderer-send" } +iced_widget = { git = "https://github.com/tzemanovic/iced/", branch = "wgpu-renderer-send" } +iced_renderer = { git = "https://github.com/tzemanovic/iced/", branch = "wgpu-renderer-send", features = ["wgpu"]} [dev-dependencies] -bevy = "0.11" +# bevy = "0.12" +bevy = { git = "https://github.com/bevyengine/bevy", branch = "main" } rand = "0.8" \ No newline at end of file diff --git a/examples/interactive.rs b/examples/interactive.rs index 23b39b9..192c359 100644 --- a/examples/interactive.rs +++ b/examples/interactive.rs @@ -81,7 +81,7 @@ fn box_system( mut sprites: Query<&mut Sprite>, ) { let pos = (Vec3::new(rng(), rng(), 0.0) - Vec3::new(0.5, 0.5, 0.0)) * 300.0; - for msg in messages.iter() { + for msg in messages.read() { match msg { UiMessage::BoxRequested => { commands.spawn(SpriteBundle { @@ -114,7 +114,7 @@ fn update_scale_factor( if wheel.is_empty() { return; } - for event in wheel.iter() { + for event in wheel.read() { let scale_factor = (iced_settings.scale_factor.unwrap_or(1.0) + (event.y / 10.0) as f64).max(1.0); iced_settings.set_scale_factor(scale_factor); @@ -122,7 +122,7 @@ fn update_scale_factor( } fn toggle_ui(mut buttons: EventReader, mut ui_active: ResMut) { - for ev in buttons.iter() { + for ev in buttons.read() { if ev.button == MouseButton::Right { **ui_active = !**ui_active; } diff --git a/examples/toggle.rs b/examples/toggle.rs index 9da170d..c6f8366 100644 --- a/examples/toggle.rs +++ b/examples/toggle.rs @@ -22,7 +22,7 @@ pub fn main() { } fn toggle_system(mut keyboard: EventReader, mut active: ResMut) { - for event in keyboard.iter() { + for event in keyboard.read() { if event.key_code == Some(KeyCode::Space) && event.state == ButtonState::Pressed { active.0 = !active.0; } diff --git a/src/conversions.rs b/src/conversions.rs index 5f2f641..3dc6e59 100644 --- a/src/conversions.rs +++ b/src/conversions.rs @@ -9,43 +9,46 @@ use bevy_math::Vec2; use iced_core::keyboard::KeyCode as IcedKeyCode; pub fn key_code(virtual_keycode: BevyKeyCode) -> IcedKeyCode { + // TODO: We need https://github.com/iced-rs/iced/pull/2169 to update + // winit and Iced keys in `iced/core/src/keyboard/key_code.rs` to match + // with bevy again match virtual_keycode { - BevyKeyCode::Key1 => IcedKeyCode::Key1, - BevyKeyCode::Key2 => IcedKeyCode::Key2, - BevyKeyCode::Key3 => IcedKeyCode::Key3, - BevyKeyCode::Key4 => IcedKeyCode::Key4, - BevyKeyCode::Key5 => IcedKeyCode::Key5, - BevyKeyCode::Key6 => IcedKeyCode::Key6, - BevyKeyCode::Key7 => IcedKeyCode::Key7, - BevyKeyCode::Key8 => IcedKeyCode::Key8, - BevyKeyCode::Key9 => IcedKeyCode::Key9, - BevyKeyCode::Key0 => IcedKeyCode::Key0, - BevyKeyCode::A => IcedKeyCode::A, - BevyKeyCode::B => IcedKeyCode::B, - BevyKeyCode::C => IcedKeyCode::C, - BevyKeyCode::D => IcedKeyCode::D, - BevyKeyCode::E => IcedKeyCode::E, - BevyKeyCode::F => IcedKeyCode::F, - BevyKeyCode::G => IcedKeyCode::G, - BevyKeyCode::H => IcedKeyCode::H, - BevyKeyCode::I => IcedKeyCode::I, - BevyKeyCode::J => IcedKeyCode::J, - BevyKeyCode::K => IcedKeyCode::K, - BevyKeyCode::L => IcedKeyCode::L, - BevyKeyCode::M => IcedKeyCode::M, - BevyKeyCode::N => IcedKeyCode::N, - BevyKeyCode::O => IcedKeyCode::O, - BevyKeyCode::P => IcedKeyCode::P, - BevyKeyCode::Q => IcedKeyCode::Q, - BevyKeyCode::R => IcedKeyCode::R, - BevyKeyCode::S => IcedKeyCode::S, - BevyKeyCode::T => IcedKeyCode::T, - BevyKeyCode::U => IcedKeyCode::U, - BevyKeyCode::V => IcedKeyCode::V, - BevyKeyCode::W => IcedKeyCode::W, - BevyKeyCode::X => IcedKeyCode::X, - BevyKeyCode::Y => IcedKeyCode::Y, - BevyKeyCode::Z => IcedKeyCode::Z, + BevyKeyCode::Digit1 => IcedKeyCode::Key1, + BevyKeyCode::Digit2 => IcedKeyCode::Key2, + BevyKeyCode::Digit3 => IcedKeyCode::Key3, + BevyKeyCode::Digit4 => IcedKeyCode::Key4, + BevyKeyCode::Digit5 => IcedKeyCode::Key5, + BevyKeyCode::Digit6 => IcedKeyCode::Key6, + BevyKeyCode::Digit7 => IcedKeyCode::Key7, + BevyKeyCode::Digit8 => IcedKeyCode::Key8, + BevyKeyCode::Digit9 => IcedKeyCode::Key9, + BevyKeyCode::Digit0 => IcedKeyCode::Key0, + BevyKeyCode::KeyA => IcedKeyCode::A, + BevyKeyCode::KeyB => IcedKeyCode::B, + BevyKeyCode::KeyC => IcedKeyCode::C, + BevyKeyCode::KeyD => IcedKeyCode::D, + BevyKeyCode::KeyE => IcedKeyCode::E, + BevyKeyCode::KeyF => IcedKeyCode::F, + BevyKeyCode::KeyG => IcedKeyCode::G, + BevyKeyCode::KeyH => IcedKeyCode::H, + BevyKeyCode::KeyI => IcedKeyCode::I, + BevyKeyCode::KeyJ => IcedKeyCode::J, + BevyKeyCode::KeyK => IcedKeyCode::K, + BevyKeyCode::KeyL => IcedKeyCode::L, + BevyKeyCode::KeyM => IcedKeyCode::M, + BevyKeyCode::KeyN => IcedKeyCode::N, + BevyKeyCode::KeyO => IcedKeyCode::O, + BevyKeyCode::KeyP => IcedKeyCode::P, + BevyKeyCode::KeyQ => IcedKeyCode::Q, + BevyKeyCode::KeyR => IcedKeyCode::R, + BevyKeyCode::KeyS => IcedKeyCode::S, + BevyKeyCode::KeyT => IcedKeyCode::T, + BevyKeyCode::KeyU => IcedKeyCode::U, + BevyKeyCode::KeyV => IcedKeyCode::V, + BevyKeyCode::KeyW => IcedKeyCode::W, + BevyKeyCode::KeyX => IcedKeyCode::X, + BevyKeyCode::KeyY => IcedKeyCode::Y, + BevyKeyCode::KeyZ => IcedKeyCode::Z, BevyKeyCode::Escape => IcedKeyCode::Escape, BevyKeyCode::F1 => IcedKeyCode::F1, BevyKeyCode::F2 => IcedKeyCode::F2, @@ -71,8 +74,8 @@ pub fn key_code(virtual_keycode: BevyKeyCode) -> IcedKeyCode { BevyKeyCode::F22 => IcedKeyCode::F22, BevyKeyCode::F23 => IcedKeyCode::F23, BevyKeyCode::F24 => IcedKeyCode::F24, - BevyKeyCode::Snapshot => IcedKeyCode::Snapshot, - BevyKeyCode::Scroll => IcedKeyCode::Scroll, + // BevyKeyCode::Snapshot => IcedKeyCode::Snapshot, + // BevyKeyCode::Scroll => IcedKeyCode::Scroll, BevyKeyCode::Pause => IcedKeyCode::Pause, BevyKeyCode::Insert => IcedKeyCode::Insert, BevyKeyCode::Home => IcedKeyCode::Home, @@ -80,16 +83,16 @@ pub fn key_code(virtual_keycode: BevyKeyCode) -> IcedKeyCode { BevyKeyCode::End => IcedKeyCode::End, BevyKeyCode::PageDown => IcedKeyCode::PageDown, BevyKeyCode::PageUp => IcedKeyCode::PageUp, - BevyKeyCode::Left => IcedKeyCode::Left, - BevyKeyCode::Up => IcedKeyCode::Up, - BevyKeyCode::Right => IcedKeyCode::Right, - BevyKeyCode::Down => IcedKeyCode::Down, - BevyKeyCode::Back => IcedKeyCode::Backspace, - BevyKeyCode::Return => IcedKeyCode::Enter, + BevyKeyCode::ArrowLeft => IcedKeyCode::Left, + BevyKeyCode::ArrowUp => IcedKeyCode::Up, + BevyKeyCode::ArrowRight => IcedKeyCode::Right, + BevyKeyCode::ArrowDown => IcedKeyCode::Down, + BevyKeyCode::Backspace => IcedKeyCode::Backspace, + BevyKeyCode::Enter => IcedKeyCode::Enter, BevyKeyCode::Space => IcedKeyCode::Space, - BevyKeyCode::Compose => IcedKeyCode::Compose, - BevyKeyCode::Caret => IcedKeyCode::Caret, - BevyKeyCode::Numlock => IcedKeyCode::Numlock, + // BevyKeyCode::Compose => IcedKeyCode::Compose, + // BevyKeyCode::Caret => IcedKeyCode::Caret, + BevyKeyCode::NumLock => IcedKeyCode::Numlock, BevyKeyCode::Numpad0 => IcedKeyCode::Numpad0, BevyKeyCode::Numpad1 => IcedKeyCode::Numpad1, BevyKeyCode::Numpad2 => IcedKeyCode::Numpad2, @@ -100,50 +103,50 @@ pub fn key_code(virtual_keycode: BevyKeyCode) -> IcedKeyCode { BevyKeyCode::Numpad7 => IcedKeyCode::Numpad7, BevyKeyCode::Numpad8 => IcedKeyCode::Numpad8, BevyKeyCode::Numpad9 => IcedKeyCode::Numpad9, - BevyKeyCode::AbntC1 => IcedKeyCode::AbntC1, - BevyKeyCode::AbntC2 => IcedKeyCode::AbntC2, + // BevyKeyCode::AbntC1 => IcedKeyCode::AbntC1, + // BevyKeyCode::AbntC2 => IcedKeyCode::AbntC2, BevyKeyCode::NumpadAdd => IcedKeyCode::NumpadAdd, - BevyKeyCode::Plus => IcedKeyCode::Plus, - BevyKeyCode::Apostrophe => IcedKeyCode::Apostrophe, - BevyKeyCode::Apps => IcedKeyCode::Apps, - BevyKeyCode::At => IcedKeyCode::At, - BevyKeyCode::Ax => IcedKeyCode::Ax, + // BevyKeyCode::Plus => IcedKeyCode::Plus, + // BevyKeyCode::Apostrophe => IcedKeyCode::Apostrophe, + // BevyKeyCode::Apps => IcedKeyCode::Apps, + // BevyKeyCode::At => IcedKeyCode::At, + // BevyKeyCode::Ax => IcedKeyCode::Ax, BevyKeyCode::Backslash => IcedKeyCode::Backslash, - BevyKeyCode::Calculator => IcedKeyCode::Calculator, - BevyKeyCode::Capital => IcedKeyCode::Capital, - BevyKeyCode::Colon => IcedKeyCode::Colon, + BevyKeyCode::LaunchApp2 => IcedKeyCode::Calculator, + // BevyKeyCode::Capital => IcedKeyCode::Capital, + // BevyKeyCode::Colon => IcedKeyCode::Colon, BevyKeyCode::Comma => IcedKeyCode::Comma, BevyKeyCode::Convert => IcedKeyCode::Convert, BevyKeyCode::NumpadDecimal => IcedKeyCode::NumpadDecimal, BevyKeyCode::NumpadDivide => IcedKeyCode::NumpadDivide, - BevyKeyCode::Equals => IcedKeyCode::Equals, - BevyKeyCode::Grave => IcedKeyCode::Grave, - BevyKeyCode::Kana => IcedKeyCode::Kana, - BevyKeyCode::Kanji => IcedKeyCode::Kanji, + BevyKeyCode::Equal => IcedKeyCode::Equals, + BevyKeyCode::Backquote => IcedKeyCode::Grave, + BevyKeyCode::KanaMode => IcedKeyCode::Kana, + // BevyKeyCode::Kanji => IcedKeyCode::Kanji, BevyKeyCode::AltLeft => IcedKeyCode::LAlt, BevyKeyCode::BracketLeft => IcedKeyCode::LBracket, BevyKeyCode::ControlLeft => IcedKeyCode::LControl, BevyKeyCode::ShiftLeft => IcedKeyCode::LShift, BevyKeyCode::SuperLeft => IcedKeyCode::LWin, - BevyKeyCode::Mail => IcedKeyCode::Mail, + BevyKeyCode::LaunchMail => IcedKeyCode::Mail, BevyKeyCode::MediaSelect => IcedKeyCode::MediaSelect, BevyKeyCode::MediaStop => IcedKeyCode::MediaStop, BevyKeyCode::Minus => IcedKeyCode::Minus, BevyKeyCode::NumpadMultiply => IcedKeyCode::NumpadMultiply, - BevyKeyCode::Mute => IcedKeyCode::Mute, - BevyKeyCode::MyComputer => IcedKeyCode::MyComputer, - BevyKeyCode::NavigateForward => IcedKeyCode::NavigateForward, - BevyKeyCode::NavigateBackward => IcedKeyCode::NavigateBackward, - BevyKeyCode::NextTrack => IcedKeyCode::NextTrack, - BevyKeyCode::NoConvert => IcedKeyCode::NoConvert, + BevyKeyCode::AudioVolumeMute => IcedKeyCode::Mute, + BevyKeyCode::LaunchApp1 => IcedKeyCode::MyComputer, + // BevyKeyCode::BrowserForward => IcedKeyCode::NavigateForward, + // BevyKeyCode::BrowserBack => IcedKeyCode::NavigateBackward, + BevyKeyCode::MediaTrackNext => IcedKeyCode::NextTrack, + BevyKeyCode::NonConvert => IcedKeyCode::NoConvert, BevyKeyCode::NumpadComma => IcedKeyCode::NumpadComma, BevyKeyCode::NumpadEnter => IcedKeyCode::NumpadEnter, - BevyKeyCode::NumpadEquals => IcedKeyCode::NumpadEquals, - BevyKeyCode::Oem102 => IcedKeyCode::OEM102, + BevyKeyCode::NumpadEqual => IcedKeyCode::NumpadEquals, + // BevyKeyCode::Oem102 => IcedKeyCode::OEM102, BevyKeyCode::Period => IcedKeyCode::Period, - BevyKeyCode::PlayPause => IcedKeyCode::PlayPause, + BevyKeyCode::MediaPlayPause => IcedKeyCode::PlayPause, BevyKeyCode::Power => IcedKeyCode::Power, - BevyKeyCode::PrevTrack => IcedKeyCode::PrevTrack, + BevyKeyCode::MediaTrackPrevious => IcedKeyCode::PrevTrack, BevyKeyCode::AltRight => IcedKeyCode::RAlt, BevyKeyCode::BracketRight => IcedKeyCode::RBracket, BevyKeyCode::ControlRight => IcedKeyCode::RControl, @@ -152,27 +155,81 @@ pub fn key_code(virtual_keycode: BevyKeyCode) -> IcedKeyCode { BevyKeyCode::Semicolon => IcedKeyCode::Semicolon, BevyKeyCode::Slash => IcedKeyCode::Slash, BevyKeyCode::Sleep => IcedKeyCode::Sleep, - BevyKeyCode::Stop => IcedKeyCode::Stop, + // BevyKeyCode::Stop => IcedKeyCode::Stop, BevyKeyCode::NumpadSubtract => IcedKeyCode::NumpadSubtract, - BevyKeyCode::Sysrq => IcedKeyCode::Sysrq, + // BevyKeyCode::Sysrq => IcedKeyCode::Sysrq, BevyKeyCode::Tab => IcedKeyCode::Tab, - BevyKeyCode::Underline => IcedKeyCode::Underline, - BevyKeyCode::Unlabeled => IcedKeyCode::Unlabeled, - BevyKeyCode::VolumeDown => IcedKeyCode::VolumeDown, - BevyKeyCode::VolumeUp => IcedKeyCode::VolumeUp, - BevyKeyCode::Wake => IcedKeyCode::Wake, - BevyKeyCode::WebBack => IcedKeyCode::WebBack, - BevyKeyCode::WebFavorites => IcedKeyCode::WebFavorites, - BevyKeyCode::WebForward => IcedKeyCode::WebForward, - BevyKeyCode::WebHome => IcedKeyCode::WebHome, - BevyKeyCode::WebRefresh => IcedKeyCode::WebRefresh, - BevyKeyCode::WebSearch => IcedKeyCode::WebSearch, - BevyKeyCode::WebStop => IcedKeyCode::WebStop, - BevyKeyCode::Yen => IcedKeyCode::Yen, + // BevyKeyCode::Underline => IcedKeyCode::Underline, + // BevyKeyCode::Unlabeled => IcedKeyCode::Unlabeled, + BevyKeyCode::AudioVolumeDown => IcedKeyCode::VolumeDown, + BevyKeyCode::AudioVolumeUp => IcedKeyCode::VolumeUp, + BevyKeyCode::WakeUp => IcedKeyCode::Wake, + BevyKeyCode::BrowserBack => IcedKeyCode::WebBack, + BevyKeyCode::BrowserFavorites => IcedKeyCode::WebFavorites, + BevyKeyCode::BrowserForward => IcedKeyCode::WebForward, + BevyKeyCode::BrowserHome => IcedKeyCode::WebHome, + BevyKeyCode::BrowserRefresh => IcedKeyCode::WebRefresh, + BevyKeyCode::BrowserSearch => IcedKeyCode::WebSearch, + BevyKeyCode::BrowserStop => IcedKeyCode::WebStop, + BevyKeyCode::IntlYen => IcedKeyCode::Yen, BevyKeyCode::Copy => IcedKeyCode::Copy, BevyKeyCode::Paste => IcedKeyCode::Paste, BevyKeyCode::Cut => IcedKeyCode::Cut, - BevyKeyCode::Asterisk => IcedKeyCode::Asterisk, + BevyKeyCode::Unidentified(_) => IcedKeyCode::Unlabeled, + BevyKeyCode::IntlBackslash => IcedKeyCode::Backslash, + BevyKeyCode::NumpadBackspace => IcedKeyCode::Backspace, + // BevyKeyCode::Asterisk => IcedKeyCode::Asterisk, + BevyKeyCode::IntlRo => todo!(), + BevyKeyCode::Quote => todo!(), + BevyKeyCode::CapsLock => todo!(), + BevyKeyCode::ContextMenu => todo!(), + BevyKeyCode::Lang1 => todo!(), + BevyKeyCode::Lang2 => todo!(), + BevyKeyCode::Lang3 => todo!(), + BevyKeyCode::Lang4 => todo!(), + BevyKeyCode::Lang5 => todo!(), + BevyKeyCode::Help => todo!(), + BevyKeyCode::NumpadClear => todo!(), + BevyKeyCode::NumpadClearEntry => todo!(), + BevyKeyCode::NumpadHash => todo!(), + BevyKeyCode::NumpadMemoryAdd => todo!(), + BevyKeyCode::NumpadMemoryClear => todo!(), + BevyKeyCode::NumpadMemoryRecall => todo!(), + BevyKeyCode::NumpadMemoryStore => todo!(), + BevyKeyCode::NumpadMemorySubtract => todo!(), + BevyKeyCode::NumpadParenLeft => todo!(), + BevyKeyCode::NumpadParenRight => todo!(), + BevyKeyCode::NumpadStar => todo!(), + BevyKeyCode::Fn => todo!(), + BevyKeyCode::FnLock => todo!(), + BevyKeyCode::PrintScreen => todo!(), + BevyKeyCode::ScrollLock => todo!(), + BevyKeyCode::Eject => todo!(), + BevyKeyCode::Meta => todo!(), + BevyKeyCode::Hyper => todo!(), + BevyKeyCode::Turbo => todo!(), + BevyKeyCode::Abort => todo!(), + BevyKeyCode::Resume => todo!(), + BevyKeyCode::Suspend => todo!(), + BevyKeyCode::Again => todo!(), + BevyKeyCode::Find => todo!(), + BevyKeyCode::Open => todo!(), + BevyKeyCode::Props => todo!(), + BevyKeyCode::Select => todo!(), + BevyKeyCode::Undo => todo!(), + BevyKeyCode::Hiragana => todo!(), + BevyKeyCode::Katakana => todo!(), + BevyKeyCode::F25 => todo!(), + BevyKeyCode::F26 => todo!(), + BevyKeyCode::F27 => todo!(), + BevyKeyCode::F28 => todo!(), + BevyKeyCode::F29 => todo!(), + BevyKeyCode::F30 => todo!(), + BevyKeyCode::F31 => todo!(), + BevyKeyCode::F32 => todo!(), + BevyKeyCode::F33 => todo!(), + BevyKeyCode::F34 => todo!(), + BevyKeyCode::F35 => todo!(), } } @@ -183,6 +240,9 @@ pub fn mouse_button(button: MouseButton) -> iced_core::mouse::Button { MouseButton::Right => Button::Right, MouseButton::Middle => Button::Middle, MouseButton::Other(val) => Button::Other(val), + // TODO: We need https://github.com/iced-rs/iced/pull/2169 + MouseButton::Back => todo!(), + MouseButton::Forward => todo!(), } } diff --git a/src/lib.rs b/src/lib.rs index 631d0bd..b3feb6d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -117,17 +117,18 @@ impl IcedProps { .unwrap() .wgpu_device(); let queue = render_world.get_resource::().unwrap(); - #[cfg(target_arch = "wasm32")] - let format = iced_wgpu::wgpu::TextureFormat::Rgba8UnormSrgb; - #[cfg(not(target_arch = "wasm32"))] - let format = iced_wgpu::wgpu::TextureFormat::Bgra8UnormSrgb; - let mut backend = iced_wgpu::Backend::new(device, queue, config.settings, format); + let mut backend = + iced_wgpu::Backend::new(device, queue.as_ref(), config.settings, render::TEXTURE_FMT); for font in &config.fonts { backend.load_font(Cow::Borrowed(*font)); } Self { - renderer: Renderer::Wgpu(iced_wgpu::Renderer::new(backend)), + renderer: Renderer::Wgpu(iced_wgpu::Renderer::new( + backend, + iced_core::Font::default(), + iced_core::Pixels::from(12_f32), + )), debug: iced_runtime::Debug::new(), clipboard: iced_core::clipboard::Null, } @@ -267,7 +268,9 @@ impl<'w, 's, M: bevy_ecs::event::Event> IcedContext<'w, 's, M> { &mut messages, ); - messages.into_iter().for_each(|msg| self.messages.send(msg)); + messages.into_iter().for_each(|msg| { + self.messages.send(msg); + }); ui.draw(renderer, &self.settings.theme, &self.settings.style, cursor); diff --git a/src/render.rs b/src/render.rs index 4b8c0f1..d93e7ef 100644 --- a/src/render.rs +++ b/src/render.rs @@ -14,6 +14,7 @@ use bevy_render::{ use bevy_window::Window; use iced_core::Size; use iced_wgpu::wgpu::util::StagingBelt; +use iced_wgpu::wgpu::TextureFormat; use iced_widget::graphics::Viewport; use std::sync::Mutex; @@ -21,6 +22,11 @@ use crate::{DidDraw, IcedProps, IcedResource, IcedSettings}; pub const ICED_PASS: &str = "bevy_iced_pass"; +#[cfg(target_arch = "wasm32")] +pub const TEXTURE_FMT: TextureFormat = TextureFormat::Rgba8UnormSrgb; +#[cfg(not(target_arch = "wasm32"))] +pub const TEXTURE_FMT: TextureFormat = TextureFormat::Bgra8UnormSrgb; + #[derive(Resource, Deref, DerefMut, Clone)] pub struct ViewportResource(pub Viewport); @@ -30,7 +36,9 @@ pub(crate) fn update_viewport( mut commands: Commands, ) { let window = windows.single(); - let scale_factor = iced_settings.scale_factor.unwrap_or(window.scale_factor()); + let scale_factor = iced_settings + .scale_factor + .unwrap_or(window.scale_factor().into()); let viewport = Viewport::with_physical_size( Size::new(window.physical_width(), window.physical_height()), scale_factor, @@ -110,6 +118,7 @@ impl Node for IcedNode { render_queue, render_context.command_encoder(), None, + TEXTURE_FMT, view, primitives, viewport, diff --git a/src/systems.rs b/src/systems.rs index bee877c..751f847 100644 --- a/src/systems.rs +++ b/src/systems.rs @@ -9,7 +9,7 @@ use bevy_input::touch::TouchInput; use bevy_input::{ keyboard::KeyboardInput, mouse::{MouseButtonInput, MouseWheel}, - ButtonState, Input, + ButtonInput, ButtonState, }; use bevy_window::{CursorEntered, CursorLeft, CursorMoved, ReceivedCharacter}; use iced_core::{keyboard, mouse, Event as IcedEvent, Point}; @@ -29,7 +29,7 @@ pub struct InputEvents<'w, 's> { touch_input: EventReader<'w, 's, TouchInput>, } -fn compute_modifiers(input_map: &Input) -> keyboard::Modifiers { +fn compute_modifiers(input_map: &ButtonInput) -> keyboard::Modifiers { let mut modifiers = keyboard::Modifiers::default(); if input_map.any_pressed([KeyCode::ControlLeft, KeyCode::ControlRight]) { modifiers |= keyboard::Modifiers::CTRL; @@ -49,17 +49,17 @@ fn compute_modifiers(input_map: &Input) -> keyboard::Modifiers { pub fn process_input( mut events: InputEvents, mut event_queue: ResMut, - input_map: Res>, + input_map: Res>, ) { event_queue.clear(); - for ev in events.cursor.iter() { + for ev in events.cursor.read() { event_queue.push(IcedEvent::Mouse(mouse::Event::CursorMoved { position: Point::new(ev.position.x, ev.position.y), })); } - for ev in events.mouse_button.iter() { + for ev in events.mouse_button.read() { let button = conversions::mouse_button(ev.button); event_queue.push(IcedEvent::Mouse(match ev.state { ButtonState::Pressed => iced_core::mouse::Event::ButtonPressed(button), @@ -67,60 +67,60 @@ pub fn process_input( })) } - for _ev in events.cursor_entered.iter() { + for _ev in events.cursor_entered.read() { event_queue.push(IcedEvent::Mouse(iced_core::mouse::Event::CursorEntered)); } - for _ev in events.cursor_left.iter() { + for _ev in events.cursor_left.read() { event_queue.push(IcedEvent::Mouse(iced_core::mouse::Event::CursorLeft)); } - for ev in events.mouse_wheel.iter() { + for ev in events.mouse_wheel.read() { event_queue.push(IcedEvent::Mouse(iced_core::mouse::Event::WheelScrolled { delta: mouse::ScrollDelta::Pixels { x: ev.x, y: ev.y }, })); } - for ev in events.received_character.iter() { - event_queue.push(IcedEvent::Keyboard( - iced_core::keyboard::Event::CharacterReceived(ev.char), - )); + for ev in events.received_character.read() { + for char in ev.char.chars() { + event_queue.push(IcedEvent::Keyboard( + iced_core::keyboard::Event::CharacterReceived(char), + )); + } } - for ev in events.keyboard_input.iter() { - if let Some(code) = ev.key_code { - use keyboard::Event::*; - let modifiers = compute_modifiers(&input_map); - let event = match code { - KeyCode::ControlLeft - | KeyCode::ControlRight - | KeyCode::ShiftLeft - | KeyCode::ShiftRight - | KeyCode::AltLeft - | KeyCode::AltRight - | KeyCode::SuperLeft - | KeyCode::SuperRight => ModifiersChanged(modifiers), - code => { - let key_code = conversions::key_code(code); - if ev.state.is_pressed() { - KeyPressed { - key_code, - modifiers, - } - } else { - KeyReleased { - key_code, - modifiers, - } + for ev in events.keyboard_input.read() { + use keyboard::Event::*; + let modifiers = compute_modifiers(&input_map); + let event = match ev.key_code { + KeyCode::ControlLeft + | KeyCode::ControlRight + | KeyCode::ShiftLeft + | KeyCode::ShiftRight + | KeyCode::AltLeft + | KeyCode::AltRight + | KeyCode::SuperLeft + | KeyCode::SuperRight => ModifiersChanged(modifiers), + code => { + let key_code = conversions::key_code(code); + if ev.state.is_pressed() { + KeyPressed { + key_code, + modifiers, + } + } else { + KeyReleased { + key_code, + modifiers, } } - }; + } + }; - event_queue.push(IcedEvent::Keyboard(event)); - } + event_queue.push(IcedEvent::Keyboard(event)); } - for ev in events.touch_input.iter() { + for ev in events.touch_input.read() { event_queue.push(IcedEvent::Touch(conversions::touch_event(ev))); } } From dd80b44376a38b67812825ff8adba0cf6d67dbd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Thu, 11 Jan 2024 15:07:35 +0000 Subject: [PATCH 02/10] fix re-export shadowing warning --- src/iced.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/iced.rs b/src/iced.rs index 70b403d..71a3d8c 100644 --- a/src/iced.rs +++ b/src/iced.rs @@ -54,6 +54,7 @@ pub mod touch { pub use iced_core::touch::{Event, Finger}; } +#[allow(hidden_glob_reexports)] pub mod widget { //! Use the built-in widgets or create your own. pub use iced_widget::*; From e1a397cb7f7afe9fb07256c2c3ba5d025b26bf05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Fri, 12 Jan 2024 20:27:06 +0000 Subject: [PATCH 03/10] upstreamed https://github.com/iced-rs/iced/pull/2197 --- Cargo.lock | 18 +++++++++--------- Cargo.toml | 11 +++++------ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 91289f9..9f02067 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2233,7 +2233,7 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/tzemanovic/iced/?branch=wgpu-renderer-send#3c6bb0a076c4433abe2a381856250c9d9693404e" +source = "git+https://github.com/iced-rs/iced/?branch=master#50c310fd9f692eafb2350827636ffbd6d7b6c9b9" dependencies = [ "bitflags 1.3.2", "instant", @@ -2248,7 +2248,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/tzemanovic/iced/?branch=wgpu-renderer-send#3c6bb0a076c4433abe2a381856250c9d9693404e" +source = "git+https://github.com/iced-rs/iced/?branch=master#50c310fd9f692eafb2350827636ffbd6d7b6c9b9" dependencies = [ "futures", "iced_core", @@ -2260,7 +2260,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/tzemanovic/iced/?branch=wgpu-renderer-send#3c6bb0a076c4433abe2a381856250c9d9693404e" +source = "git+https://github.com/iced-rs/iced/?branch=master#50c310fd9f692eafb2350827636ffbd6d7b6c9b9" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2280,7 +2280,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/tzemanovic/iced/?branch=wgpu-renderer-send#3c6bb0a076c4433abe2a381856250c9d9693404e" +source = "git+https://github.com/iced-rs/iced/?branch=master#50c310fd9f692eafb2350827636ffbd6d7b6c9b9" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2293,7 +2293,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/tzemanovic/iced/?branch=wgpu-renderer-send#3c6bb0a076c4433abe2a381856250c9d9693404e" +source = "git+https://github.com/iced-rs/iced/?branch=master#50c310fd9f692eafb2350827636ffbd6d7b6c9b9" dependencies = [ "iced_core", "iced_futures", @@ -2303,7 +2303,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/tzemanovic/iced/?branch=wgpu-renderer-send#3c6bb0a076c4433abe2a381856250c9d9693404e" +source = "git+https://github.com/iced-rs/iced/?branch=master#50c310fd9f692eafb2350827636ffbd6d7b6c9b9" dependencies = [ "iced_core", "once_cell", @@ -2313,7 +2313,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/tzemanovic/iced/?branch=wgpu-renderer-send#3c6bb0a076c4433abe2a381856250c9d9693404e" +source = "git+https://github.com/iced-rs/iced/?branch=master#50c310fd9f692eafb2350827636ffbd6d7b6c9b9" dependencies = [ "bytemuck", "cosmic-text", @@ -2330,7 +2330,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/tzemanovic/iced/?branch=wgpu-renderer-send#3c6bb0a076c4433abe2a381856250c9d9693404e" +source = "git+https://github.com/iced-rs/iced/?branch=master#50c310fd9f692eafb2350827636ffbd6d7b6c9b9" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2348,7 +2348,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/tzemanovic/iced/?branch=wgpu-renderer-send#3c6bb0a076c4433abe2a381856250c9d9693404e" +source = "git+https://github.com/iced-rs/iced/?branch=master#50c310fd9f692eafb2350827636ffbd6d7b6c9b9" dependencies = [ "iced_renderer", "iced_runtime", diff --git a/Cargo.toml b/Cargo.toml index 26b1a9f..ca31ea1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,17 +32,16 @@ bevy_utils = { git = "https://github.com/bevyengine/bevy", branch = "main" } bevy_window = { git = "https://github.com/bevyengine/bevy", branch = "main" } # NOTE: temp using "master" branch until a release with wgpu version matching bevy -# NOTE: temp using "wgpu-renderer-send" because the `wgpu::Renderer` is no longer `Send` on master # iced_core = "0.10" # iced_runtime = "0.1" # iced_wgpu = "0.11" # iced_widget = "0.1" # iced_renderer = { version = "0.1", features = ["wgpu"] } -iced_core = { git = "https://github.com/tzemanovic/iced/", branch = "wgpu-renderer-send" } -iced_runtime = { git = "https://github.com/tzemanovic/iced/", branch = "wgpu-renderer-send" } -iced_wgpu = { git = "https://github.com/tzemanovic/iced/", branch = "wgpu-renderer-send" } -iced_widget = { git = "https://github.com/tzemanovic/iced/", branch = "wgpu-renderer-send" } -iced_renderer = { git = "https://github.com/tzemanovic/iced/", branch = "wgpu-renderer-send", features = ["wgpu"]} +iced_core = { git = "https://github.com/iced-rs/iced/", branch = "master" } +iced_runtime = { git = "https://github.com/iced-rs/iced/", branch = "master" } +iced_wgpu = { git = "https://github.com/iced-rs/iced/", branch = "master" } +iced_widget = { git = "https://github.com/iced-rs/iced/", branch = "master" } +iced_renderer = { git = "https://github.com/iced-rs/iced/", branch = "master", features = ["wgpu"]} [dev-dependencies] # bevy = "0.12" From 351738950cad170b26e861b34f7b37d84ea7286f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Tue, 20 Feb 2024 18:02:36 +0000 Subject: [PATCH 04/10] update to bevy 0.13 --- Cargo.lock | 947 +++++++++++++++++++++------------------------ Cargo.toml | 42 +- src/conversions.rs | 537 ++++++++++++++----------- src/iced.rs | 17 +- src/lib.rs | 15 +- src/render.rs | 8 +- src/systems.rs | 28 +- 7 files changed, 803 insertions(+), 791 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9f02067..79c04ea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -68,19 +68,10 @@ dependencies = [ "accesskit", "accesskit_macos", "accesskit_windows", - "raw-window-handle", + "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" @@ -225,17 +216,6 @@ dependencies = [ "futures-core", ] -[[package]] -name = "async-channel" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -dependencies = [ - "concurrent-queue", - "event-listener 2.5.3", - "futures-core", -] - [[package]] name = "async-channel" version = "2.1.1" @@ -258,7 +238,7 @@ dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand 2.0.1", + "fastrand", "futures-lite", "slab", ] @@ -303,21 +283,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.21.5" @@ -326,16 +291,18 @@ checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "bevy" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "611dd99f412e862610adb43e2243b16436c6d8009f6d9dbe8ce3d6d840b34029" dependencies = [ "bevy_internal", ] [[package]] name = "bevy_a11y" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf80cd6d0dca4073f9b34b16f1d187a4caa035fd841892519431783bbc9e287" dependencies = [ "accesskit", "bevy_app", @@ -345,8 +312,9 @@ dependencies = [ [[package]] name = "bevy_animation" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa4ef4c35533df3f0c4e938cf6a831456ea563775bab799336f74331140c7665" dependencies = [ "bevy_app", "bevy_asset", @@ -363,8 +331,9 @@ dependencies = [ [[package]] name = "bevy_app" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bce3544afc010ffed39c136f6d5a9322d20d38df1394d468ba9106caa0434cb" dependencies = [ "bevy_derive", "bevy_ecs", @@ -378,8 +347,9 @@ dependencies = [ [[package]] name = "bevy_asset" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac185d8e29c7eb0194f8aae7af3f7234f7ca7a448293be1d3d0d8fef435f65ec" dependencies = [ "async-broadcast", "async-fs", @@ -409,8 +379,9 @@ dependencies = [ [[package]] name = "bevy_asset_macros" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb82d1aac8251378c45a8d0ad788d1bf75f54db28c1750f84f1fd7c00127927a" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -420,8 +391,9 @@ dependencies = [ [[package]] name = "bevy_audio" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fe7f952e5e0a343fbde43180db7b8e719ad78594480c91b26876623944a3a1" dependencies = [ "bevy_app", "bevy_asset", @@ -437,8 +409,9 @@ dependencies = [ [[package]] name = "bevy_core" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7b1b340b8d08f48ecd51b97589d261f5023a7b073d25e300382c49146524103" dependencies = [ "bevy_app", "bevy_ecs", @@ -451,8 +424,9 @@ dependencies = [ [[package]] name = "bevy_core_pipeline" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "626a5aaadbdd69eae020c5856575d2d0113423ae1ae1351377e20956d940052c" dependencies = [ "bevy_app", "bevy_asset", @@ -472,8 +446,9 @@ dependencies = [ [[package]] name = "bevy_derive" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "028ae2a34678055185d7f1beebb1ebe6a8dcf3733e139e4ee1383a7f29ae8ba6" dependencies = [ "bevy_macro_utils", "quote", @@ -482,8 +457,9 @@ dependencies = [ [[package]] name = "bevy_diagnostic" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01a104acfdc5280accd01a3524810daf3bda72924e3da0c8a9ec816a57eef4e3" dependencies = [ "bevy_app", "bevy_core", @@ -491,15 +467,17 @@ dependencies = [ "bevy_log", "bevy_time", "bevy_utils", + "const-fnv1a-hash", "sysinfo", ] [[package]] name = "bevy_ecs" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b85406d5febbbdbcac4444ef61cd9a816f2f025ed692a3fc5439a32153070304" dependencies = [ - "async-channel 1.9.0", + "async-channel", "bevy_ecs_macros", "bevy_ptr", "bevy_reflect", @@ -515,8 +493,9 @@ dependencies = [ [[package]] name = "bevy_ecs_macros" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3ce4b65d7c5f1990e729df75cec2ea6e2241b4a0c37b31c281a04c59c11b7b" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -526,17 +505,19 @@ dependencies = [ [[package]] name = "bevy_encase_derive" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c3d301922e76b16819e17c8cc43b34e92c13ccd06ad19dfa3e52a91a0e13e5c" dependencies = [ "bevy_macro_utils", - "encase_derive_impl 0.6.1", + "encase_derive_impl", ] [[package]] name = "bevy_gilrs" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96364a1875ee4545fcf825c78dc065ddb9a3b2a509083ef11142f9de0eb8aa17" dependencies = [ "bevy_app", "bevy_ecs", @@ -550,14 +531,17 @@ dependencies = [ [[package]] name = "bevy_gizmos" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdca80b7b4db340eb666d69374a0195b3935759120d0b990fcef8b27d0fb3680" dependencies = [ "bevy_app", "bevy_asset", "bevy_core", "bevy_core_pipeline", "bevy_ecs", + "bevy_gizmos_macros", + "bevy_log", "bevy_math", "bevy_pbr", "bevy_reflect", @@ -567,10 +551,23 @@ dependencies = [ "bevy_utils", ] +[[package]] +name = "bevy_gizmos_macros" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a949eb8b4538a6e4d875321cda2b63dc0fb0317cf18c8245ca5a32f24f6d26d" +dependencies = [ + "bevy_macro_utils", + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "bevy_gltf" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "031d0c2a7c0353bb9ac08a5130e58b9a2de3cdaa3c31b5da00b22a9e4732a155" dependencies = [ "base64", "bevy_animation", @@ -598,8 +595,9 @@ dependencies = [ [[package]] name = "bevy_hierarchy" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9f9f843e43d921f07658c24eae74285efc7a335c87998596f3f365155320c69" dependencies = [ "bevy_app", "bevy_core", @@ -632,21 +630,24 @@ dependencies = [ [[package]] name = "bevy_input" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9cb5b2f3747ffb00cf7e3d6b52f7384476921cd31f0cfd3d1ddff31f83d9252" 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/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7af89c7083830b1d65fcf0260c3d2537c397fe8ce871471b6e97198a4704f23e" dependencies = [ "bevy_a11y", "bevy_animation", @@ -683,8 +684,9 @@ dependencies = [ [[package]] name = "bevy_log" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfd5bcc3531f8008897fb03cc8751b86d0d29ef94f8fd38b422f9603b7ae80d0" dependencies = [ "android_log-sys", "bevy_app", @@ -698,37 +700,41 @@ dependencies = [ [[package]] name = "bevy_macro_utils" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac4401c25b197e7c1455a4875a90b61bba047a9e8d290ce029082c818ab1a21c" dependencies = [ "proc-macro2", "quote", "rustc-hash", "syn 2.0.48", - "toml_edit 0.20.7", + "toml_edit 0.21.1", ] [[package]] name = "bevy_math" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f312b1b8aa6d3965b65040b08e33efac030db3071f20b44f9da9c4c3dfcaf76" dependencies = [ - "glam 0.25.0", + "glam", "serde", ] [[package]] name = "bevy_mikktspace" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3075c01f2b1799945892d5310fc1836e47c045dfe6af5878a304a475931a0c5f" dependencies = [ - "glam 0.25.0", + "glam", ] [[package]] name = "bevy_pbr" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31c72bf12e50ff76c9ed9a7c51ceb88bfea9865d00f24d95b12344fffe1e270" dependencies = [ "bevy_app", "bevy_asset", @@ -744,7 +750,6 @@ dependencies = [ "bitflags 2.4.1", "bytemuck", "fixedbitset", - "naga_oil", "radsort", "smallvec", "thread_local", @@ -752,13 +757,15 @@ dependencies = [ [[package]] name = "bevy_ptr" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86afa4a88ee06b10fe1e6f28a796ba2eedd16804717cbbb911df0cbb0cd6677b" [[package]] name = "bevy_reflect" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "133dfab8d403d0575eeed9084e85780bbb449dcf75dd687448439117789b40a2" dependencies = [ "bevy_math", "bevy_ptr", @@ -766,7 +773,7 @@ dependencies = [ "bevy_utils", "downcast-rs", "erased-serde", - "glam 0.25.0", + "glam", "serde", "smol_str", "thiserror", @@ -774,8 +781,9 @@ dependencies = [ [[package]] name = "bevy_reflect_derive" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce1679a4dfdb2c9ff24ca590914c3cec119d7c9e1b56fa637776913acc030386" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -786,10 +794,11 @@ dependencies = [ [[package]] name = "bevy_render" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b194b7029b7541ef9206ac3cb696d3cb37f70bd3260d293fc00d378547e892" dependencies = [ - "async-channel 1.9.0", + "async-channel", "bevy_app", "bevy_asset", "bevy_core", @@ -830,8 +839,9 @@ dependencies = [ [[package]] name = "bevy_render_macros" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4aa6d99b50375bb7f63be2c3055dfe2f926f7b3c4db108bb0b1181b4f02766aa" dependencies = [ "bevy_macro_utils", "proc-macro2", @@ -841,8 +851,9 @@ dependencies = [ [[package]] name = "bevy_scene" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c3c82eaff0b22949183a75a7e2d7fc4ece808235918b34c5b282aab52c3563a" dependencies = [ "bevy_app", "bevy_asset", @@ -860,8 +871,9 @@ dependencies = [ [[package]] name = "bevy_sprite" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ea977d7d7c48fc4ba283d449f09528c4e70db17c9048e32e99ecd9890d72223" dependencies = [ "bevy_app", "bevy_asset", @@ -885,10 +897,11 @@ dependencies = [ [[package]] name = "bevy_tasks" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b20f243f6fc4c4ba10c2dbff891e947ddae947bb20b263f43e023558b35294bd" dependencies = [ - "async-channel 1.9.0", + "async-channel", "async-executor", "async-task", "concurrent-queue", @@ -898,8 +911,9 @@ dependencies = [ [[package]] name = "bevy_text" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "006990d27551dbc339774178e833290952511621662fd5ca23a4e6e922ab2d9f" dependencies = [ "ab_glyph", "bevy_app", @@ -919,8 +933,9 @@ dependencies = [ [[package]] name = "bevy_time" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9738901b6b251d2c9250542af7002d6f671401fc3b74504682697c5ec822f210" dependencies = [ "bevy_app", "bevy_ecs", @@ -932,8 +947,9 @@ dependencies = [ [[package]] name = "bevy_transform" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba73744a95bc4b8683e91cea3e79b1ad0844c1d677f31fbbc1814c79a5b4f8f0" dependencies = [ "bevy_app", "bevy_ecs", @@ -945,8 +961,9 @@ dependencies = [ [[package]] name = "bevy_ui" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fafe872906bac6d7fc8ecff166f56b4253465b2895ed88801499aa113548ccc6" dependencies = [ "bevy_a11y", "bevy_app", @@ -972,8 +989,9 @@ dependencies = [ [[package]] name = "bevy_utils" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94a06aca1c1863606416b892f4c79e300dbc6211b6690953269051a431c2cca0" dependencies = [ "ahash", "bevy_utils_proc_macros", @@ -990,8 +1008,9 @@ dependencies = [ [[package]] name = "bevy_utils_proc_macros" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31ae98e9c0c08b0f5c90e22cd713201f759b98d4fd570b99867a695f8641859a" dependencies = [ "proc-macro2", "quote", @@ -1000,8 +1019,9 @@ dependencies = [ [[package]] name = "bevy_window" -version = "0.12.0" -source = "git+https://github.com/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb627efd7622a61398ac0d3674f93c997cffe16f13c59fb8ae8a05c9e28de961" dependencies = [ "bevy_a11y", "bevy_app", @@ -1010,14 +1030,15 @@ 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/bevyengine/bevy?branch=main#a6574786757c0a0a7ddffb99fdc40ce90980fc82" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55105324a201941ae587790f83f6d9caa327e0baa0205558ec41e5ee05a1f703" dependencies = [ "accesskit_winit", "approx", @@ -1032,7 +1053,7 @@ dependencies = [ "bevy_utils", "bevy_window", "crossbeam-channel", - "raw-window-handle", + "raw-window-handle 0.6.0", "wasm-bindgen", "web-sys", "winit", @@ -1151,10 +1172,10 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ - "async-channel 2.1.1", + "async-channel", "async-lock", "async-task", - "fastrand 2.0.1", + "fastrand", "futures-io", "futures-lite", "piper", @@ -1250,6 +1271,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "cfg_aliases" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f" + [[package]] name = "clang-sys" version = "1.7.0" @@ -1263,16 +1290,16 @@ dependencies = [ [[package]] name = "cocoa" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" dependencies = [ "bitflags 1.3.2", "block", "cocoa-foundation", "core-foundation", - "core-graphics 0.22.3", - "foreign-types 0.3.2", + "core-graphics", + "foreign-types", "libc", "objc", ] @@ -1308,10 +1335,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" @@ -1342,6 +1394,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" @@ -1385,19 +1443,6 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" -[[package]] -name = "core-graphics" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types 0.3.2", - "libc", -] - [[package]] name = "core-graphics" version = "0.23.1" @@ -1407,7 +1452,7 @@ dependencies = [ "bitflags 1.3.2", "core-foundation", "core-graphics-types", - "foreign-types 0.5.0", + "foreign-types", "libc", ] @@ -1522,6 +1567,16 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "ctor" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" +dependencies = [ + "quote", + "syn 2.0.48", +] + [[package]] name = "cursor-icon" version = "1.1.0" @@ -1530,9 +1585,9 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" [[package]] name = "d3d12" -version = "0.7.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20" +checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307" dependencies = [ "bitflags 2.4.1", "libloading 0.8.1", @@ -1551,6 +1606,17 @@ 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 = "dispatch" version = "0.2.0" @@ -1572,6 +1638,45 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +[[package]] +name = "drm" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde" +dependencies = [ + "bitflags 2.4.1", + "bytemuck", + "drm-ffi", + "drm-fourcc", + "rustix", +] + +[[package]] +name = "drm-ffi" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" +dependencies = [ + "drm-sys", + "rustix", +] + +[[package]] +name = "drm-fourcc" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" + +[[package]] +name = "drm-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176" +dependencies = [ + "libc", + "linux-raw-sys 0.6.4", +] + [[package]] name = "encase" version = "0.7.0" @@ -1580,7 +1685,7 @@ checksum = "95ed933078d2e659745df651f4c180511cd582e5b9414ff896e7d50d207e3103" dependencies = [ "const_panic", "encase_derive", - "glam 0.25.0", + "glam", "thiserror", ] @@ -1590,18 +1695,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4ce1449c7d19eba6cc0abd231150ad81620a8dce29601d7f8d236e5d431d72a" dependencies = [ - "encase_derive_impl 0.7.0", -] - -[[package]] -name = "encase_derive_impl" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fe2568f851fd6144a45fa91cfed8fe5ca8fc0b56ba6797bfc1ed2771b90e37c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", + "encase_derive_impl", ] [[package]] @@ -1623,9 +1717,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "erased-serde" -version = "0.3.31" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" +checksum = "388979d208a049ffdfb22fa33b9c81942215b940910bccfe258caeb25d125cb3" dependencies = [ "serde", ] @@ -1692,15 +1786,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" -[[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" @@ -1732,18 +1817,6 @@ dependencies = [ "miniz_oxide", ] -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "spin", -] - [[package]] name = "fnv" version = "1.0.7" @@ -1767,21 +1840,12 @@ checksum = "020e203f177c0fb250fb19455a252e838d2bbbce1f80f25ecc42402aafa8cd38" dependencies = [ "fontconfig-parser", "log", - "memmap2", + "memmap2 0.8.0", "slotmap", "tinyvec", "ttf-parser 0.19.2", ] -[[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" @@ -1789,7 +1853,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]] @@ -1803,12 +1867,6 @@ dependencies = [ "syn 2.0.48", ] -[[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" @@ -1870,7 +1928,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" dependencies = [ - "fastrand 2.0.1", + "fastrand", "futures-core", "futures-io", "parking", @@ -1918,16 +1976,6 @@ dependencies = [ "slab", ] -[[package]] -name = "gethostname" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "gethostname" version = "0.4.3" @@ -1985,12 +2033,6 @@ dependencies = [ "windows 0.52.0", ] -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - [[package]] name = "gl_generator" version = "0.14.0" @@ -2002,12 +2044,6 @@ dependencies = [ "xml-rs", ] -[[package]] -name = "glam" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" - [[package]] name = "glam" version = "0.25.0" @@ -2026,9 +2062,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "glow" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "886c2a30b160c4c6fec8f987430c26b526b7988ca71f664e6a699ddf6f9601e4" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" dependencies = [ "js-sys", "slotmap", @@ -2094,8 +2130,9 @@ dependencies = [ [[package]] name = "glyphon" -version = "0.3.0" -source = "git+https://github.com/grovesNL/glyphon.git?rev=2caa9fc5e5923c1d827d177c3619cab7e9885b85#2caa9fc5e5923c1d827d177c3619cab7e9885b85" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a62d0338e4056db6a73221c2fb2e30619452f6ea9651bac4110f51b0f7a7581" dependencies = [ "cosmic-text", "etagere", @@ -2124,16 +2161,15 @@ dependencies = [ [[package]] name = "gpu-allocator" -version = "0.23.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40fe17c8a05d60c38c0a4e5a3c802f2f1ceb66b76c67d96ffb34bef0475a7fad" +checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" dependencies = [ - "backtrace", "log", "presser", "thiserror", "winapi", - "windows 0.51.1", + "windows 0.52.0", ] [[package]] @@ -2195,14 +2231,14 @@ dependencies = [ [[package]] name = "hassle-rs" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" +checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" dependencies = [ - "bitflags 1.3.2", - "com-rs", + "bitflags 2.4.1", + "com", "libc", - "libloading 0.7.4", + "libloading 0.8.1", "thiserror", "widestring", "winapi", @@ -2221,7 +2257,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f33ddb7f7143d9e703c072e88b98cd8b9719f174137a671429351bd2ee43c02a" dependencies = [ "constgebra", - "glam 0.25.0", + "glam", ] [[package]] @@ -2233,22 +2269,26 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/iced-rs/iced/?branch=master#50c310fd9f692eafb2350827636ffbd6d7b6c9b9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55f9226618af7e8155fc8a233e4d84dc1ec44438705f972e35d5d50e62f937df" dependencies = [ - "bitflags 1.3.2", - "instant", + "bitflags 2.4.1", + "glam", "log", "num-traits", "palette", - "raw-window-handle", + "raw-window-handle 0.6.0", + "smol_str", "thiserror", + "web-time", "xxhash-rust", ] [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/iced-rs/iced/?branch=master#50c310fd9f692eafb2350827636ffbd6d7b6c9b9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "370bad88fb3832cbeeb3fa6c486b4701fb7e8da32a753b3101d4ce81fc1d9497" dependencies = [ "futures", "iced_core", @@ -2260,17 +2300,18 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/iced-rs/iced/?branch=master#50c310fd9f692eafb2350827636ffbd6d7b6c9b9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0660df444c64a13f72999c55a324f6d3ea020167bb1af8ef43fe2bff168d8c27" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "bytemuck", "cosmic-text", - "glam 0.24.2", "half", "iced_core", + "iced_futures", "log", "once_cell", - "raw-window-handle", + "raw-window-handle 0.6.0", "rustc-hash", "thiserror", "unicode-segmentation", @@ -2280,30 +2321,33 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/iced-rs/iced/?branch=master#50c310fd9f692eafb2350827636ffbd6d7b6c9b9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59d931249515deb5fe116c7d199792cd9fd32d31bf18ffc08c6c2ad2dee5fd3e" dependencies = [ "iced_graphics", "iced_tiny_skia", "iced_wgpu", "log", - "raw-window-handle", "thiserror", ] [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/iced-rs/iced/?branch=master#50c310fd9f692eafb2350827636ffbd6d7b6c9b9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "618a845cd752ca195f0805b7a4f0be42c071a4fdef0b88df047006572d219a5a" dependencies = [ "iced_core", "iced_futures", + "raw-window-handle 0.6.0", "thiserror", ] [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/iced-rs/iced/?branch=master#50c310fd9f692eafb2350827636ffbd6d7b6c9b9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb6b3992bceeac1393ce0e83d06ab786be4c17c6a0004eefbdd4f6d89d5e8058" dependencies = [ "iced_core", "once_cell", @@ -2313,14 +2357,14 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/iced-rs/iced/?branch=master#50c310fd9f692eafb2350827636ffbd6d7b6c9b9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e079a4ae34df06894500e486b20bae8d8f2806fd64efe4fa9abe329e7f585f21" dependencies = [ "bytemuck", "cosmic-text", "iced_graphics", "kurbo", "log", - "raw-window-handle", "rustc-hash", "softbuffer", "tiny-skia", @@ -2330,25 +2374,26 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/iced-rs/iced/?branch=master#50c310fd9f692eafb2350827636ffbd6d7b6c9b9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa5d3ce370c7044ddc9535c8f87057f1008434a495be6b9f46b2666c3e9638f7" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "bytemuck", "futures", - "glam 0.24.2", + "glam", "glyphon", "guillotiere", "iced_graphics", "log", "once_cell", - "raw-window-handle", "wgpu", ] [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/iced-rs/iced/?branch=master#50c310fd9f692eafb2350827636ffbd6d7b6c9b9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99f30ebbcc0706c19a92f01669193271d82bb209fda83576392d04cef3214ca2" dependencies = [ "iced_renderer", "iced_runtime", @@ -2438,17 +2483,6 @@ dependencies = [ "mach2", ] -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "itoa" version = "1.0.10" @@ -2516,9 +2550,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" dependencies = [ "wasm-bindgen", ] @@ -2551,11 +2585,12 @@ dependencies = [ [[package]] name = "kurbo" -version = "0.9.5" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +checksum = "1618d4ebd923e97d67e7cd363d80aef35fe961005cbbbb3d2dad8bdd1bc63440" dependencies = [ "arrayvec", + "smallvec", ] [[package]] @@ -2640,6 +2675,12 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +[[package]] +name = "linux-raw-sys" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" + [[package]] name = "lock_api" version = "0.4.11" @@ -2658,9 +2699,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lru" -version = "0.11.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" +checksum = "db2c024b41519440580066ba82aab04092b333e09066a5eb86c7c4890df31f22" dependencies = [ "hashbrown", ] @@ -2708,21 +2749,12 @@ dependencies = [ ] [[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.7.1" +name = "memmap2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ - "autocfg", + "libc", ] [[package]] @@ -2734,7 +2766,7 @@ dependencies = [ "bitflags 2.4.1", "block", "core-graphics-types", - "foreign-types 0.5.0", + "foreign-types", "log", "objc", "paste", @@ -2758,9 +2790,9 @@ dependencies = [ [[package]] name = "naga" -version = "0.14.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae585df4b6514cf8842ac0f1ab4992edc975892704835b549cf818dc0191249e" +checksum = "8878eb410fc90853da3908aebfe61d73d26d4437ef850b70050461f939509899" dependencies = [ "bit-set", "bitflags 2.4.1", @@ -2779,9 +2811,9 @@ dependencies = [ [[package]] name = "naga_oil" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff3f369dd665ee365daeab786466a6f70ff53e4a95a76117363b1077e1b0492" +checksum = "c0ea62ae0f2787456afca7209ca180522b41f00cbe159ee369eba1e07d365cd1" dependencies = [ "bit-set", "codespan-reporting", @@ -2790,22 +2822,13 @@ dependencies = [ "naga", "once_cell", "regex", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", "rustc-hash", "thiserror", "tracing", "unicode-ident", ] -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom", -] - [[package]] name = "ndk" version = "0.7.0" @@ -2816,7 +2839,7 @@ dependencies = [ "jni-sys", "ndk-sys 0.4.1+23.1.7779620", "num_enum 0.5.11", - "raw-window-handle", + "raw-window-handle 0.5.2", "thiserror", ] @@ -2831,7 +2854,7 @@ dependencies = [ "log", "ndk-sys 0.5.0+25.2.9519653", "num_enum 0.7.2", - "raw-window-handle", + "raw-window-handle 0.6.0", "thiserror", ] @@ -2870,32 +2893,6 @@ dependencies = [ "libc", ] -[[package]] -name = "nix" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.6.5", -] - -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", - "pin-utils", -] - [[package]] name = "nix" version = "0.27.1" @@ -3102,15 +3099,6 @@ dependencies = [ "cc", ] -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - [[package]] name = "oboe" version = "0.5.0" @@ -3339,7 +3327,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand", "futures-io", ] @@ -3424,9 +3412,9 @@ checksum = "d135ede8821cf6376eb7a64148901e1690b788c11ae94dc297ae917dbc91dc0e" [[package]] name = "quick-xml" -version = "0.28.2" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] @@ -3494,6 +3482,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" @@ -3565,12 +3559,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" @@ -3614,12 +3602,6 @@ dependencies = [ "xmlparser", ] -[[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" @@ -3635,7 +3617,7 @@ dependencies = [ "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys", + "linux-raw-sys 0.4.12", "windows-sys 0.52.0", ] @@ -3658,12 +3640,12 @@ dependencies = [ [[package]] name = "ruzstd" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc" +checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d" dependencies = [ "byteorder", - "thiserror-core", + "derive_more", "twox-hash", ] @@ -3796,49 +3778,42 @@ dependencies = [ [[package]] name = "softbuffer" -version = "0.2.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2b953f6ba7285f0af131eb748aabd8ddaf53e0b81dda3ba5d803b0847d6559f" +checksum = "071916a85d1db274b4ed57af3a14afb66bd836ae7f82ebb6f1fd3455107830d9" dependencies = [ + "as-raw-xcb-connection", "bytemuck", - "cfg_aliases", + "cfg_aliases 0.2.0", "cocoa", - "core-graphics 0.22.3", - "fastrand 1.9.0", - "foreign-types 0.3.2", + "core-graphics", + "drm", + "fastrand", + "foreign-types", + "js-sys", "log", - "nix 0.26.4", + "memmap2 0.9.4", "objc", - "raw-window-handle", - "redox_syscall 0.3.5", - "thiserror", + "raw-window-handle 0.6.0", + "redox_syscall 0.4.1", + "rustix", + "tiny-xlib", "wasm-bindgen", "wayland-backend", "wayland-client", "wayland-sys", "web-sys", - "windows-sys 0.48.0", - "x11-dl", - "x11rb 0.11.1", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", + "windows-sys 0.52.0", + "x11rb", ] [[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]] @@ -3928,9 +3903,9 @@ 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", ] @@ -3944,26 +3919,6 @@ dependencies = [ "thiserror-impl", ] -[[package]] -name = "thiserror-core" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c001ee18b7e5e3f62cbf58c7fe220119e68d902bb7443179c0c8aef30090e999" -dependencies = [ - "thiserror-core-impl", -] - -[[package]] -name = "thiserror-core-impl" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c60d69f36615a077cc7663b9cb8e42275722d23e58a7fa3d2c7f2915d09d04" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "thiserror-impl" version = "1.0.56" @@ -4011,6 +3966,18 @@ dependencies = [ "strict-num", ] +[[package]] +name = "tiny-xlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4098d49269baa034a8d1eae9bd63e9fa532148d772121dace3bcd6a6c98eb6d" +dependencies = [ + "as-raw-xcb-connection", + "ctor", + "libloading 0.8.1", + "tracing", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -4045,9 +4012,9 @@ dependencies = [ [[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", "toml_datetime", @@ -4265,9 +4232,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4275,9 +4242,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" dependencies = [ "bumpalo", "log", @@ -4290,9 +4257,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" dependencies = [ "cfg-if", "js-sys", @@ -4302,9 +4269,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4312,9 +4279,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ "proc-macro2", "quote", @@ -4325,9 +4292,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] name = "wasm-timer" @@ -4346,14 +4313,13 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.1.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b48e27457e8da3b2260ac60d0a94512f5cba36448679f3747c0865b7893ed8" +checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" dependencies = [ "cc", "downcast-rs", - "io-lifetimes", - "nix 0.26.4", + "rustix", "scoped-tls", "smallvec", "wayland-sys", @@ -4361,21 +4327,21 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.30.2" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8" +checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" dependencies = [ - "bitflags 1.3.2", - "nix 0.26.4", + "bitflags 2.4.1", + "rustix", "wayland-backend", "wayland-scanner", ] [[package]] name = "wayland-scanner" -version = "0.30.1" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9b873b257fbc32ec909c0eb80dea312076a67014e65e245f5eb69a6b8ab330e" +checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" dependencies = [ "proc-macro2", "quick-xml", @@ -4384,21 +4350,21 @@ dependencies = [ [[package]] name = "wayland-sys" -version = "0.30.1" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" dependencies = [ "dlib", - "lazy_static", "log", + "once_cell", "pkg-config", ] [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" dependencies = [ "js-sys", "wasm-bindgen", @@ -4416,19 +4382,19 @@ dependencies = [ [[package]] name = "wgpu" -version = "0.18.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e7d227c9f961f2061c26f4cb0fbd4df0ef37e056edd0931783599d6c94ef24" +checksum = "0bfe9a310dcf2e6b85f00c46059aaeaf4184caa8e29a1ecd4b7a704c3482332d" dependencies = [ "arrayvec", "cfg-if", - "flume", + "cfg_aliases 0.1.1", "js-sys", "log", "naga", "parking_lot 0.12.1", "profiling", - "raw-window-handle", + "raw-window-handle 0.6.0", "smallvec", "static_assertions", "wasm-bindgen", @@ -4441,19 +4407,22 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef91c1d62d1e9e81c79e600131a258edf75c9531cbdbde09c44a011a47312726" +checksum = "6b15e451d4060ada0d99a64df44e4d590213496da7c4f245572d51071e8e30ed" dependencies = [ "arrayvec", "bit-vec", "bitflags 2.4.1", + "cfg_aliases 0.1.1", "codespan-reporting", + "indexmap", "log", "naga", + "once_cell", "parking_lot 0.12.1", "profiling", - "raw-window-handle", + "raw-window-handle 0.6.0", "rustc-hash", "smallvec", "thiserror", @@ -4464,9 +4433,9 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.18.1" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84ecc802da3eb67b4cf3dd9ea6fe45bbb47ef13e6c49c5c3240868a9cc6cdd9" +checksum = "e3bb47856236bfafc0bc591a925eb036ac19cd987624a447ff353e7a7e7e6f72" dependencies = [ "android_system_properties", "arrayvec", @@ -4474,6 +4443,7 @@ dependencies = [ "bit-set", "bitflags 2.4.1", "block", + "cfg_aliases 0.1.1", "core-graphics-types", "d3d12", "glow", @@ -4494,7 +4464,7 @@ dependencies = [ "parking_lot 0.12.1", "profiling", "range-alloc", - "raw-window-handle", + "raw-window-handle 0.6.0", "renderdoc-sys", "rustc-hash", "smallvec", @@ -4507,9 +4477,9 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d5ed5f0edf0de351fe311c53304986315ce866f394a2e6df0c4b3c70774bcdd" +checksum = "895fcbeb772bfb049eb80b2d6e47f6c9af235284e9703c96fc0218a42ffd5af2" dependencies = [ "bitflags 2.4.1", "js-sys", @@ -4547,15 +4517,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "winapi-wsapoll" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" -dependencies = [ - "winapi", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -4582,35 +4543,16 @@ dependencies = [ "windows-targets 0.48.5", ] -[[package]] -name = "windows" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" -dependencies = [ - "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-core", "windows-targets 0.52.0", ] -[[package]] -name = "windows-core" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" -dependencies = [ - "windows-targets 0.48.5", -] - [[package]] name = "windows-core" version = "0.52.0" @@ -4851,9 +4793,9 @@ dependencies = [ "bitflags 2.4.1", "bytemuck", "calloop", - "cfg_aliases", + "cfg_aliases 0.1.1", "core-foundation", - "core-graphics 0.23.1", + "core-graphics", "cursor-icon", "icrate", "js-sys", @@ -4865,7 +4807,7 @@ dependencies = [ "once_cell", "orbclient", "percent-encoding", - "raw-window-handle", + "raw-window-handle 0.6.0", "redox_syscall 0.3.5", "rustix", "smol_str", @@ -4876,7 +4818,7 @@ dependencies = [ "web-time", "windows-sys 0.48.0", "x11-dl", - "x11rb 0.13.0", + "x11rb", "xkbcommon-dl", ] @@ -4900,22 +4842,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "x11rb" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf3c79412dd91bae7a7366b8ad1565a85e35dd049affc3a6a2c549e97419617" -dependencies = [ - "gethostname 0.2.3", - "libc", - "libloading 0.7.4", - "nix 0.25.1", - "once_cell", - "winapi", - "winapi-wsapoll", - "x11rb-protocol 0.11.1", -] - [[package]] name = "x11rb" version = "0.13.0" @@ -4923,21 +4849,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" dependencies = [ "as-raw-xcb-connection", - "gethostname 0.4.3", + "gethostname", "libc", "libloading 0.8.1", "once_cell", "rustix", - "x11rb-protocol 0.13.0", -] - -[[package]] -name = "x11rb-protocol" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0b1513b141123073ce54d5bb1d33f801f17508fbd61e02060b1214e96d39c56" -dependencies = [ - "nix 0.25.1", + "x11rb-protocol", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index ca31ea1..8089c18 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,36 +14,22 @@ documentation = "https://docs.rs/bevy_iced" [dependencies] # NOTE: temp using "main" branch until a release with wgpu version matching iced -# bevy_app = "0.12" -# bevy_derive = "0.12" -# bevy_ecs = "0.12" -# bevy_input = "0.12" -# bevy_math = "0.12" -# bevy_render = "0.12" -# bevy_utils = "0.12" -# bevy_window = "0.12" -bevy_app = { git = "https://github.com/bevyengine/bevy", branch = "main" } -bevy_derive = { git = "https://github.com/bevyengine/bevy", branch = "main" } -bevy_ecs = { git = "https://github.com/bevyengine/bevy", branch = "main" } -bevy_input = { git = "https://github.com/bevyengine/bevy", branch = "main" } -bevy_math = { git = "https://github.com/bevyengine/bevy", branch = "main" } -bevy_render = { git = "https://github.com/bevyengine/bevy", branch = "main" } -bevy_utils = { git = "https://github.com/bevyengine/bevy", branch = "main" } -bevy_window = { git = "https://github.com/bevyengine/bevy", branch = "main" } +bevy_app = "0.13" +bevy_derive = "0.13" +bevy_ecs = "0.13" +bevy_input = "0.13" +bevy_math = "0.13" +bevy_render = "0.13" +bevy_utils = "0.13" +bevy_window = "0.13" # NOTE: temp using "master" branch until a release with wgpu version matching bevy -# iced_core = "0.10" -# iced_runtime = "0.1" -# iced_wgpu = "0.11" -# iced_widget = "0.1" -# iced_renderer = { version = "0.1", features = ["wgpu"] } -iced_core = { git = "https://github.com/iced-rs/iced/", branch = "master" } -iced_runtime = { git = "https://github.com/iced-rs/iced/", branch = "master" } -iced_wgpu = { git = "https://github.com/iced-rs/iced/", branch = "master" } -iced_widget = { git = "https://github.com/iced-rs/iced/", branch = "master" } -iced_renderer = { git = "https://github.com/iced-rs/iced/", branch = "master", features = ["wgpu"]} +iced_core = "0.12" +iced_runtime = "0.12" +iced_wgpu = "0.12" +iced_widget = "0.12" +iced_renderer = { version = "0.12", features = ["wgpu"] } [dev-dependencies] -# bevy = "0.12" -bevy = { git = "https://github.com/bevyengine/bevy", branch = "main" } +bevy = "0.13" rand = "0.8" \ No newline at end of file diff --git a/src/conversions.rs b/src/conversions.rs index 3dc6e59..4b4cf0a 100644 --- a/src/conversions.rs +++ b/src/conversions.rs @@ -2,234 +2,325 @@ use crate::iced::{ touch::{self, Finger}, Point, }; -use bevy_input::prelude::KeyCode as BevyKeyCode; +use bevy_input::keyboard::Key as BevyKey; use bevy_input::prelude::MouseButton; use bevy_input::touch::{TouchInput, TouchPhase}; use bevy_math::Vec2; -use iced_core::keyboard::KeyCode as IcedKeyCode; +use iced_core::keyboard::Key as IcedKey; -pub fn key_code(virtual_keycode: BevyKeyCode) -> IcedKeyCode { - // TODO: We need https://github.com/iced-rs/iced/pull/2169 to update - // winit and Iced keys in `iced/core/src/keyboard/key_code.rs` to match - // with bevy again +pub fn key_code(virtual_keycode: &BevyKey) -> IcedKey { + use iced_core::keyboard::key::Named; match virtual_keycode { - BevyKeyCode::Digit1 => IcedKeyCode::Key1, - BevyKeyCode::Digit2 => IcedKeyCode::Key2, - BevyKeyCode::Digit3 => IcedKeyCode::Key3, - BevyKeyCode::Digit4 => IcedKeyCode::Key4, - BevyKeyCode::Digit5 => IcedKeyCode::Key5, - BevyKeyCode::Digit6 => IcedKeyCode::Key6, - BevyKeyCode::Digit7 => IcedKeyCode::Key7, - BevyKeyCode::Digit8 => IcedKeyCode::Key8, - BevyKeyCode::Digit9 => IcedKeyCode::Key9, - BevyKeyCode::Digit0 => IcedKeyCode::Key0, - BevyKeyCode::KeyA => IcedKeyCode::A, - BevyKeyCode::KeyB => IcedKeyCode::B, - BevyKeyCode::KeyC => IcedKeyCode::C, - BevyKeyCode::KeyD => IcedKeyCode::D, - BevyKeyCode::KeyE => IcedKeyCode::E, - BevyKeyCode::KeyF => IcedKeyCode::F, - BevyKeyCode::KeyG => IcedKeyCode::G, - BevyKeyCode::KeyH => IcedKeyCode::H, - BevyKeyCode::KeyI => IcedKeyCode::I, - BevyKeyCode::KeyJ => IcedKeyCode::J, - BevyKeyCode::KeyK => IcedKeyCode::K, - BevyKeyCode::KeyL => IcedKeyCode::L, - BevyKeyCode::KeyM => IcedKeyCode::M, - BevyKeyCode::KeyN => IcedKeyCode::N, - BevyKeyCode::KeyO => IcedKeyCode::O, - BevyKeyCode::KeyP => IcedKeyCode::P, - BevyKeyCode::KeyQ => IcedKeyCode::Q, - BevyKeyCode::KeyR => IcedKeyCode::R, - BevyKeyCode::KeyS => IcedKeyCode::S, - BevyKeyCode::KeyT => IcedKeyCode::T, - BevyKeyCode::KeyU => IcedKeyCode::U, - BevyKeyCode::KeyV => IcedKeyCode::V, - BevyKeyCode::KeyW => IcedKeyCode::W, - BevyKeyCode::KeyX => IcedKeyCode::X, - BevyKeyCode::KeyY => IcedKeyCode::Y, - BevyKeyCode::KeyZ => IcedKeyCode::Z, - BevyKeyCode::Escape => IcedKeyCode::Escape, - BevyKeyCode::F1 => IcedKeyCode::F1, - BevyKeyCode::F2 => IcedKeyCode::F2, - BevyKeyCode::F3 => IcedKeyCode::F3, - BevyKeyCode::F4 => IcedKeyCode::F4, - BevyKeyCode::F5 => IcedKeyCode::F5, - BevyKeyCode::F6 => IcedKeyCode::F6, - BevyKeyCode::F7 => IcedKeyCode::F7, - BevyKeyCode::F8 => IcedKeyCode::F8, - BevyKeyCode::F9 => IcedKeyCode::F9, - BevyKeyCode::F10 => IcedKeyCode::F10, - BevyKeyCode::F11 => IcedKeyCode::F11, - BevyKeyCode::F12 => IcedKeyCode::F12, - BevyKeyCode::F13 => IcedKeyCode::F13, - BevyKeyCode::F14 => IcedKeyCode::F14, - BevyKeyCode::F15 => IcedKeyCode::F15, - BevyKeyCode::F16 => IcedKeyCode::F16, - BevyKeyCode::F17 => IcedKeyCode::F17, - BevyKeyCode::F18 => IcedKeyCode::F18, - BevyKeyCode::F19 => IcedKeyCode::F19, - BevyKeyCode::F20 => IcedKeyCode::F20, - BevyKeyCode::F21 => IcedKeyCode::F21, - BevyKeyCode::F22 => IcedKeyCode::F22, - BevyKeyCode::F23 => IcedKeyCode::F23, - BevyKeyCode::F24 => IcedKeyCode::F24, - // BevyKeyCode::Snapshot => IcedKeyCode::Snapshot, - // BevyKeyCode::Scroll => IcedKeyCode::Scroll, - BevyKeyCode::Pause => IcedKeyCode::Pause, - BevyKeyCode::Insert => IcedKeyCode::Insert, - BevyKeyCode::Home => IcedKeyCode::Home, - BevyKeyCode::Delete => IcedKeyCode::Delete, - BevyKeyCode::End => IcedKeyCode::End, - BevyKeyCode::PageDown => IcedKeyCode::PageDown, - BevyKeyCode::PageUp => IcedKeyCode::PageUp, - BevyKeyCode::ArrowLeft => IcedKeyCode::Left, - BevyKeyCode::ArrowUp => IcedKeyCode::Up, - BevyKeyCode::ArrowRight => IcedKeyCode::Right, - BevyKeyCode::ArrowDown => IcedKeyCode::Down, - BevyKeyCode::Backspace => IcedKeyCode::Backspace, - BevyKeyCode::Enter => IcedKeyCode::Enter, - BevyKeyCode::Space => IcedKeyCode::Space, - // BevyKeyCode::Compose => IcedKeyCode::Compose, - // BevyKeyCode::Caret => IcedKeyCode::Caret, - BevyKeyCode::NumLock => IcedKeyCode::Numlock, - BevyKeyCode::Numpad0 => IcedKeyCode::Numpad0, - BevyKeyCode::Numpad1 => IcedKeyCode::Numpad1, - BevyKeyCode::Numpad2 => IcedKeyCode::Numpad2, - BevyKeyCode::Numpad3 => IcedKeyCode::Numpad3, - BevyKeyCode::Numpad4 => IcedKeyCode::Numpad4, - BevyKeyCode::Numpad5 => IcedKeyCode::Numpad5, - BevyKeyCode::Numpad6 => IcedKeyCode::Numpad6, - BevyKeyCode::Numpad7 => IcedKeyCode::Numpad7, - BevyKeyCode::Numpad8 => IcedKeyCode::Numpad8, - BevyKeyCode::Numpad9 => IcedKeyCode::Numpad9, - // BevyKeyCode::AbntC1 => IcedKeyCode::AbntC1, - // BevyKeyCode::AbntC2 => IcedKeyCode::AbntC2, - BevyKeyCode::NumpadAdd => IcedKeyCode::NumpadAdd, - // BevyKeyCode::Plus => IcedKeyCode::Plus, - // BevyKeyCode::Apostrophe => IcedKeyCode::Apostrophe, - // BevyKeyCode::Apps => IcedKeyCode::Apps, - // BevyKeyCode::At => IcedKeyCode::At, - // BevyKeyCode::Ax => IcedKeyCode::Ax, - BevyKeyCode::Backslash => IcedKeyCode::Backslash, - BevyKeyCode::LaunchApp2 => IcedKeyCode::Calculator, - // BevyKeyCode::Capital => IcedKeyCode::Capital, - // BevyKeyCode::Colon => IcedKeyCode::Colon, - BevyKeyCode::Comma => IcedKeyCode::Comma, - BevyKeyCode::Convert => IcedKeyCode::Convert, - BevyKeyCode::NumpadDecimal => IcedKeyCode::NumpadDecimal, - BevyKeyCode::NumpadDivide => IcedKeyCode::NumpadDivide, - BevyKeyCode::Equal => IcedKeyCode::Equals, - BevyKeyCode::Backquote => IcedKeyCode::Grave, - BevyKeyCode::KanaMode => IcedKeyCode::Kana, - // BevyKeyCode::Kanji => IcedKeyCode::Kanji, - BevyKeyCode::AltLeft => IcedKeyCode::LAlt, - BevyKeyCode::BracketLeft => IcedKeyCode::LBracket, - BevyKeyCode::ControlLeft => IcedKeyCode::LControl, - BevyKeyCode::ShiftLeft => IcedKeyCode::LShift, - BevyKeyCode::SuperLeft => IcedKeyCode::LWin, - BevyKeyCode::LaunchMail => IcedKeyCode::Mail, - BevyKeyCode::MediaSelect => IcedKeyCode::MediaSelect, - BevyKeyCode::MediaStop => IcedKeyCode::MediaStop, - BevyKeyCode::Minus => IcedKeyCode::Minus, - BevyKeyCode::NumpadMultiply => IcedKeyCode::NumpadMultiply, - BevyKeyCode::AudioVolumeMute => IcedKeyCode::Mute, - BevyKeyCode::LaunchApp1 => IcedKeyCode::MyComputer, - // BevyKeyCode::BrowserForward => IcedKeyCode::NavigateForward, - // BevyKeyCode::BrowserBack => IcedKeyCode::NavigateBackward, - BevyKeyCode::MediaTrackNext => IcedKeyCode::NextTrack, - BevyKeyCode::NonConvert => IcedKeyCode::NoConvert, - BevyKeyCode::NumpadComma => IcedKeyCode::NumpadComma, - BevyKeyCode::NumpadEnter => IcedKeyCode::NumpadEnter, - BevyKeyCode::NumpadEqual => IcedKeyCode::NumpadEquals, - // BevyKeyCode::Oem102 => IcedKeyCode::OEM102, - BevyKeyCode::Period => IcedKeyCode::Period, - BevyKeyCode::MediaPlayPause => IcedKeyCode::PlayPause, - BevyKeyCode::Power => IcedKeyCode::Power, - BevyKeyCode::MediaTrackPrevious => IcedKeyCode::PrevTrack, - BevyKeyCode::AltRight => IcedKeyCode::RAlt, - BevyKeyCode::BracketRight => IcedKeyCode::RBracket, - BevyKeyCode::ControlRight => IcedKeyCode::RControl, - BevyKeyCode::ShiftRight => IcedKeyCode::RShift, - BevyKeyCode::SuperRight => IcedKeyCode::RWin, - BevyKeyCode::Semicolon => IcedKeyCode::Semicolon, - BevyKeyCode::Slash => IcedKeyCode::Slash, - BevyKeyCode::Sleep => IcedKeyCode::Sleep, - // BevyKeyCode::Stop => IcedKeyCode::Stop, - BevyKeyCode::NumpadSubtract => IcedKeyCode::NumpadSubtract, - // BevyKeyCode::Sysrq => IcedKeyCode::Sysrq, - BevyKeyCode::Tab => IcedKeyCode::Tab, - // BevyKeyCode::Underline => IcedKeyCode::Underline, - // BevyKeyCode::Unlabeled => IcedKeyCode::Unlabeled, - BevyKeyCode::AudioVolumeDown => IcedKeyCode::VolumeDown, - BevyKeyCode::AudioVolumeUp => IcedKeyCode::VolumeUp, - BevyKeyCode::WakeUp => IcedKeyCode::Wake, - BevyKeyCode::BrowserBack => IcedKeyCode::WebBack, - BevyKeyCode::BrowserFavorites => IcedKeyCode::WebFavorites, - BevyKeyCode::BrowserForward => IcedKeyCode::WebForward, - BevyKeyCode::BrowserHome => IcedKeyCode::WebHome, - BevyKeyCode::BrowserRefresh => IcedKeyCode::WebRefresh, - BevyKeyCode::BrowserSearch => IcedKeyCode::WebSearch, - BevyKeyCode::BrowserStop => IcedKeyCode::WebStop, - BevyKeyCode::IntlYen => IcedKeyCode::Yen, - BevyKeyCode::Copy => IcedKeyCode::Copy, - BevyKeyCode::Paste => IcedKeyCode::Paste, - BevyKeyCode::Cut => IcedKeyCode::Cut, - BevyKeyCode::Unidentified(_) => IcedKeyCode::Unlabeled, - BevyKeyCode::IntlBackslash => IcedKeyCode::Backslash, - BevyKeyCode::NumpadBackspace => IcedKeyCode::Backspace, - // BevyKeyCode::Asterisk => IcedKeyCode::Asterisk, - BevyKeyCode::IntlRo => todo!(), - BevyKeyCode::Quote => todo!(), - BevyKeyCode::CapsLock => todo!(), - BevyKeyCode::ContextMenu => todo!(), - BevyKeyCode::Lang1 => todo!(), - BevyKeyCode::Lang2 => todo!(), - BevyKeyCode::Lang3 => todo!(), - BevyKeyCode::Lang4 => todo!(), - BevyKeyCode::Lang5 => todo!(), - BevyKeyCode::Help => todo!(), - BevyKeyCode::NumpadClear => todo!(), - BevyKeyCode::NumpadClearEntry => todo!(), - BevyKeyCode::NumpadHash => todo!(), - BevyKeyCode::NumpadMemoryAdd => todo!(), - BevyKeyCode::NumpadMemoryClear => todo!(), - BevyKeyCode::NumpadMemoryRecall => todo!(), - BevyKeyCode::NumpadMemoryStore => todo!(), - BevyKeyCode::NumpadMemorySubtract => todo!(), - BevyKeyCode::NumpadParenLeft => todo!(), - BevyKeyCode::NumpadParenRight => todo!(), - BevyKeyCode::NumpadStar => todo!(), - BevyKeyCode::Fn => todo!(), - BevyKeyCode::FnLock => todo!(), - BevyKeyCode::PrintScreen => todo!(), - BevyKeyCode::ScrollLock => todo!(), - BevyKeyCode::Eject => todo!(), - BevyKeyCode::Meta => todo!(), - BevyKeyCode::Hyper => todo!(), - BevyKeyCode::Turbo => todo!(), - BevyKeyCode::Abort => todo!(), - BevyKeyCode::Resume => todo!(), - BevyKeyCode::Suspend => todo!(), - BevyKeyCode::Again => todo!(), - BevyKeyCode::Find => todo!(), - BevyKeyCode::Open => todo!(), - BevyKeyCode::Props => todo!(), - BevyKeyCode::Select => todo!(), - BevyKeyCode::Undo => todo!(), - BevyKeyCode::Hiragana => todo!(), - BevyKeyCode::Katakana => todo!(), - BevyKeyCode::F25 => todo!(), - BevyKeyCode::F26 => todo!(), - BevyKeyCode::F27 => todo!(), - BevyKeyCode::F28 => todo!(), - BevyKeyCode::F29 => todo!(), - BevyKeyCode::F30 => todo!(), - BevyKeyCode::F31 => todo!(), - BevyKeyCode::F32 => todo!(), - BevyKeyCode::F33 => todo!(), - BevyKeyCode::F34 => todo!(), - BevyKeyCode::F35 => todo!(), + BevyKey::Character(s) => IcedKey::Character(s.clone()), + BevyKey::Unidentified(_) => IcedKey::Unidentified, + BevyKey::Dead(_) => IcedKey::Unidentified, + BevyKey::Alt => IcedKey::Named(Named::Alt), + BevyKey::AltGraph => IcedKey::Named(Named::AltGraph), + BevyKey::CapsLock => IcedKey::Named(Named::CapsLock), + BevyKey::Control => IcedKey::Named(Named::Control), + BevyKey::Fn => IcedKey::Named(Named::Fn), + BevyKey::FnLock => IcedKey::Named(Named::FnLock), + BevyKey::NumLock => IcedKey::Named(Named::NumLock), + BevyKey::ScrollLock => IcedKey::Named(Named::ScrollLock), + BevyKey::Shift => IcedKey::Named(Named::Shift), + BevyKey::Symbol => IcedKey::Named(Named::Symbol), + BevyKey::SymbolLock => IcedKey::Named(Named::SymbolLock), + BevyKey::Meta => IcedKey::Named(Named::Meta), + BevyKey::Hyper => IcedKey::Named(Named::Hyper), + BevyKey::Super => IcedKey::Named(Named::Super), + BevyKey::Enter => IcedKey::Named(Named::Enter), + BevyKey::Tab => IcedKey::Named(Named::Tab), + BevyKey::Space => IcedKey::Named(Named::Space), + BevyKey::ArrowDown => IcedKey::Named(Named::ArrowDown), + BevyKey::ArrowLeft => IcedKey::Named(Named::ArrowLeft), + BevyKey::ArrowRight => IcedKey::Named(Named::ArrowRight), + BevyKey::ArrowUp => IcedKey::Named(Named::ArrowUp), + BevyKey::End => IcedKey::Named(Named::End), + BevyKey::Home => IcedKey::Named(Named::Home), + BevyKey::PageDown => IcedKey::Named(Named::PageDown), + BevyKey::PageUp => IcedKey::Named(Named::PageUp), + BevyKey::Backspace => IcedKey::Named(Named::Backspace), + BevyKey::Clear => IcedKey::Named(Named::Clear), + BevyKey::Copy => IcedKey::Named(Named::Copy), + BevyKey::CrSel => IcedKey::Named(Named::CrSel), + BevyKey::Cut => IcedKey::Named(Named::Cut), + BevyKey::Delete => IcedKey::Named(Named::Delete), + BevyKey::EraseEof => IcedKey::Named(Named::EraseEof), + BevyKey::ExSel => IcedKey::Named(Named::ExSel), + BevyKey::Insert => IcedKey::Named(Named::Insert), + BevyKey::Paste => IcedKey::Named(Named::Paste), + BevyKey::Redo => IcedKey::Named(Named::Redo), + BevyKey::Undo => IcedKey::Named(Named::Undo), + BevyKey::Accept => IcedKey::Named(Named::Accept), + BevyKey::Again => IcedKey::Named(Named::Again), + BevyKey::Attn => IcedKey::Named(Named::Attn), + BevyKey::Cancel => IcedKey::Named(Named::Cancel), + BevyKey::ContextMenu => IcedKey::Named(Named::ContextMenu), + BevyKey::Escape => IcedKey::Named(Named::Escape), + BevyKey::Execute => IcedKey::Named(Named::Execute), + BevyKey::Find => IcedKey::Named(Named::Find), + BevyKey::Help => IcedKey::Named(Named::Help), + BevyKey::Pause => IcedKey::Named(Named::Pause), + BevyKey::Play => IcedKey::Named(Named::Play), + BevyKey::Props => IcedKey::Named(Named::Props), + BevyKey::Select => IcedKey::Named(Named::Select), + BevyKey::ZoomIn => IcedKey::Named(Named::ZoomIn), + BevyKey::ZoomOut => IcedKey::Named(Named::ZoomOut), + BevyKey::BrightnessDown => IcedKey::Named(Named::BrightnessDown), + BevyKey::BrightnessUp => IcedKey::Named(Named::BrightnessUp), + BevyKey::Eject => IcedKey::Named(Named::Eject), + BevyKey::LogOff => IcedKey::Named(Named::LogOff), + BevyKey::Power => IcedKey::Named(Named::Power), + BevyKey::PowerOff => IcedKey::Named(Named::PowerOff), + BevyKey::PrintScreen => IcedKey::Named(Named::PrintScreen), + BevyKey::Hibernate => IcedKey::Named(Named::Hibernate), + BevyKey::Standby => IcedKey::Named(Named::Standby), + BevyKey::WakeUp => IcedKey::Named(Named::WakeUp), + BevyKey::AllCandidates => IcedKey::Named(Named::AllCandidates), + BevyKey::Alphanumeric => IcedKey::Named(Named::Alphanumeric), + BevyKey::CodeInput => IcedKey::Named(Named::CodeInput), + BevyKey::Compose => IcedKey::Named(Named::Compose), + BevyKey::Convert => IcedKey::Named(Named::Convert), + BevyKey::FinalMode => IcedKey::Named(Named::FinalMode), + BevyKey::GroupFirst => IcedKey::Named(Named::GroupFirst), + BevyKey::GroupLast => IcedKey::Named(Named::GroupLast), + BevyKey::GroupNext => IcedKey::Named(Named::GroupNext), + BevyKey::GroupPrevious => IcedKey::Named(Named::GroupPrevious), + BevyKey::ModeChange => IcedKey::Named(Named::ModeChange), + BevyKey::NextCandidate => IcedKey::Named(Named::NextCandidate), + BevyKey::NonConvert => IcedKey::Named(Named::NonConvert), + BevyKey::PreviousCandidate => IcedKey::Named(Named::PreviousCandidate), + BevyKey::Process => IcedKey::Named(Named::Process), + BevyKey::SingleCandidate => IcedKey::Named(Named::SingleCandidate), + BevyKey::HangulMode => IcedKey::Named(Named::HangulMode), + BevyKey::HanjaMode => IcedKey::Named(Named::HanjaMode), + BevyKey::JunjaMode => IcedKey::Named(Named::JunjaMode), + BevyKey::Eisu => IcedKey::Named(Named::Eisu), + BevyKey::Hankaku => IcedKey::Named(Named::Hankaku), + BevyKey::Hiragana => IcedKey::Named(Named::Hiragana), + BevyKey::HiraganaKatakana => IcedKey::Named(Named::HiraganaKatakana), + BevyKey::KanaMode => IcedKey::Named(Named::KanaMode), + BevyKey::KanjiMode => IcedKey::Named(Named::KanjiMode), + BevyKey::Katakana => IcedKey::Named(Named::Katakana), + BevyKey::Romaji => IcedKey::Named(Named::Romaji), + BevyKey::Zenkaku => IcedKey::Named(Named::Zenkaku), + BevyKey::ZenkakuHankaku => IcedKey::Named(Named::ZenkakuHankaku), + BevyKey::Soft1 => IcedKey::Named(Named::Soft1), + BevyKey::Soft2 => IcedKey::Named(Named::Soft2), + BevyKey::Soft3 => IcedKey::Named(Named::Soft3), + BevyKey::Soft4 => IcedKey::Named(Named::Soft4), + BevyKey::ChannelDown => IcedKey::Named(Named::ChannelDown), + BevyKey::ChannelUp => IcedKey::Named(Named::ChannelUp), + BevyKey::Close => IcedKey::Named(Named::Close), + BevyKey::MailForward => IcedKey::Named(Named::MailForward), + BevyKey::MailReply => IcedKey::Named(Named::MailReply), + BevyKey::MailSend => IcedKey::Named(Named::MailSend), + BevyKey::MediaClose => IcedKey::Named(Named::MediaClose), + BevyKey::MediaFastForward => IcedKey::Named(Named::MediaFastForward), + BevyKey::MediaPause => IcedKey::Named(Named::MediaPause), + BevyKey::MediaPlay => IcedKey::Named(Named::MediaPlay), + BevyKey::MediaPlayPause => IcedKey::Named(Named::MediaPlayPause), + BevyKey::MediaRecord => IcedKey::Named(Named::MediaRecord), + BevyKey::MediaRewind => IcedKey::Named(Named::MediaRewind), + BevyKey::MediaStop => IcedKey::Named(Named::MediaStop), + BevyKey::MediaTrackNext => IcedKey::Named(Named::MediaTrackNext), + BevyKey::MediaTrackPrevious => IcedKey::Named(Named::MediaTrackPrevious), + BevyKey::New => IcedKey::Named(Named::New), + BevyKey::Open => IcedKey::Named(Named::Open), + BevyKey::Print => IcedKey::Named(Named::Print), + BevyKey::Save => IcedKey::Named(Named::Save), + BevyKey::SpellCheck => IcedKey::Named(Named::SpellCheck), + BevyKey::Key11 => IcedKey::Named(Named::Key11), + BevyKey::Key12 => IcedKey::Named(Named::Key12), + BevyKey::AudioBalanceLeft => IcedKey::Named(Named::AudioBalanceLeft), + BevyKey::AudioBalanceRight => IcedKey::Named(Named::AudioBalanceRight), + BevyKey::AudioBassBoostDown => IcedKey::Named(Named::AudioBassBoostDown), + BevyKey::AudioBassBoostToggle => IcedKey::Named(Named::AudioBassBoostToggle), + BevyKey::AudioBassBoostUp => IcedKey::Named(Named::AudioBassBoostUp), + BevyKey::AudioFaderFront => IcedKey::Named(Named::AudioFaderFront), + BevyKey::AudioFaderRear => IcedKey::Named(Named::AudioFaderRear), + BevyKey::AudioSurroundModeNext => IcedKey::Named(Named::AudioSurroundModeNext), + BevyKey::AudioTrebleDown => IcedKey::Named(Named::AudioTrebleDown), + BevyKey::AudioTrebleUp => IcedKey::Named(Named::AudioTrebleUp), + BevyKey::AudioVolumeDown => IcedKey::Named(Named::AudioVolumeDown), + BevyKey::AudioVolumeUp => IcedKey::Named(Named::AudioVolumeUp), + BevyKey::AudioVolumeMute => IcedKey::Named(Named::AudioVolumeMute), + BevyKey::MicrophoneToggle => IcedKey::Named(Named::MicrophoneToggle), + BevyKey::MicrophoneVolumeDown => IcedKey::Named(Named::MicrophoneVolumeDown), + BevyKey::MicrophoneVolumeUp => IcedKey::Named(Named::MicrophoneVolumeUp), + BevyKey::MicrophoneVolumeMute => IcedKey::Named(Named::MicrophoneVolumeMute), + BevyKey::SpeechCorrectionList => IcedKey::Named(Named::SpeechCorrectionList), + BevyKey::SpeechInputToggle => IcedKey::Named(Named::SpeechInputToggle), + BevyKey::LaunchApplication1 => IcedKey::Named(Named::LaunchApplication1), + BevyKey::LaunchApplication2 => IcedKey::Named(Named::LaunchApplication2), + BevyKey::LaunchCalendar => IcedKey::Named(Named::LaunchCalendar), + BevyKey::LaunchContacts => IcedKey::Named(Named::LaunchContacts), + BevyKey::LaunchMail => IcedKey::Named(Named::LaunchMail), + BevyKey::LaunchMediaPlayer => IcedKey::Named(Named::LaunchMediaPlayer), + BevyKey::LaunchMusicPlayer => IcedKey::Named(Named::LaunchMusicPlayer), + BevyKey::LaunchPhone => IcedKey::Named(Named::LaunchPhone), + BevyKey::LaunchScreenSaver => IcedKey::Named(Named::LaunchScreenSaver), + BevyKey::LaunchSpreadsheet => IcedKey::Named(Named::LaunchSpreadsheet), + BevyKey::LaunchWebBrowser => IcedKey::Named(Named::LaunchWebBrowser), + BevyKey::LaunchWebCam => IcedKey::Named(Named::LaunchWebCam), + BevyKey::LaunchWordProcessor => IcedKey::Named(Named::LaunchWordProcessor), + BevyKey::BrowserBack => IcedKey::Named(Named::BrowserBack), + BevyKey::BrowserFavorites => IcedKey::Named(Named::BrowserFavorites), + BevyKey::BrowserForward => IcedKey::Named(Named::BrowserForward), + BevyKey::BrowserHome => IcedKey::Named(Named::BrowserHome), + BevyKey::BrowserRefresh => IcedKey::Named(Named::BrowserRefresh), + BevyKey::BrowserSearch => IcedKey::Named(Named::BrowserSearch), + BevyKey::BrowserStop => IcedKey::Named(Named::BrowserStop), + BevyKey::AppSwitch => IcedKey::Named(Named::AppSwitch), + BevyKey::Call => IcedKey::Named(Named::Call), + BevyKey::Camera => IcedKey::Named(Named::Camera), + BevyKey::CameraFocus => IcedKey::Named(Named::CameraFocus), + BevyKey::EndCall => IcedKey::Named(Named::EndCall), + BevyKey::GoBack => IcedKey::Named(Named::GoBack), + BevyKey::GoHome => IcedKey::Named(Named::GoHome), + BevyKey::HeadsetHook => IcedKey::Named(Named::HeadsetHook), + BevyKey::LastNumberRedial => IcedKey::Named(Named::LastNumberRedial), + BevyKey::Notification => IcedKey::Named(Named::Notification), + BevyKey::MannerMode => IcedKey::Named(Named::MannerMode), + BevyKey::VoiceDial => IcedKey::Named(Named::VoiceDial), + BevyKey::TV => IcedKey::Named(Named::TV), + BevyKey::TV3DMode => IcedKey::Named(Named::TV3DMode), + BevyKey::TVAntennaCable => IcedKey::Named(Named::TVAntennaCable), + BevyKey::TVAudioDescription => IcedKey::Named(Named::TVAudioDescription), + BevyKey::TVAudioDescriptionMixDown => IcedKey::Named(Named::TVAudioDescriptionMixDown), + BevyKey::TVAudioDescriptionMixUp => IcedKey::Named(Named::TVAudioDescriptionMixUp), + BevyKey::TVContentsMenu => IcedKey::Named(Named::TVContentsMenu), + BevyKey::TVDataService => IcedKey::Named(Named::TVDataService), + BevyKey::TVInput => IcedKey::Named(Named::TVInput), + BevyKey::TVInputComponent1 => IcedKey::Named(Named::TVInputComponent1), + BevyKey::TVInputComponent2 => IcedKey::Named(Named::TVInputComponent2), + BevyKey::TVInputComposite1 => IcedKey::Named(Named::TVInputComposite1), + BevyKey::TVInputComposite2 => IcedKey::Named(Named::TVInputComposite2), + BevyKey::TVInputHDMI1 => IcedKey::Named(Named::TVInputHDMI1), + BevyKey::TVInputHDMI2 => IcedKey::Named(Named::TVInputHDMI2), + BevyKey::TVInputHDMI3 => IcedKey::Named(Named::TVInputHDMI3), + BevyKey::TVInputHDMI4 => IcedKey::Named(Named::TVInputHDMI4), + BevyKey::TVInputVGA1 => IcedKey::Named(Named::TVInputVGA1), + BevyKey::TVMediaContext => IcedKey::Named(Named::TVMediaContext), + BevyKey::TVNetwork => IcedKey::Named(Named::TVNetwork), + BevyKey::TVNumberEntry => IcedKey::Named(Named::TVNumberEntry), + BevyKey::TVPower => IcedKey::Named(Named::TVPower), + BevyKey::TVRadioService => IcedKey::Named(Named::TVRadioService), + BevyKey::TVSatellite => IcedKey::Named(Named::TVSatellite), + BevyKey::TVSatelliteBS => IcedKey::Named(Named::TVSatelliteBS), + BevyKey::TVSatelliteCS => IcedKey::Named(Named::TVSatelliteCS), + BevyKey::TVSatelliteToggle => IcedKey::Named(Named::TVSatelliteToggle), + BevyKey::TVTerrestrialAnalog => IcedKey::Named(Named::TVTerrestrialAnalog), + BevyKey::TVTerrestrialDigital => IcedKey::Named(Named::TVTerrestrialDigital), + BevyKey::TVTimer => IcedKey::Named(Named::TVTimer), + BevyKey::AVRInput => IcedKey::Named(Named::AVRInput), + BevyKey::AVRPower => IcedKey::Named(Named::AVRPower), + BevyKey::ColorF0Red => IcedKey::Named(Named::ColorF0Red), + BevyKey::ColorF1Green => IcedKey::Named(Named::ColorF1Green), + BevyKey::ColorF2Yellow => IcedKey::Named(Named::ColorF2Yellow), + BevyKey::ColorF3Blue => IcedKey::Named(Named::ColorF3Blue), + BevyKey::ColorF4Grey => IcedKey::Named(Named::ColorF4Grey), + BevyKey::ColorF5Brown => IcedKey::Named(Named::ColorF5Brown), + BevyKey::ClosedCaptionToggle => IcedKey::Named(Named::ClosedCaptionToggle), + BevyKey::Dimmer => IcedKey::Named(Named::Dimmer), + BevyKey::DisplaySwap => IcedKey::Named(Named::DisplaySwap), + BevyKey::DVR => IcedKey::Named(Named::DVR), + BevyKey::Exit => IcedKey::Named(Named::Exit), + BevyKey::FavoriteClear0 => IcedKey::Named(Named::FavoriteClear0), + BevyKey::FavoriteClear1 => IcedKey::Named(Named::FavoriteClear1), + BevyKey::FavoriteClear2 => IcedKey::Named(Named::FavoriteClear2), + BevyKey::FavoriteClear3 => IcedKey::Named(Named::FavoriteClear3), + BevyKey::FavoriteRecall0 => IcedKey::Named(Named::FavoriteRecall0), + BevyKey::FavoriteRecall1 => IcedKey::Named(Named::FavoriteRecall1), + BevyKey::FavoriteRecall2 => IcedKey::Named(Named::FavoriteRecall2), + BevyKey::FavoriteRecall3 => IcedKey::Named(Named::FavoriteRecall3), + BevyKey::FavoriteStore0 => IcedKey::Named(Named::FavoriteStore0), + BevyKey::FavoriteStore1 => IcedKey::Named(Named::FavoriteStore1), + BevyKey::FavoriteStore2 => IcedKey::Named(Named::FavoriteStore2), + BevyKey::FavoriteStore3 => IcedKey::Named(Named::FavoriteStore3), + BevyKey::Guide => IcedKey::Named(Named::Guide), + BevyKey::GuideNextDay => IcedKey::Named(Named::GuideNextDay), + BevyKey::GuidePreviousDay => IcedKey::Named(Named::GuidePreviousDay), + BevyKey::Info => IcedKey::Named(Named::Info), + BevyKey::InstantReplay => IcedKey::Named(Named::InstantReplay), + BevyKey::Link => IcedKey::Named(Named::Link), + BevyKey::ListProgram => IcedKey::Named(Named::ListProgram), + BevyKey::LiveContent => IcedKey::Named(Named::LiveContent), + BevyKey::Lock => IcedKey::Named(Named::Lock), + BevyKey::MediaApps => IcedKey::Named(Named::MediaApps), + BevyKey::MediaAudioTrack => IcedKey::Named(Named::MediaAudioTrack), + BevyKey::MediaLast => IcedKey::Named(Named::MediaLast), + BevyKey::MediaSkipBackward => IcedKey::Named(Named::MediaSkipBackward), + BevyKey::MediaSkipForward => IcedKey::Named(Named::MediaSkipForward), + BevyKey::MediaStepBackward => IcedKey::Named(Named::MediaStepBackward), + BevyKey::MediaStepForward => IcedKey::Named(Named::MediaStepForward), + BevyKey::MediaTopMenu => IcedKey::Named(Named::MediaTopMenu), + BevyKey::NavigateIn => IcedKey::Named(Named::NavigateIn), + BevyKey::NavigateNext => IcedKey::Named(Named::NavigateNext), + BevyKey::NavigateOut => IcedKey::Named(Named::NavigateOut), + BevyKey::NavigatePrevious => IcedKey::Named(Named::NavigatePrevious), + BevyKey::NextFavoriteChannel => IcedKey::Named(Named::NextFavoriteChannel), + BevyKey::NextUserProfile => IcedKey::Named(Named::NextUserProfile), + BevyKey::OnDemand => IcedKey::Named(Named::OnDemand), + BevyKey::Pairing => IcedKey::Named(Named::Pairing), + BevyKey::PinPDown => IcedKey::Named(Named::PinPDown), + BevyKey::PinPMove => IcedKey::Named(Named::PinPMove), + BevyKey::PinPToggle => IcedKey::Named(Named::PinPToggle), + BevyKey::PinPUp => IcedKey::Named(Named::PinPUp), + BevyKey::PlaySpeedDown => IcedKey::Named(Named::PlaySpeedDown), + BevyKey::PlaySpeedReset => IcedKey::Named(Named::PlaySpeedReset), + BevyKey::PlaySpeedUp => IcedKey::Named(Named::PlaySpeedUp), + BevyKey::RandomToggle => IcedKey::Named(Named::RandomToggle), + BevyKey::RcLowBattery => IcedKey::Named(Named::RcLowBattery), + BevyKey::RecordSpeedNext => IcedKey::Named(Named::RecordSpeedNext), + BevyKey::RfBypass => IcedKey::Named(Named::RfBypass), + BevyKey::ScanChannelsToggle => IcedKey::Named(Named::ScanChannelsToggle), + BevyKey::ScreenModeNext => IcedKey::Named(Named::ScreenModeNext), + BevyKey::Settings => IcedKey::Named(Named::Settings), + BevyKey::SplitScreenToggle => IcedKey::Named(Named::SplitScreenToggle), + BevyKey::STBInput => IcedKey::Named(Named::STBInput), + BevyKey::STBPower => IcedKey::Named(Named::STBPower), + BevyKey::Subtitle => IcedKey::Named(Named::Subtitle), + BevyKey::Teletext => IcedKey::Named(Named::Teletext), + BevyKey::VideoModeNext => IcedKey::Named(Named::VideoModeNext), + BevyKey::Wink => IcedKey::Named(Named::Wink), + BevyKey::ZoomToggle => IcedKey::Named(Named::ZoomToggle), + BevyKey::F1 => IcedKey::Named(Named::F1), + BevyKey::F2 => IcedKey::Named(Named::F2), + BevyKey::F3 => IcedKey::Named(Named::F3), + BevyKey::F4 => IcedKey::Named(Named::F4), + BevyKey::F5 => IcedKey::Named(Named::F5), + BevyKey::F6 => IcedKey::Named(Named::F6), + BevyKey::F7 => IcedKey::Named(Named::F7), + BevyKey::F8 => IcedKey::Named(Named::F8), + BevyKey::F9 => IcedKey::Named(Named::F9), + BevyKey::F10 => IcedKey::Named(Named::F10), + BevyKey::F11 => IcedKey::Named(Named::F11), + BevyKey::F12 => IcedKey::Named(Named::F12), + BevyKey::F13 => IcedKey::Named(Named::F13), + BevyKey::F14 => IcedKey::Named(Named::F14), + BevyKey::F15 => IcedKey::Named(Named::F15), + BevyKey::F16 => IcedKey::Named(Named::F16), + BevyKey::F17 => IcedKey::Named(Named::F17), + BevyKey::F18 => IcedKey::Named(Named::F18), + BevyKey::F19 => IcedKey::Named(Named::F19), + BevyKey::F20 => IcedKey::Named(Named::F20), + BevyKey::F21 => IcedKey::Named(Named::F21), + BevyKey::F22 => IcedKey::Named(Named::F22), + BevyKey::F23 => IcedKey::Named(Named::F23), + BevyKey::F24 => IcedKey::Named(Named::F24), + BevyKey::F25 => IcedKey::Named(Named::F25), + BevyKey::F26 => IcedKey::Named(Named::F26), + BevyKey::F27 => IcedKey::Named(Named::F27), + BevyKey::F28 => IcedKey::Named(Named::F28), + BevyKey::F29 => IcedKey::Named(Named::F29), + BevyKey::F30 => IcedKey::Named(Named::F30), + BevyKey::F31 => IcedKey::Named(Named::F31), + BevyKey::F32 => IcedKey::Named(Named::F32), + BevyKey::F33 => IcedKey::Named(Named::F33), + BevyKey::F34 => IcedKey::Named(Named::F34), + BevyKey::F35 => IcedKey::Named(Named::F35), + _ => IcedKey::Unidentified, } } diff --git a/src/iced.rs b/src/iced.rs index 71a3d8c..315e422 100644 --- a/src/iced.rs +++ b/src/iced.rs @@ -6,11 +6,12 @@ use iced_widget::style; pub use style::theme; pub use iced_core::alignment; +pub use iced_core::border; pub use iced_core::event; pub use iced_core::gradient; pub use iced_core::{ - color, Alignment, Background, BorderRadius, Color, ContentFit, Degrees, Gradient, Length, - Padding, Pixels, Point, Radians, Rectangle, Size, Vector, + color, Alignment, Background, Border, Color, ContentFit, Degrees, Gradient, Length, Padding, + Pixels, Point, Radians, Rectangle, Size, Vector, }; pub use iced_runtime::Command; @@ -27,7 +28,7 @@ pub mod font { pub mod keyboard { //! Listen and react to keyboard events. - pub use iced_core::keyboard::{Event, KeyCode, Modifiers}; + pub use iced_core::keyboard::{Event, Key, Location, Modifiers}; } pub mod mouse { @@ -43,8 +44,8 @@ pub mod overlay { /// This is an alias of an `iced_native` element with a default `Renderer`. /// /// [`Overlay`]: iced_native::Overlay - pub type Element<'a, Message, Renderer = crate::Renderer> = - iced_core::overlay::Element<'a, Message, Renderer>; + pub type Element<'a, Message, Theme = super::theme::Theme, Renderer = crate::Renderer> = + iced_core::overlay::Element<'a, Message, Theme, Renderer>; pub use iced_widget::overlay::*; } @@ -73,13 +74,13 @@ pub use font::Font; pub use theme::Theme; /// The default renderer. -pub type Renderer = renderer::Renderer; +pub type Renderer = renderer::Renderer; /// A generic widget. /// /// This is an alias of an `iced_native` element with a default `Renderer`. -pub type Element<'a, Message, Renderer = crate::Renderer> = - iced_core::Element<'a, Message, Renderer>; +pub type Element<'a, Message, Theme = theme::Theme, Renderer = crate::Renderer> = + iced_core::Element<'a, Message, Theme, Renderer>; pub use iced_core::renderer::Style; pub use iced_wgpu::Settings; diff --git a/src/lib.rs b/src/lib.rs index b3feb6d..db32fd9 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -50,6 +50,7 @@ use iced_core::mouse::Cursor; use iced_runtime::user_interface::UserInterface; use iced_widget::graphics::backend::Text; use iced_widget::graphics::Viewport; +use iced_widget::style::Theme; /// Basic re-exports for all Iced-related stuff. /// @@ -65,7 +66,7 @@ mod utils; use systems::IcedEventQueue; /// The default renderer. -pub type Renderer = iced_renderer::Renderer; +pub type Renderer = iced_renderer::Renderer; /// The main feature of `bevy_iced`. /// Add this to your [`App`] by calling `app.add_plugin(bevy_iced::IcedPlugin::default())`. @@ -151,12 +152,9 @@ impl From for IcedResource { } fn setup_pipeline(graph: &mut RenderGraph) { - graph.add_node(render::ICED_PASS, IcedNode::new()); + graph.add_node(render::IcedPass, IcedNode::new()); - graph.add_node_edge( - bevy_render::main_graph::node::CAMERA_DRIVER, - render::ICED_PASS, - ); + graph.add_node_edge(bevy_render::graph::CameraDriverLabel, render::IcedPass); } #[derive(Default)] @@ -234,7 +232,10 @@ pub struct IcedContext<'w, 's, Message: bevy_ecs::event::Event> { impl<'w, 's, M: bevy_ecs::event::Event> IcedContext<'w, 's, M> { /// Display an [`Element`] to the screen. - pub fn display<'a>(&'a mut self, element: impl Into>) { + pub fn display<'a>( + &'a mut self, + element: impl Into>, + ) { let IcedProps { ref mut renderer, ref mut clipboard, diff --git a/src/render.rs b/src/render.rs index d93e7ef..95984e2 100644 --- a/src/render.rs +++ b/src/render.rs @@ -4,6 +4,7 @@ use bevy_ecs::{ system::{Commands, Res, Resource}, world::World, }; +use bevy_render::render_graph::RenderLabel; use bevy_render::renderer::{RenderDevice, RenderQueue}; use bevy_render::{ render_graph::{Node, NodeRunError, RenderGraphContext}, @@ -20,7 +21,8 @@ use std::sync::Mutex; use crate::{DidDraw, IcedProps, IcedResource, IcedSettings}; -pub const ICED_PASS: &str = "bevy_iced_pass"; +#[derive(Clone, Hash, Debug, Eq, PartialEq, RenderLabel)] +pub struct IcedPass; #[cfg(target_arch = "wasm32")] pub const TEXTURE_FMT: TextureFormat = TextureFormat::Rgba8UnormSrgb; @@ -97,7 +99,9 @@ impl Node for IcedNode { let IcedProps { renderer, debug, .. } = &mut *world.resource::().lock().unwrap(); - let crate::Renderer::Wgpu(renderer) = renderer else { return Ok(()) }; + let crate::Renderer::Wgpu(renderer) = renderer else { + return Ok(()); + }; let render_device = world.resource::().wgpu_device(); let render_queue = world.resource::(); let viewport = world.resource::(); diff --git a/src/systems.rs b/src/systems.rs index 751f847..fd27295 100644 --- a/src/systems.rs +++ b/src/systems.rs @@ -12,6 +12,7 @@ use bevy_input::{ ButtonInput, ButtonState, }; use bevy_window::{CursorEntered, CursorLeft, CursorMoved, ReceivedCharacter}; +use iced_core::SmolStr; use iced_core::{keyboard, mouse, Event as IcedEvent, Point}; #[derive(Resource, Deref, DerefMut, Default)] @@ -81,17 +82,23 @@ pub fn process_input( })); } + let modifiers = compute_modifiers(&input_map); + for ev in events.received_character.read() { for char in ev.char.chars() { - event_queue.push(IcedEvent::Keyboard( - iced_core::keyboard::Event::CharacterReceived(char), - )); + let event = keyboard::Event::KeyPressed { + key: keyboard::Key::Character(SmolStr::new(char.to_string())), + modifiers, + // NOTE: This is a winit thing we don't get from bevy events + location: keyboard::Location::Standard, + text: None, + }; + event_queue.push(IcedEvent::Keyboard(event)); } } for ev in events.keyboard_input.read() { use keyboard::Event::*; - let modifiers = compute_modifiers(&input_map); let event = match ev.key_code { KeyCode::ControlLeft | KeyCode::ControlRight @@ -101,17 +108,22 @@ pub fn process_input( | KeyCode::AltRight | KeyCode::SuperLeft | KeyCode::SuperRight => ModifiersChanged(modifiers), - code => { - let key_code = conversions::key_code(code); + _ => { + let key = conversions::key_code(&ev.logical_key); if ev.state.is_pressed() { KeyPressed { - key_code, + key, modifiers, + // NOTE: This is a winit thing we don't get from bevy events + location: keyboard::Location::Standard, + text: None, } } else { KeyReleased { - key_code, + key, modifiers, + // NOTE: This is a winit thing we don't get from bevy events + location: keyboard::Location::Standard, } } } From 71736897eddd20ebc141af9c60a19a0142e466a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Wed, 21 Feb 2024 23:14:01 +0000 Subject: [PATCH 05/10] remove old comments --- Cargo.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8089c18..30b9fc8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,6 @@ documentation = "https://docs.rs/bevy_iced" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -# NOTE: temp using "main" branch until a release with wgpu version matching iced bevy_app = "0.13" bevy_derive = "0.13" bevy_ecs = "0.13" @@ -23,7 +22,6 @@ bevy_render = "0.13" bevy_utils = "0.13" bevy_window = "0.13" -# NOTE: temp using "master" branch until a release with wgpu version matching bevy iced_core = "0.12" iced_runtime = "0.12" iced_wgpu = "0.12" From 073f9208053cecc47e61f76d0296c899a58236fe Mon Sep 17 00:00:00 2001 From: tasgon Date: Tue, 5 Mar 2024 03:35:12 -0800 Subject: [PATCH 06/10] fix text input and examples --- examples/fonts.rs | 2 +- examples/toggle.rs | 2 +- src/systems.rs | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/examples/fonts.rs b/examples/fonts.rs index 6f7b620..c62cade 100644 --- a/examples/fonts.rs +++ b/examples/fonts.rs @@ -18,7 +18,7 @@ pub fn main() { .add_plugins(IcedPlugin { fonts: vec![ALPHAPROTA_FONT_BYTES], settings: iced::Settings { - default_text_size: 40.0, + default_text_size: 40.0.into(), default_font: ALPHAPROTA_FONT, ..Default::default() }, diff --git a/examples/toggle.rs b/examples/toggle.rs index c6f8366..080d878 100644 --- a/examples/toggle.rs +++ b/examples/toggle.rs @@ -23,7 +23,7 @@ pub fn main() { fn toggle_system(mut keyboard: EventReader, mut active: ResMut) { for event in keyboard.read() { - if event.key_code == Some(KeyCode::Space) && event.state == ButtonState::Pressed { + if event.key_code == KeyCode::Space && event.state == ButtonState::Pressed { active.0 = !active.0; } } diff --git a/src/systems.rs b/src/systems.rs index fd27295..8da5d53 100644 --- a/src/systems.rs +++ b/src/systems.rs @@ -86,12 +86,13 @@ pub fn process_input( for ev in events.received_character.read() { for char in ev.char.chars() { + let smol_str = SmolStr::new(char.to_string()); let event = keyboard::Event::KeyPressed { - key: keyboard::Key::Character(SmolStr::new(char.to_string())), + key: keyboard::Key::Character(smol_str.clone()), modifiers, // NOTE: This is a winit thing we don't get from bevy events location: keyboard::Location::Standard, - text: None, + text: Some(smol_str), }; event_queue.push(IcedEvent::Keyboard(event)); } From 19aaa6d416f4a47fafcc64173063304820225a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Fri, 8 Mar 2024 08:52:40 +0000 Subject: [PATCH 07/10] fix to use the plugin font settings --- src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index db32fd9..053731e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -127,8 +127,8 @@ impl IcedProps { Self { renderer: Renderer::Wgpu(iced_wgpu::Renderer::new( backend, - iced_core::Font::default(), - iced_core::Pixels::from(12_f32), + config.settings.default_font, + config.settings.default_text_size, )), debug: iced_runtime::Debug::new(), clipboard: iced_core::clipboard::Null, From e003361034712798a71a5ffa0ea921dc4fe634e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Fri, 22 Mar 2024 12:08:29 +0000 Subject: [PATCH 08/10] update the mouse button conversion --- src/conversions.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/conversions.rs b/src/conversions.rs index 4b4cf0a..22fec25 100644 --- a/src/conversions.rs +++ b/src/conversions.rs @@ -331,9 +331,8 @@ pub fn mouse_button(button: MouseButton) -> iced_core::mouse::Button { MouseButton::Right => Button::Right, MouseButton::Middle => Button::Middle, MouseButton::Other(val) => Button::Other(val), - // TODO: We need https://github.com/iced-rs/iced/pull/2169 - MouseButton::Back => todo!(), - MouseButton::Forward => todo!(), + MouseButton::Back => Button::Back, + MouseButton::Forward => Button::Forward, } } From b8ef0fb793993ab9414152f5c53c61fd2902a366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Fri, 22 Mar 2024 14:32:20 +0000 Subject: [PATCH 09/10] use iced fork with disabled text_input widget cache --- Cargo.lock | 45 ++++++++++++++++++--------------------------- Cargo.toml | 16 +++++++++++----- 2 files changed, 29 insertions(+), 32 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 79c04ea..dbaccf9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2268,9 +2268,8 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" [[package]] name = "iced_core" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55f9226618af7e8155fc8a233e4d84dc1ec44438705f972e35d5d50e62f937df" +version = "0.12.1" +source = "git+https://github.com/tzemanovic/iced.git?rev=ac826cf5f72a0598bbe986fd6da9f970ef91ab98#ac826cf5f72a0598bbe986fd6da9f970ef91ab98" dependencies = [ "bitflags 2.4.1", "glam", @@ -2286,9 +2285,8 @@ dependencies = [ [[package]] name = "iced_futures" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "370bad88fb3832cbeeb3fa6c486b4701fb7e8da32a753b3101d4ce81fc1d9497" +version = "0.12.1" +source = "git+https://github.com/tzemanovic/iced.git?rev=ac826cf5f72a0598bbe986fd6da9f970ef91ab98#ac826cf5f72a0598bbe986fd6da9f970ef91ab98" dependencies = [ "futures", "iced_core", @@ -2299,9 +2297,8 @@ dependencies = [ [[package]] name = "iced_graphics" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0660df444c64a13f72999c55a324f6d3ea020167bb1af8ef43fe2bff168d8c27" +version = "0.12.1" +source = "git+https://github.com/tzemanovic/iced.git?rev=ac826cf5f72a0598bbe986fd6da9f970ef91ab98#ac826cf5f72a0598bbe986fd6da9f970ef91ab98" dependencies = [ "bitflags 2.4.1", "bytemuck", @@ -2320,9 +2317,8 @@ dependencies = [ [[package]] name = "iced_renderer" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59d931249515deb5fe116c7d199792cd9fd32d31bf18ffc08c6c2ad2dee5fd3e" +version = "0.12.1" +source = "git+https://github.com/tzemanovic/iced.git?rev=ac826cf5f72a0598bbe986fd6da9f970ef91ab98#ac826cf5f72a0598bbe986fd6da9f970ef91ab98" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2333,9 +2329,8 @@ dependencies = [ [[package]] name = "iced_runtime" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "618a845cd752ca195f0805b7a4f0be42c071a4fdef0b88df047006572d219a5a" +version = "0.12.1" +source = "git+https://github.com/tzemanovic/iced.git?rev=ac826cf5f72a0598bbe986fd6da9f970ef91ab98#ac826cf5f72a0598bbe986fd6da9f970ef91ab98" dependencies = [ "iced_core", "iced_futures", @@ -2345,9 +2340,8 @@ dependencies = [ [[package]] name = "iced_style" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb6b3992bceeac1393ce0e83d06ab786be4c17c6a0004eefbdd4f6d89d5e8058" +version = "0.12.1" +source = "git+https://github.com/tzemanovic/iced.git?rev=ac826cf5f72a0598bbe986fd6da9f970ef91ab98#ac826cf5f72a0598bbe986fd6da9f970ef91ab98" dependencies = [ "iced_core", "once_cell", @@ -2356,9 +2350,8 @@ dependencies = [ [[package]] name = "iced_tiny_skia" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e079a4ae34df06894500e486b20bae8d8f2806fd64efe4fa9abe329e7f585f21" +version = "0.12.1" +source = "git+https://github.com/tzemanovic/iced.git?rev=ac826cf5f72a0598bbe986fd6da9f970ef91ab98#ac826cf5f72a0598bbe986fd6da9f970ef91ab98" dependencies = [ "bytemuck", "cosmic-text", @@ -2373,9 +2366,8 @@ dependencies = [ [[package]] name = "iced_wgpu" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa5d3ce370c7044ddc9535c8f87057f1008434a495be6b9f46b2666c3e9638f7" +version = "0.12.1" +source = "git+https://github.com/tzemanovic/iced.git?rev=ac826cf5f72a0598bbe986fd6da9f970ef91ab98#ac826cf5f72a0598bbe986fd6da9f970ef91ab98" dependencies = [ "bitflags 2.4.1", "bytemuck", @@ -2391,9 +2383,8 @@ dependencies = [ [[package]] name = "iced_widget" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99f30ebbcc0706c19a92f01669193271d82bb209fda83576392d04cef3214ca2" +version = "0.12.1" +source = "git+https://github.com/tzemanovic/iced.git?rev=ac826cf5f72a0598bbe986fd6da9f970ef91ab98#ac826cf5f72a0598bbe986fd6da9f970ef91ab98" dependencies = [ "iced_renderer", "iced_runtime", diff --git a/Cargo.toml b/Cargo.toml index 30b9fc8..db7963a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,11 +22,17 @@ bevy_render = "0.13" bevy_utils = "0.13" bevy_window = "0.13" -iced_core = "0.12" -iced_runtime = "0.12" -iced_wgpu = "0.12" -iced_widget = "0.12" -iced_renderer = { version = "0.12", features = ["wgpu"] } +# iced_core = "0.12" +# iced_runtime = "0.12" +# iced_wgpu = "0.12" +# iced_widget = "0.12" +# iced_renderer = { version = "0.12", features = ["wgpu"] } +# NOTE: temp fork for https://github.com/iced-rs/iced/issues/2318 +iced_core = { git = "https://github.com/tzemanovic/iced.git", rev = "ac826cf5f72a0598bbe986fd6da9f970ef91ab98" } +iced_runtime = { git = "https://github.com/tzemanovic/iced.git", rev = "ac826cf5f72a0598bbe986fd6da9f970ef91ab98" } +iced_wgpu = { git = "https://github.com/tzemanovic/iced.git", rev = "ac826cf5f72a0598bbe986fd6da9f970ef91ab98" } +iced_widget = { git = "https://github.com/tzemanovic/iced.git", rev = "ac826cf5f72a0598bbe986fd6da9f970ef91ab98" } +iced_renderer = { git = "https://github.com/tzemanovic/iced.git", rev = "ac826cf5f72a0598bbe986fd6da9f970ef91ab98" , features = ["wgpu"] } [dev-dependencies] bevy = "0.13" From 2973b9aaead49aec05f74b45d9de3ee27fcf42d3 Mon Sep 17 00:00:00 2001 From: tasgon Date: Tue, 2 Apr 2024 12:18:29 -0700 Subject: [PATCH 10/10] Revert "use iced fork with disabled text_input widget cache" This reverts commit b8ef0fb793993ab9414152f5c53c61fd2902a366. --- Cargo.lock | 45 +++++++++++++++++++++++++++------------------ Cargo.toml | 16 +++++----------- 2 files changed, 32 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dbaccf9..79c04ea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2268,8 +2268,9 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" [[package]] name = "iced_core" -version = "0.12.1" -source = "git+https://github.com/tzemanovic/iced.git?rev=ac826cf5f72a0598bbe986fd6da9f970ef91ab98#ac826cf5f72a0598bbe986fd6da9f970ef91ab98" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55f9226618af7e8155fc8a233e4d84dc1ec44438705f972e35d5d50e62f937df" dependencies = [ "bitflags 2.4.1", "glam", @@ -2285,8 +2286,9 @@ dependencies = [ [[package]] name = "iced_futures" -version = "0.12.1" -source = "git+https://github.com/tzemanovic/iced.git?rev=ac826cf5f72a0598bbe986fd6da9f970ef91ab98#ac826cf5f72a0598bbe986fd6da9f970ef91ab98" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "370bad88fb3832cbeeb3fa6c486b4701fb7e8da32a753b3101d4ce81fc1d9497" dependencies = [ "futures", "iced_core", @@ -2297,8 +2299,9 @@ dependencies = [ [[package]] name = "iced_graphics" -version = "0.12.1" -source = "git+https://github.com/tzemanovic/iced.git?rev=ac826cf5f72a0598bbe986fd6da9f970ef91ab98#ac826cf5f72a0598bbe986fd6da9f970ef91ab98" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0660df444c64a13f72999c55a324f6d3ea020167bb1af8ef43fe2bff168d8c27" dependencies = [ "bitflags 2.4.1", "bytemuck", @@ -2317,8 +2320,9 @@ dependencies = [ [[package]] name = "iced_renderer" -version = "0.12.1" -source = "git+https://github.com/tzemanovic/iced.git?rev=ac826cf5f72a0598bbe986fd6da9f970ef91ab98#ac826cf5f72a0598bbe986fd6da9f970ef91ab98" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59d931249515deb5fe116c7d199792cd9fd32d31bf18ffc08c6c2ad2dee5fd3e" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2329,8 +2333,9 @@ dependencies = [ [[package]] name = "iced_runtime" -version = "0.12.1" -source = "git+https://github.com/tzemanovic/iced.git?rev=ac826cf5f72a0598bbe986fd6da9f970ef91ab98#ac826cf5f72a0598bbe986fd6da9f970ef91ab98" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "618a845cd752ca195f0805b7a4f0be42c071a4fdef0b88df047006572d219a5a" dependencies = [ "iced_core", "iced_futures", @@ -2340,8 +2345,9 @@ dependencies = [ [[package]] name = "iced_style" -version = "0.12.1" -source = "git+https://github.com/tzemanovic/iced.git?rev=ac826cf5f72a0598bbe986fd6da9f970ef91ab98#ac826cf5f72a0598bbe986fd6da9f970ef91ab98" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb6b3992bceeac1393ce0e83d06ab786be4c17c6a0004eefbdd4f6d89d5e8058" dependencies = [ "iced_core", "once_cell", @@ -2350,8 +2356,9 @@ dependencies = [ [[package]] name = "iced_tiny_skia" -version = "0.12.1" -source = "git+https://github.com/tzemanovic/iced.git?rev=ac826cf5f72a0598bbe986fd6da9f970ef91ab98#ac826cf5f72a0598bbe986fd6da9f970ef91ab98" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e079a4ae34df06894500e486b20bae8d8f2806fd64efe4fa9abe329e7f585f21" dependencies = [ "bytemuck", "cosmic-text", @@ -2366,8 +2373,9 @@ dependencies = [ [[package]] name = "iced_wgpu" -version = "0.12.1" -source = "git+https://github.com/tzemanovic/iced.git?rev=ac826cf5f72a0598bbe986fd6da9f970ef91ab98#ac826cf5f72a0598bbe986fd6da9f970ef91ab98" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa5d3ce370c7044ddc9535c8f87057f1008434a495be6b9f46b2666c3e9638f7" dependencies = [ "bitflags 2.4.1", "bytemuck", @@ -2383,8 +2391,9 @@ dependencies = [ [[package]] name = "iced_widget" -version = "0.12.1" -source = "git+https://github.com/tzemanovic/iced.git?rev=ac826cf5f72a0598bbe986fd6da9f970ef91ab98#ac826cf5f72a0598bbe986fd6da9f970ef91ab98" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99f30ebbcc0706c19a92f01669193271d82bb209fda83576392d04cef3214ca2" dependencies = [ "iced_renderer", "iced_runtime", diff --git a/Cargo.toml b/Cargo.toml index db7963a..30b9fc8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,17 +22,11 @@ bevy_render = "0.13" bevy_utils = "0.13" bevy_window = "0.13" -# iced_core = "0.12" -# iced_runtime = "0.12" -# iced_wgpu = "0.12" -# iced_widget = "0.12" -# iced_renderer = { version = "0.12", features = ["wgpu"] } -# NOTE: temp fork for https://github.com/iced-rs/iced/issues/2318 -iced_core = { git = "https://github.com/tzemanovic/iced.git", rev = "ac826cf5f72a0598bbe986fd6da9f970ef91ab98" } -iced_runtime = { git = "https://github.com/tzemanovic/iced.git", rev = "ac826cf5f72a0598bbe986fd6da9f970ef91ab98" } -iced_wgpu = { git = "https://github.com/tzemanovic/iced.git", rev = "ac826cf5f72a0598bbe986fd6da9f970ef91ab98" } -iced_widget = { git = "https://github.com/tzemanovic/iced.git", rev = "ac826cf5f72a0598bbe986fd6da9f970ef91ab98" } -iced_renderer = { git = "https://github.com/tzemanovic/iced.git", rev = "ac826cf5f72a0598bbe986fd6da9f970ef91ab98" , features = ["wgpu"] } +iced_core = "0.12" +iced_runtime = "0.12" +iced_wgpu = "0.12" +iced_widget = "0.12" +iced_renderer = { version = "0.12", features = ["wgpu"] } [dev-dependencies] bevy = "0.13"