From 0016498ef2293b58e1ea389db4e386e4e37bf4d0 Mon Sep 17 00:00:00 2001 From: HeavyRain266 <ignacy423@gmail.com> Date: Fri, 29 Jul 2022 23:38:45 +0200 Subject: [PATCH] Port kayak_font to Bevy 0.8 Signed-off-by: HeavyRain266 <heavyrain266@pm.me> --- Cargo.lock | 1547 +++++++++++------ Cargo.toml | 4 +- bevy_kayak_renderer/Cargo.toml | 2 +- bevy_kayak_ui/Cargo.toml | 2 +- kayak_core/Cargo.toml | 6 +- kayak_font/Cargo.toml | 19 +- kayak_font/examples/bevy.rs | 14 +- kayak_font/examples/renderer/extract.rs | 6 +- kayak_font/examples/renderer/mod.rs | 2 +- kayak_font/examples/renderer/pipeline.rs | 29 +- kayak_font/examples/renderer/shader.wgsl | 41 +- kayak_font/src/atlas.rs | 26 +- kayak_font/src/bevy/font_texture.rs | 13 +- kayak_font/src/bevy/renderer/extract.rs | 11 +- .../src/bevy/renderer/font_texture_cache.rs | 14 +- kayak_font/src/glyph.rs | 52 +- kayak_font/src/metrics.rs | 12 +- kayak_font/src/sdf.rs | 23 +- kayak_render_macros/Cargo.toml | 4 +- 19 files changed, 1129 insertions(+), 698 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index feeebfc..f8555f8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -18,6 +18,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a13739d7177fbd22bb0ed28badfff9f372f8bef46c863db4e1c6248f6b223b6e" +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + [[package]] name = "adler32" version = "1.2.0" @@ -53,7 +59,7 @@ dependencies = [ "alsa-sys", "bitflags", "libc", - "nix", + "nix 0.23.1", ] [[package]] @@ -85,10 +91,13 @@ dependencies = [ ] [[package]] -name = "ansi_term" -version = "0.9.0" +name = "android_system_properties" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6" +checksum = "d7ed72e1635e121ca3e79420540282af22da58be50de153d36f81ddc6b83aa9e" +dependencies = [ + "libc", +] [[package]] name = "ansi_term" @@ -128,9 +137,9 @@ checksum = "088ccb346677e658e7ccd9627c62576fba881f4db7fab71fa9e21bf31c0aa4cb" [[package]] name = "ash" -version = "0.34.0+1.2.203" +version = "0.37.0+1.3.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0f780da53d0063880d45554306489f09dd8d1bda47688b4a57bc579119356df" +checksum = "006ca68e0f2b03f22d6fa9f2860f85aed430d257fec20f8879b2145e7c7ae1a6" dependencies = [ "libloading", ] @@ -172,12 +181,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "base-x" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" - [[package]] name = "base64" version = "0.13.0" @@ -186,77 +189,115 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "bevy" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fce306d40a111309ee61d4626efbafccdd46bb80657122c38061fa7264c08e4" +checksum = "55f08528a4e59d607460513a823b40f602d013c1a00f57b824f1075d5d48c3cd" dependencies = [ - "bevy_internal", + "bevy_internal 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "bevy-crevice-derive" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "191a752a01c3402deb24320acf42288bf822e5d22f19ae1d903797f02e9b0c33" +name = "bevy" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" dependencies = [ - "bevy_macro_utils", - "proc-macro2", - "quote", - "syn", + "bevy_internal 0.8.0 (git+https://github.com/bevyengine/bevy.git)", ] [[package]] name = "bevy_animation" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c087569c34b168dd988e8b3409ce273661b4a58c3c534d0e381950589f59f68e" +checksum = "e243169af495ad616ff701247c0d3e40078a26ed8de231cf9e54bde6b3c4bb45" dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_ecs", - "bevy_hierarchy", - "bevy_math", - "bevy_reflect", - "bevy_transform", - "bevy_utils", + "bevy_app 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_asset 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_core 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_ecs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_hierarchy 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_math 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_reflect 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_time 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_transform 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "bevy_app" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32660ae99fa3498ca379de28b7e2f447e6531b0e432bf200901efeec075553c1" +checksum = "53d26d6ffdf493609d2fedc1018a2ef0cb4d8e48f6d3bcea56fa2df81867e464" dependencies = [ - "bevy_derive", - "bevy_ecs", - "bevy_reflect", - "bevy_utils", + "bevy_derive 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_ecs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_reflect 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_tasks 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "bevy_app" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" +dependencies = [ + "bevy_derive 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_ecs 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_reflect 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_tasks 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_utils 0.8.0 (git+https://github.com/bevyengine/bevy.git)", "wasm-bindgen", "web-sys", ] [[package]] name = "bevy_asset" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2afd395240087924ba49c8cae2b00d007aeb1db53ee726a543b1e90dce2d3ab" +checksum = "3d8fb95306d5f18fa70df40632cd984993aeb71e91ce059ae99699098a4f9ce9" dependencies = [ "anyhow", - "bevy_app", - "bevy_diagnostic", - "bevy_ecs", - "bevy_log", - "bevy_reflect", - "bevy_tasks", - "bevy_utils", + "bevy_app 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_diagnostic 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_ecs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_log 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_reflect 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_tasks 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-channel", "downcast-rs", + "fastrand", "js-sys", "ndk-glue 0.5.2", "notify", - "parking_lot", - "rand", + "parking_lot 0.12.1", + "serde", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "bevy_asset" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" +dependencies = [ + "anyhow", + "bevy_app 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_diagnostic 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_ecs 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_log 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_reflect 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_tasks 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_utils 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "crossbeam-channel", + "downcast-rs", + "fastrand", + "js-sys", + "ndk-glue 0.5.2", + "parking_lot 0.12.1", "serde", "thiserror", "wasm-bindgen", @@ -266,151 +307,246 @@ dependencies = [ [[package]] name = "bevy_audio" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73a1c827ae837b62868539040176fb6d4daecf24983b98a0284d158e52cd21d5" +checksum = "eee08ac575397ce17477dd291862bafa15226334bdfb82c02bbc3d10bad7bdb8" dependencies = [ "anyhow", - "bevy_app", - "bevy_asset", - "bevy_ecs", - "bevy_reflect", - "bevy_utils", - "parking_lot", + "bevy_app 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_asset 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_ecs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_reflect 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot 0.12.1", "rodio", ] [[package]] name = "bevy_core" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12c0f8614b6014671ab60bacb8bf681373d08b0bb15633b8ef72b895cf966d29" +checksum = "c6712146d54fff9e1865362e9f39a7b63c7b037ddb72a3d7bb05b959213fb61e" dependencies = [ - "bevy_app", - "bevy_derive", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_tasks", - "bevy_utils", + "bevy_app 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_ecs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_math 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_reflect 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_tasks 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bytemuck", +] + +[[package]] +name = "bevy_core" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" +dependencies = [ + "bevy_app 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_ecs 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_math 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_reflect 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_tasks 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_utils 0.8.0 (git+https://github.com/bevyengine/bevy.git)", "bytemuck", ] [[package]] name = "bevy_core_pipeline" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d570bc9310196190910a5b1ffd8c8c35bd6b73f918d0651ae3c3d4e57be9a7" -dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_ecs", - "bevy_render", - "bevy_utils", +checksum = "080bb00399b6d7697e505f871d67c6de8b52eb06b47b0cda2be80c2396805983" +dependencies = [ + "bevy_app 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_asset 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_derive 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_ecs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_reflect 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_render 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_transform 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "radsort", + "serde", ] [[package]] -name = "bevy_crevice" -version = "0.7.0" +name = "bevy_core_pipeline" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" +dependencies = [ + "bevy_app 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_asset 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_derive 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_ecs 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_reflect 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_render 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_transform 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_utils 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "radsort", + "serde", +] + +[[package]] +name = "bevy_derive" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3da0a284fb26c02cb96ef4d5bbf4de5fad7e1a901730035a61813bf64e28482e" +checksum = "a4b8f0786d1fc7e0d35297917be463db3d0886f7bd8d4221ca3d565502579ffb" dependencies = [ - "bevy-crevice-derive", - "bytemuck", - "glam 0.20.5", - "mint", + "bevy_macro_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quote", + "syn", ] [[package]] name = "bevy_derive" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6abddf2ed415f31d28a9bf9ab3c0bc857e98a722858d38dba65bdda481f8d714" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.8.0 (git+https://github.com/bevyengine/bevy.git)", "quote", "syn", ] [[package]] name = "bevy_diagnostic" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ebf72ea058cfc379756e9da7de6861174e1860504f41e3e5a46d5b1c35d6644" +checksum = "adab74ee5375fbf5d2b1d3da41de8d1491a8a706d17441b5e31214b65349d692" +dependencies = [ + "bevy_app 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_ecs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_log 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_time 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "bevy_diagnostic" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" dependencies = [ - "bevy_app", - "bevy_core", - "bevy_ecs", - "bevy_log", - "bevy_utils", + "bevy_app 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_ecs 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_log 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_time 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_utils 0.8.0 (git+https://github.com/bevyengine/bevy.git)", ] [[package]] name = "bevy_ecs" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e67dd06b14e787d2026fe6e2b63f67482afcc62284f20ea2784d8b0662e95f" +checksum = "a5643dc27b7d6778e3a66c8e0f6ad1fd33309aa2fa61d935f360ccc85b7be6a2" dependencies = [ "async-channel", - "bevy_ecs_macros", - "bevy_reflect", - "bevy_tasks", - "bevy_utils", + "bevy_ecs_macros 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_ptr 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_reflect 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_tasks 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "downcast-rs", "fixedbitset", "fxhash", "serde", - "thiserror", + "thread_local", +] + +[[package]] +name = "bevy_ecs" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" +dependencies = [ + "async-channel", + "bevy_ecs_macros 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_ptr 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_reflect 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_tasks 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_utils 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "downcast-rs", + "fixedbitset", + "fxhash", + "serde", + "thread_local", ] [[package]] name = "bevy_ecs_macros" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718923a491490bd81074492d61fc08134f9c62a29ba8666818cd7a6630421246" +checksum = "a5f2f12677f8725d40930d0a19652f007fe0ef5ac38e23817cfc4930c61f5680" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2", "quote", "syn", ] +[[package]] +name = "bevy_ecs_macros" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" +dependencies = [ + "bevy_macro_utils 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "bevy_encase_derive" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a767adc36ce1fc917a736843b026d4de7069d90ed5e669c852481ef69fd5aa" +dependencies = [ + "bevy_macro_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "encase_derive_impl", +] + +[[package]] +name = "bevy_encase_derive" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" +dependencies = [ + "bevy_macro_utils 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "encase_derive_impl", +] + [[package]] name = "bevy_gilrs" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b164983e8057a1a730412a7c26ccc540d9ce76d2c6ab68edd258a0baeb1762" +checksum = "963940426127533164af2a556971a03c493143c0afb95afadb4a070b6ab8c3df" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_input", - "bevy_utils", + "bevy_app 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_ecs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_input 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "gilrs", ] [[package]] name = "bevy_gltf" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e07bda7721091c1a683343d466132dc69dec65aa83d8c9e328a2fb3431f03be" +checksum = "150cc6782c4472600c2ade5d78c6ce481c992690f0499e63765aba752d7e0f04" dependencies = [ "anyhow", "base64", "bevy_animation", - "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_ecs", - "bevy_hierarchy", - "bevy_log", - "bevy_math", - "bevy_pbr", - "bevy_reflect", - "bevy_render", + "bevy_app 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_asset 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_core 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_core_pipeline 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_ecs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_hierarchy 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_log 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_math 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_pbr 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_reflect 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_render 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "bevy_scene", - "bevy_transform", - "bevy_utils", + "bevy_tasks 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_transform 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "gltf", "percent-encoding", "thiserror", @@ -418,70 +554,123 @@ dependencies = [ [[package]] name = "bevy_hierarchy" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f407f152f35541a099484200afe3b0ca09ce625469e8233dcdc264d6f88e01a" +checksum = "8e2e4c20d7c843cd26ef3c5d7b4c20e3e32c275943e2437ecaca1cfd6cfe3b30" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_reflect", - "bevy_utils", + "bevy_app 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_ecs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_reflect 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec", +] + +[[package]] +name = "bevy_hierarchy" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" +dependencies = [ + "bevy_app 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_ecs 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_reflect 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_utils 0.8.0 (git+https://github.com/bevyengine/bevy.git)", "smallvec", ] [[package]] name = "bevy_input" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4ec4f6e38ef1b41ff68ec7badd6afc5c9699191e61e511c4abee91a5888afc" +checksum = "a11c70573fb4d4c056ba32cfa553daa7e6e1245cb876ccfbe322640928b7ee1c" +dependencies = [ + "bevy_app 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_ecs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_math 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "bevy_input" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_math", - "bevy_utils", + "bevy_app 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_ecs 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_math 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_utils 0.8.0 (git+https://github.com/bevyengine/bevy.git)", ] [[package]] name = "bevy_internal" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d518a8e5f526a9537fc8408a284caec7af22b23c3b23c0dee08bacc0930e2f1a" +checksum = "0d603b597772130782eab6e604706cbb764fb037f9cf0a1904b6f342845b6f44" dependencies = [ "bevy_animation", - "bevy_app", - "bevy_asset", + "bevy_app 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_asset 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "bevy_audio", - "bevy_core", - "bevy_core_pipeline", - "bevy_derive", - "bevy_diagnostic", - "bevy_ecs", + "bevy_core 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_core_pipeline 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_derive 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_diagnostic 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_ecs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "bevy_gilrs", "bevy_gltf", - "bevy_hierarchy", - "bevy_input", - "bevy_log", - "bevy_math", - "bevy_pbr", - "bevy_reflect", - "bevy_render", + "bevy_hierarchy 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_input 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_log 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_math 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_pbr 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_ptr 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_reflect 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_render 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "bevy_scene", "bevy_sprite", - "bevy_tasks", + "bevy_tasks 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "bevy_text", - "bevy_transform", + "bevy_time 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_transform 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "bevy_ui", - "bevy_utils", - "bevy_window", + "bevy_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_window 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "bevy_winit", "ndk-glue 0.5.2", ] +[[package]] +name = "bevy_internal" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" +dependencies = [ + "bevy_app 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_asset 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_core 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_core_pipeline 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_derive 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_diagnostic 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_ecs 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_hierarchy 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_input 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_log 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_math 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_pbr 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_ptr 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_reflect 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_render 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_tasks 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_time 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_transform 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_utils 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_window 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "ndk-glue 0.5.2", +] + [[package]] name = "bevy_kayak_renderer" version = "0.0.1" dependencies = [ - "bevy", + "bevy 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "bytemuck", "kayak_font", "serde", @@ -493,7 +682,7 @@ dependencies = [ name = "bevy_kayak_ui" version = "0.0.1" dependencies = [ - "bevy", + "bevy 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "bevy_kayak_renderer", "bytemuck", "kayak_core", @@ -505,13 +694,27 @@ dependencies = [ [[package]] name = "bevy_log" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943ec496720ded2ff62b292d8e5fc845817a504915f41b7c5fd12b1380300f75" +checksum = "8cafb12fc84734236e36f407ab62c72d5d4279fa4777e40a95d7cc973cbabcd1" dependencies = [ "android_log-sys", - "bevy_app", - "bevy_utils", + "bevy_app 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "console_error_panic_hook", + "tracing-log", + "tracing-subscriber", + "tracing-wasm", +] + +[[package]] +name = "bevy_log" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" +dependencies = [ + "android_log-sys", + "bevy_app 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_utils 0.8.0 (git+https://github.com/bevyengine/bevy.git)", "console_error_panic_hook", "tracing-log", "tracing-subscriber", @@ -520,58 +723,143 @@ dependencies = [ [[package]] name = "bevy_macro_utils" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7ddfc33a99547e36718e56e414541e461c74ec318ff987a1e9f4ff46d0dacbb" +checksum = "4d081af83b701e16cad209255ba6b383744dfa49efa99eb6505989f293305ab3" +dependencies = [ + "quote", + "syn", + "toml", +] + +[[package]] +name = "bevy_macro_utils" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" dependencies = [ - "cargo-manifest", "quote", "syn", + "toml", ] [[package]] name = "bevy_math" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20288df0f70ff258bbaffaf55209f1271a7436438591bbffc3d81e4d84b423f2" +checksum = "db5394e86c5708d3aa506c6e98ec4ed2a4083a7a018c6693d9ac0e77ebfabfc2" +dependencies = [ + "glam", +] + +[[package]] +name = "bevy_math" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" dependencies = [ - "bevy_reflect", - "glam 0.20.5", + "glam", +] + +[[package]] +name = "bevy_mikktspace" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40b299a61175a6f7e7398f83cd5b50920fd8bad4df674e614ad94f25f8426509" +dependencies = [ + "glam", +] + +[[package]] +name = "bevy_mikktspace" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" +dependencies = [ + "glam", ] [[package]] name = "bevy_pbr" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06adee54840f18cfeda7af4cdc57608644fa840be076a562353f896bfdb9c694" -dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_core_pipeline", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_render", - "bevy_transform", - "bevy_utils", - "bevy_window", +checksum = "ed9a81bbd02f5e0a57899a41aec37d9cb14965e1e4d510547f3f680323d05c0f" +dependencies = [ + "bevy_app 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_asset 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_core_pipeline 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_ecs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_math 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_reflect 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_render 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_transform 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_window 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags", "bytemuck", + "radsort", ] +[[package]] +name = "bevy_pbr" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" +dependencies = [ + "bevy_app 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_asset 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_core_pipeline 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_ecs 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_math 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_reflect 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_render 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_transform 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_utils 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_window 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bitflags", + "bytemuck", + "radsort", +] + +[[package]] +name = "bevy_ptr" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d92d5679e89602a18682a37846573dcd1979410179e14204280460ba9fb8713a" + +[[package]] +name = "bevy_ptr" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" + [[package]] name = "bevy_reflect" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d0793107bc4b7c6bd04232d739fc8d70aa5fb313bfad6e850f91f79b2557eed" +checksum = "08798e67f2d4e6898ef117d8c99cf3b50a8eebc8da4159e6dad2657a0fbe9a4e" dependencies = [ - "bevy_reflect_derive", - "bevy_utils", + "bevy_ptr 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_reflect_derive 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "downcast-rs", "erased-serde", - "glam 0.20.5", - "parking_lot", + "glam", + "once_cell", + "parking_lot 0.12.1", + "serde", + "smallvec", + "thiserror", +] + +[[package]] +name = "bevy_reflect" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" +dependencies = [ + "bevy_ptr 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_reflect_derive 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_utils 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "downcast-rs", + "erased-serde", + "glam", + "once_cell", + "parking_lot 0.12.1", "serde", "smallvec", "thiserror", @@ -579,92 +867,179 @@ dependencies = [ [[package]] name = "bevy_reflect_derive" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81c88de8067d19dfde31662ee78e3ee6971e2df27715799f91b515b37a636677" +checksum = "19209a7f0238053802b7de04e6724bd90d4ed7d90e87101dbd1b64cca64ff694" +dependencies = [ + "bevy_macro_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", + "quote", + "syn", + "uuid 1.1.2", +] + +[[package]] +name = "bevy_reflect_derive" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" dependencies = [ - "bevy_macro_utils", + "bevy_macro_utils 0.8.0 (git+https://github.com/bevyengine/bevy.git)", "proc-macro2", "quote", "syn", - "uuid", + "uuid 1.1.2", ] [[package]] name = "bevy_render" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a358da8255b704153913c3499b3693fa5cfe13a48725ac6e76b043fa5633bc8" +checksum = "bb49530388ef17cff3fb8bd5e47372fb3cfeb4befc73e3036f6462ac20f049ef" dependencies = [ "anyhow", - "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_crevice", - "bevy_derive", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_transform", - "bevy_utils", - "bevy_window", + "bevy_app 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_asset 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_core 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_derive 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_ecs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_encase_derive 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_hierarchy 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_log 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_math 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_mikktspace 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_reflect 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_render_macros 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_time 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_transform 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_window 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags", "codespan-reporting", "copyless", "downcast-rs", + "encase", "futures-lite", "hex", "hexasphere", "image", "naga", "once_cell", - "parking_lot", + "parking_lot 0.12.1", "regex", "serde", "smallvec", "thiserror", + "thread_local", + "wgpu", +] + +[[package]] +name = "bevy_render" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" +dependencies = [ + "anyhow", + "bevy_app 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_asset 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_core 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_derive 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_ecs 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_encase_derive 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_hierarchy 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_log 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_math 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_mikktspace 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_reflect 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_render_macros 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_time 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_transform 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_utils 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_window 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bitflags", + "codespan-reporting", + "copyless", + "downcast-rs", + "encase", + "futures-lite", + "hex", + "hexasphere", + "image", + "naga", + "once_cell", + "parking_lot 0.12.1", + "regex", + "serde", + "smallvec", + "thiserror", + "thread_local", "wgpu", ] +[[package]] +name = "bevy_render_macros" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7d0b7a51fa819c20c64f43856c5aaea40f853050bbb09b9ba3672e5ff2688a5" +dependencies = [ + "bevy_macro_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "bevy_render_macros" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" +dependencies = [ + "bevy_macro_utils 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "bevy_scene" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ea240f2ffce9f58a5601cc5ead24111f577dc4c656452839eb1fdf4b7a28529" +checksum = "0064d73ebb0de39901478b493604a1a6d448fd337b66803004c60f41f1fa6c37" dependencies = [ "anyhow", - "bevy_app", - "bevy_asset", - "bevy_ecs", - "bevy_hierarchy", - "bevy_reflect", - "bevy_utils", + "bevy_app 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_asset 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_derive 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_ecs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_hierarchy 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_reflect 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_render 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_transform 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "ron", "serde", "thiserror", - "uuid", + "uuid 1.1.2", ] [[package]] name = "bevy_sprite" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fcecfbc623410137d85a71a295ff7c16604b7be24529c9ea4b9a9881d7a142b" -dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_core_pipeline", - "bevy_ecs", - "bevy_log", - "bevy_math", - "bevy_reflect", - "bevy_render", - "bevy_transform", - "bevy_utils", +checksum = "1f83dfe8897d6c0d9d5ce3818d49a13e58ae2b9b9ecf4f4bb85aa31bb0678f68" +dependencies = [ + "bevy_app 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_asset 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_core_pipeline 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_ecs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_log 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_math 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_reflect 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_render 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_transform 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags", "bytemuck", "copyless", + "fixedbitset", "guillotiere", "rectangle-pack", "serde", @@ -673,126 +1048,204 @@ dependencies = [ [[package]] name = "bevy_tasks" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2b0f0b86c8f78c53a2d4c669522f45e725ed9d9c3d734f54ec30876494e04e" +checksum = "ff874c91a36eaac3ef957c6f3b590fb71332d9d136671cc858847d56fe9f80a3" dependencies = [ "async-channel", "async-executor", "event-listener", "futures-lite", "num_cpus", + "once_cell", + "wasm-bindgen-futures", +] + +[[package]] +name = "bevy_tasks" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" +dependencies = [ + "async-channel", + "async-executor", + "event-listener", + "futures-lite", + "num_cpus", + "once_cell", "wasm-bindgen-futures", ] [[package]] name = "bevy_text" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a206112de011fd6baebaf476af69d87f4e38a1314b65e3c872060830d7c0b9fa" +checksum = "ef05a788c2c04aaa5db95b22a8f0fff0d3a0b08a7bcd1a71f050a628b38eec6e" dependencies = [ "ab_glyph", "anyhow", - "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_ecs", - "bevy_math", - "bevy_reflect", - "bevy_render", + "bevy_app 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_asset 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_ecs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_math 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_reflect 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_render 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "bevy_sprite", - "bevy_transform", - "bevy_utils", - "bevy_window", + "bevy_transform 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_window 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "glyph_brush_layout", "serde", "thiserror", ] +[[package]] +name = "bevy_time" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74ec681d641371df81d7bfbcb0eea725ed873f38a094f34b5f7b436f0889e77c" +dependencies = [ + "bevy_app 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_ecs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_reflect 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-channel", +] + +[[package]] +name = "bevy_time" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" +dependencies = [ + "bevy_app 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_ecs 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_reflect 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_utils 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "crossbeam-channel", +] + [[package]] name = "bevy_transform" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2f7a77900fb23f24ca312c1f8df3eb47a45161326f41e9b4ef05b039793503" +checksum = "42e1528e35f30bede46a50ee4134f150efc01f5c1002c340b3b2e6a0bfcb8aa5" +dependencies = [ + "bevy_app 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_ecs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_hierarchy 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_math 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_reflect 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "bevy_transform" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_hierarchy", - "bevy_math", - "bevy_reflect", + "bevy_app 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_ecs 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_hierarchy 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_math 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_reflect 0.8.0 (git+https://github.com/bevyengine/bevy.git)", ] [[package]] name = "bevy_ui" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c65e79658d8a3d4da087a6fb8b229cfe1455cda2c4e8e6305b3b44fb46fb1d30" -dependencies = [ - "bevy_app", - "bevy_asset", - "bevy_core", - "bevy_core_pipeline", - "bevy_derive", - "bevy_ecs", - "bevy_hierarchy", - "bevy_input", - "bevy_log", - "bevy_math", - "bevy_reflect", - "bevy_render", +checksum = "ac181a7b637da61fad72981ff9d2e5b899283ca7d54b2b7ea49c431121331c53" +dependencies = [ + "bevy_app 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_asset 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_core_pipeline 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_derive 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_ecs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_hierarchy 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_input 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_log 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_math 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_reflect 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_render 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "bevy_sprite", "bevy_text", - "bevy_transform", - "bevy_utils", - "bevy_window", + "bevy_transform 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_window 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "bytemuck", "serde", "smallvec", - "stretch", + "taffy", ] [[package]] name = "bevy_utils" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f354c584812996febd48cc885f36b23004b49d6680e73fc95a69a2bb17a48e5" +checksum = "8bda6dada53e546845887ae7357eec57b8d547ef71627b716b33839b4a98b687" dependencies = [ "ahash", - "bevy_derive", "getrandom", - "hashbrown 0.11.2", + "hashbrown 0.12.3", + "instant", + "tracing", + "uuid 1.1.2", +] + +[[package]] +name = "bevy_utils" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" +dependencies = [ + "ahash", + "getrandom", + "hashbrown 0.12.3", "instant", "tracing", - "uuid", + "uuid 1.1.2", ] [[package]] name = "bevy_window" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04fe33d177e10b2984fa90c1d19496fc6f6e7b36d4442699d359e2b4b507873d" +checksum = "a3bdc3a220a9bb2fad9bd30d5f44c6645725398fe1bc588fc87abf09f092696e" dependencies = [ - "bevy_app", - "bevy_ecs", - "bevy_math", - "bevy_utils", + "bevy_app 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_ecs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_input 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_math 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "raw-window-handle", + "web-sys", +] + +[[package]] +name = "bevy_window" +version = "0.8.0" +source = "git+https://github.com/bevyengine/bevy.git#0149c4145f0f398e9fba85c2584d0481a260f57c" +dependencies = [ + "bevy_app 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_ecs 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_input 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_math 0.8.0 (git+https://github.com/bevyengine/bevy.git)", + "bevy_utils 0.8.0 (git+https://github.com/bevyengine/bevy.git)", "raw-window-handle", "web-sys", ] [[package]] name = "bevy_winit" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7c0e3b94cc73907f8a9f82945ca006a39ed2ab401aca0974b47a007a468509f" +checksum = "57537a56ac4f4e1ffcad95227bcab37cd17b51770dacff82374a2d88be376322" dependencies = [ "approx", - "bevy_app", - "bevy_ecs", - "bevy_input", - "bevy_math", - "bevy_utils", - "bevy_window", + "bevy_app 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_ecs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_input 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_math 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_utils 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bevy_window 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-channel", "raw-window-handle", "wasm-bindgen", "web-sys", @@ -879,9 +1332,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b3de4a0c5e67e16066a0715723abd91edc2f9001d09c46e1dca929351e130e" +checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" [[package]] name = "cache-padded" @@ -889,17 +1342,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" -[[package]] -name = "cargo-manifest" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f5d1388481e60167ccfd7d2ffe6bdfd3640c1f69a9033db57892e36acbd8501" -dependencies = [ - "serde", - "serde_derive", - "toml", -] - [[package]] name = "cc" version = "1.0.73" @@ -1030,20 +1472,16 @@ dependencies = [ ] [[package]] -name = "copyless" -version = "0.1.5" +name = "const_panic" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2df960f5d869b2dd8532793fde43eb5427cceb126c929747a26823ab0eeb536" +checksum = "9c0358e41e90e443c69b2b2811f6ec9892c228b93620634cf4344fe89967fa9f" [[package]] -name = "core-foundation" -version = "0.6.4" +name = "copyless" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" -dependencies = [ - "core-foundation-sys 0.6.2", - "libc", -] +checksum = "a2df960f5d869b2dd8532793fde43eb5427cceb126c929747a26823ab0eeb536" [[package]] name = "core-foundation" @@ -1065,12 +1503,6 @@ dependencies = [ "libc", ] -[[package]] -name = "core-foundation-sys" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" - [[package]] name = "core-foundation-sys" version = "0.7.0" @@ -1165,13 +1597,13 @@ dependencies = [ "js-sys", "lazy_static", "libc", - "mach 0.3.2", + "mach", "ndk 0.6.0", "ndk-glue 0.6.2", - "nix", + "nix 0.23.1", "oboe", - "parking_lot", - "stdweb 0.1.3", + "parking_lot 0.11.2", + "stdweb", "thiserror", "wasm-bindgen", "web-sys", @@ -1207,6 +1639,16 @@ dependencies = [ "once_cell", ] +[[package]] +name = "ctor" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb" +dependencies = [ + "quote", + "syn", +] + [[package]] name = "cty" version = "0.2.2" @@ -1215,9 +1657,9 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" [[package]] name = "d3d12" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2daefd788d1e96e0a9d66dee4b828b883509bc3ea9ce30665f04c3246372690c" +checksum = "827914e1f53b1e0e025ecd3d967a7836b7bcb54520f90e21ef8df7b4d88a2759" dependencies = [ "bitflags", "libloading", @@ -1261,12 +1703,11 @@ dependencies = [ [[package]] name = "deflate" -version = "0.8.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" +checksum = "c86f7e25f518f4b81808a2cf1c50996a61f5c2eb394b2393bd87f2a4780a432f" dependencies = [ "adler32", - "byteorder", ] [[package]] @@ -1281,16 +1722,10 @@ dependencies = [ ] [[package]] -name = "difference" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3304d19798a8e067e48d8e69b2c37f0b5e9b4e462504ad9e27e9f3fce02bba8" - -[[package]] -name = "discard" -version = "1.0.4" +name = "diff" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" [[package]] name = "dispatch" @@ -1304,6 +1739,38 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +[[package]] +name = "encase" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a516181e9a36e8982cb37933c5e7dba638c42938cacde46ee4e5b4156f881b9" +dependencies = [ + "const_panic", + "encase_derive", + "glam", + "thiserror", +] + +[[package]] +name = "encase_derive" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5b802412eea315f29f2bb2da3a5963cd6121f56eaa06aebcdc0c54eea578f22" +dependencies = [ + "encase_derive_impl", +] + +[[package]] +name = "encase_derive_impl" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f2f4de457d974f548d2c2a16f709ebd81013579e543bd1a9b19ced88132c2cf" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "env_logger" version = "0.8.4" @@ -1529,55 +1996,48 @@ dependencies = [ [[package]] name = "gilrs" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1550c8bdebc993576e343d600a954654708a9a1182396ee1e805d6fe60c72909" +checksum = "1d6ba7c37bf8ea7ba0c3e3795dfa1a7771b1e47c4bb417c4d27c7b338d79685f" dependencies = [ "fnv", "gilrs-core", "log", - "uuid", + "uuid 1.1.2", "vec_map", ] [[package]] name = "gilrs-core" -version = "0.3.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c7262ce1e88429c9b1d847820c9d2ba00adafc955218393d9c0861d5aaab88" +checksum = "96a8d94a7fc5afd27e894e08a4cfe5a49237f85bcc7140e90721bad3399c7d02" dependencies = [ - "core-foundation 0.6.4", + "core-foundation 0.9.3", "io-kit-sys", "js-sys", "libc", "libudev-sys", "log", - "nix", + "nix 0.24.2", "rusty-xinput", - "stdweb 0.4.20", - "uuid", + "uuid 1.1.2", "vec_map", + "wasm-bindgen", "web-sys", "winapi", ] [[package]] name = "glam" -version = "0.20.5" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43e957e744be03f5801a55472f593d43fabdebf25a4585db250f04d86b1675f" +checksum = "781aa11be58ef14b0cd7326618afcbd9cdb5ba686bdab7193d87cdc322cd7033" dependencies = [ "bytemuck", - "mint", "serde", ] -[[package]] -name = "glam" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "781aa11be58ef14b0cd7326618afcbd9cdb5ba686bdab7193d87cdc322cd7033" - [[package]] name = "glob" version = "0.3.0" @@ -1691,6 +2151,26 @@ dependencies = [ "svg_fmt", ] +[[package]] +name = "hash32" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +dependencies = [ + "byteorder", +] + +[[package]] +name = "hash32-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59d2aba832b60be25c1b169146b27c64115470981b128ed84c8db18c1b03c6ff" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "hashbrown" version = "0.11.2" @@ -1698,7 +2178,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" dependencies = [ "ahash", - "serde", ] [[package]] @@ -1706,6 +2185,10 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", + "serde", +] [[package]] name = "hermit-abi" @@ -1728,7 +2211,7 @@ version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9652f2ed7ee9c6374a061039f60fc6e25d7adac7fa10f83365669af3b24b0bf0" dependencies = [ - "glam 0.21.2", + "glam", "once_cell", ] @@ -1746,14 +2229,13 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "image" -version = "0.23.14" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" +checksum = "7e30ca2ecf7666107ff827a8e481de6a132a9b687ed3bb20bb1c144a36c00964" dependencies = [ "bytemuck", "byteorder", "color_quant", - "num-iter", "num-rational", "num-traits", "png", @@ -1816,12 +2298,12 @@ dependencies = [ [[package]] name = "io-kit-sys" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21dcc74995dd4cd090b147e79789f8d65959cbfb5f0b118002db869ea3bd0a0" +checksum = "7789f7f3c9686f96164f5109d69152de759e76e284f736bd57661c6df5091919" dependencies = [ - "core-foundation-sys 0.6.2", - "mach 0.2.3", + "core-foundation-sys 0.8.3", + "mach", ] [[package]] @@ -1873,7 +2355,7 @@ name = "kayak_core" version = "0.1.0" dependencies = [ "as-any", - "bevy", + "bevy 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "desync", "flo_rope", "futures", @@ -1882,7 +2364,7 @@ dependencies = [ "kayak_render_macros", "morphorm", "resources", - "uuid", + "uuid 0.8.2", ] [[package]] @@ -1890,7 +2372,7 @@ name = "kayak_font" version = "0.1.0" dependencies = [ "anyhow", - "bevy", + "bevy 0.8.0 (git+https://github.com/bevyengine/bevy.git)", "bytemuck", "serde", "serde_json", @@ -1916,7 +2398,7 @@ dependencies = [ name = "kayak_ui" version = "0.1.0" dependencies = [ - "bevy", + "bevy 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "bevy_kayak_ui", "kayak_core", "kayak_font", @@ -1932,6 +2414,7 @@ checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" dependencies = [ "libc", "libloading", + "pkg-config", ] [[package]] @@ -1993,12 +2476,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "libm" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" - [[package]] name = "libudev-sys" version = "0.1.4" @@ -2028,15 +2505,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "mach" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1" -dependencies = [ - "libc", -] - [[package]] name = "mach" version = "0.3.2" @@ -2081,9 +2549,9 @@ dependencies = [ [[package]] name = "metal" -version = "0.23.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0514f491f4cc03632ab399ee01e2c1c1b12d3e1cf2d667c1ff5f87d6dcd2084" +checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" dependencies = [ "bitflags", "block", @@ -2101,30 +2569,11 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" -dependencies = [ - "adler32", -] - -[[package]] -name = "mint" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff" - -[[package]] -name = "mio" -version = "0.7.14" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" dependencies = [ - "libc", - "log", - "miow", - "ntapi", - "winapi", + "adler", ] [[package]] @@ -2139,15 +2588,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", -] - [[package]] name = "morphorm" version = "0.2.0" @@ -2159,9 +2599,9 @@ dependencies = [ [[package]] name = "naga" -version = "0.8.5" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3012f2dbcc79e8e0b5825a4836a7106a75dd9b2fe42c528163be0f572538c705" +checksum = "5f50357e1167a3ab92d6b3c7f4bf5f7fd13fde3f4b28bf0d5ea07b5100fdb6c0" dependencies = [ "bit-set", "bitflags", @@ -2174,7 +2614,9 @@ dependencies = [ "pp-rs", "rustc-hash", "spirv", + "termcolor", "thiserror", + "unicode-xid", ] [[package]] @@ -2281,6 +2723,17 @@ dependencies = [ "memoffset", ] +[[package]] +name = "nix" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" +dependencies = [ + "bitflags", + "cfg-if 1.0.0", + "libc", +] + [[package]] name = "nom" version = "7.1.1" @@ -2293,9 +2746,9 @@ dependencies = [ [[package]] name = "notify" -version = "5.0.0-pre.11" +version = "5.0.0-pre.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c614e7ed2b1cf82ec99aeffd8cf6225ef5021b9951148eb161393c394855032c" +checksum = "553f9844ad0b0824605c20fb55a661679782680410abfb1a8144c2e7e437e7a7" dependencies = [ "bitflags", "crossbeam-channel", @@ -2304,20 +2757,11 @@ dependencies = [ "inotify", "kqueue", "libc", - "mio 0.7.14", + "mio", "walkdir", "winapi", ] -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi", -] - [[package]] name = "num-derive" version = "0.3.3" @@ -2339,22 +2783,11 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-rational" -version = "0.3.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", "num-integer", @@ -2458,6 +2891,15 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" +[[package]] +name = "output_vt100" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" +dependencies = [ + "winapi", +] + [[package]] name = "owned_ttf_parser" version = "0.15.1" @@ -2481,7 +2923,17 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core", + "parking_lot_core 0.8.5", +] + +[[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.3", ] [[package]] @@ -2498,6 +2950,19 @@ dependencies = [ "winapi", ] +[[package]] +name = "parking_lot_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "smallvec", + "windows-sys", +] + [[package]] name = "peeking_take_while" version = "0.1.2" @@ -2540,9 +3005,9 @@ checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" [[package]] name = "png" -version = "0.16.8" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" +checksum = "dc38c0ad57efb786dd57b9864e5b18bae478c00c824dc55a38bbc9da95dde3ba" dependencies = [ "bitflags", "crc32fast", @@ -2567,12 +3032,14 @@ checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] name = "pretty_assertions" -version = "0.3.4" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5dc44a7f8ba9e19aeb6f900eb518343170f2aae27d3c9c78e4d5c3db623638d" +checksum = "c89f989ac94207d048d92db058e4f6ec7342b0971fc58d1271ca148b799b3563" dependencies = [ - "ansi_term 0.9.0", - "difference", + "ansi_term", + "ctor", + "diff", + "output_vt100", ] [[package]] @@ -2633,6 +3100,12 @@ 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" @@ -2733,7 +3206,7 @@ checksum = "42070ea13709eb92d2977b48c7d3bd44866fa328e14248f8d1f00d6ea14d5066" dependencies = [ "downcast-rs", "fxhash", - "parking_lot", + "parking_lot 0.11.2", ] [[package]] @@ -2763,15 +3236,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver", -] - [[package]] name = "rusty-xinput" version = "1.2.0" @@ -2810,21 +3274,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - [[package]] name = "serde" version = "1.0.140" @@ -2865,21 +3314,6 @@ dependencies = [ "serde", ] -[[package]] -name = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - [[package]] name = "sharded-slab" version = "0.1.4" @@ -2938,67 +3372,6 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e" -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version", - "serde", - "serde_json", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_derive", - "syn", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde", - "serde_derive", - "serde_json", - "sha1", - "syn", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - -[[package]] -name = "stretch" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0dc6d20ce137f302edf90f9cd3d278866fd7fb139efca6f246161222ad6d87" -dependencies = [ - "lazy_static", - "libm", -] - [[package]] name = "strsim" version = "0.10.0" @@ -3022,6 +3395,19 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "taffy" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec27dea659b100d489dffa57cf0efc6d7bfefb119af817b92cc14006c0b214e3" +dependencies = [ + "arrayvec", + "hash32", + "hash32-derive", + "num-traits", + "typenum", +] + [[package]] name = "termcolor" version = "1.1.3" @@ -3081,15 +3467,14 @@ version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" dependencies = [ - "indexmap", "serde", ] [[package]] name = "tracing" -version = "0.1.35" +version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160" +checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" dependencies = [ "cfg-if 1.0.0", "pin-project-lite", @@ -3110,9 +3495,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.28" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7" +checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" dependencies = [ "once_cell", "valuable", @@ -3135,7 +3520,7 @@ version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60db860322da191b40952ad9affe65ea23e7dd6a5c442c2c42865810c6ab8e6b" dependencies = [ - "ansi_term 0.12.1", + "ansi_term", "matchers", "once_cell", "regex", @@ -3164,6 +3549,12 @@ version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd" +[[package]] +name = "typenum" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" + [[package]] name = "unicode-ident" version = "1.0.2" @@ -3193,6 +3584,15 @@ name = "uuid" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +dependencies = [ + "getrandom", +] + +[[package]] +name = "uuid" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f" dependencies = [ "getrandom", "serde", @@ -3307,9 +3707,9 @@ checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" [[package]] name = "web-sys" -version = "0.3.57" +version = "0.3.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283" +checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1" dependencies = [ "js-sys", "wasm-bindgen", @@ -3317,15 +3717,15 @@ dependencies = [ [[package]] name = "wgpu" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97cd781ff044d6d697b632a2e212032c2e957d1afaa21dbf58069cbb8f78567" +checksum = "277e967bf8b7820a76852645a6bce8bbd31c32fda2042e82d8e3ea75fda8892d" dependencies = [ "arrayvec", "js-sys", "log", "naga", - "parking_lot", + "parking_lot 0.12.1", "raw-window-handle", "smallvec", "wasm-bindgen", @@ -3338,11 +3738,12 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.12.2" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4688c000eb841ca55f7b35db659b78d6e1cd77d7caf8fb929f4e181f754047d" +checksum = "89b92788dec9d0c1bed849a1b83f01b2ee12819bf04a79c90f68e4173f7b5ba2" dependencies = [ "arrayvec", + "bit-vec", "bitflags", "cfg_aliases", "codespan-reporting", @@ -3350,21 +3751,23 @@ dependencies = [ "fxhash", "log", "naga", - "parking_lot", + "parking_lot 0.12.1", "profiling", "raw-window-handle", "smallvec", "thiserror", + "web-sys", "wgpu-hal", "wgpu-types", ] [[package]] name = "wgpu-hal" -version = "0.12.5" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d684ea6a34974a2fc19f1dfd183d11a62e22d75c4f187a574bb1224df8e056c2" +checksum = "20cbdfc3d0637dba3d5536b93adef3d26023a0b96f0e1ee5ee9560a401d9f646" dependencies = [ + "android_system_properties", "arrayvec", "ash", "bit-set", @@ -3385,7 +3788,7 @@ dependencies = [ "metal", "naga", "objc", - "parking_lot", + "parking_lot 0.12.1", "profiling", "range-alloc", "raw-window-handle", @@ -3399,9 +3802,9 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.12.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549533d9e1cdd4b4cda7718d33ff500fc4c34b5467b71d76b547ae0324f3b2a2" +checksum = "1f762cbc08e1a51389859cf9c199c7aef544789cf3510889aab12c607f701604" dependencies = [ "bitflags", ] @@ -3496,12 +3899,12 @@ dependencies = [ "lazy_static", "libc", "log", - "mio 0.8.4", + "mio", "ndk 0.5.0", "ndk-glue 0.5.2", "ndk-sys 0.2.2", "objc", - "parking_lot", + "parking_lot 0.11.2", "percent-encoding", "raw-window-handle", "wasm-bindgen", diff --git a/Cargo.toml b/Cargo.toml index 52e4577..6acc380 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,14 +17,14 @@ bevy_renderer = [ ] [dependencies] -bevy = { version = "0.7.0", optional = true, default_features = false } +bevy = { version = "0.8.0", optional = true, default-features = false } bevy_kayak_ui = { path = "bevy_kayak_ui", optional = true } kayak_core = { path = "kayak_core" } kayak_font = { path = "kayak_font" } kayak_render_macros = { path = "kayak_render_macros" } [dev-dependencies] -bevy = "0.7.0" +bevy = "0.8.0" rand = "0.8.4" [[example]] diff --git a/bevy_kayak_renderer/Cargo.toml b/bevy_kayak_renderer/Cargo.toml index e5e8e19..9dccd36 100644 --- a/bevy_kayak_renderer/Cargo.toml +++ b/bevy_kayak_renderer/Cargo.toml @@ -11,7 +11,7 @@ serde_json = "1.0" serde_path_to_error = "0.1" [dependencies.bevy] -version = "0.7.0" +version = "0.8.0" default-features = false features = [ "bevy_render", diff --git a/bevy_kayak_ui/Cargo.toml b/bevy_kayak_ui/Cargo.toml index 045ffa5..354a078 100644 --- a/bevy_kayak_ui/Cargo.toml +++ b/bevy_kayak_ui/Cargo.toml @@ -13,6 +13,6 @@ serde_json = "1.0" serde_path_to_error = "0.1" [dependencies.bevy] -version = "0.7.0" +version = "0.8.0" features = ["bevy_winit"] default-features = false diff --git a/kayak_core/Cargo.toml b/kayak_core/Cargo.toml index 54b6901..3e16206 100644 --- a/kayak_core/Cargo.toml +++ b/kayak_core/Cargo.toml @@ -11,7 +11,6 @@ bevy_renderer = ["bevy", "kayak_font/bevy_renderer"] [dependencies] as-any = "0.2" -bevy = { version = "0.7.0", optional = true, default-features = false } desync = { version = "0.7" } flo_rope = { version = "0.1" } futures = { version = "0.3" } @@ -21,3 +20,8 @@ morphorm = { git = "https://github.com/geom3trik/morphorm", rev = "1243152d4cebe resources = "1.1" uuid = { version = "0.8", features = ["v4"] } indexmap = "1.8" + +[dependencies.bevy] +version = "0.8.0" +optional = true +default-features = false \ No newline at end of file diff --git a/kayak_font/Cargo.toml b/kayak_font/Cargo.toml index 00479ec..2c0c2d5 100644 --- a/kayak_font/Cargo.toml +++ b/kayak_font/Cargo.toml @@ -3,25 +3,28 @@ name = "kayak_font" version = "0.1.0" edition = "2021" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [features] default = ["bevy_renderer"] bevy_renderer = ["bevy"] [dependencies] anyhow = { version = "1.0" } -bytemuck = "1.7.2" -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" -serde_path_to_error = "0.1" +nanoserde = "0.1.30" unicode-segmentation = "1.9" # Provides UAX #14 line break segmentation xi-unicode = "0.3" [dependencies.bevy] -version = "0.7.0" +version = "0.8.0" optional = true default-features = false -features = ["bevy_render"] +features = [ + "bevy_asset", + "bevy_render", + "bevy_core_pipeline" +] + +[dev-dependencies] +bevy = "0.8" +bytemuck = "1.12.0" \ No newline at end of file diff --git a/kayak_font/examples/bevy.rs b/kayak_font/examples/bevy.rs index 2266e62..d509261 100644 --- a/kayak_font/examples/bevy.rs +++ b/kayak_font/examples/bevy.rs @@ -1,10 +1,10 @@ use bevy::{ - math::{const_vec2, Vec2}, + math::Vec2, prelude::{ - App as BevyApp, AssetServer, Commands, Component, Handle, Input, KeyCode, Query, Res, - ResMut, Sprite, SpriteBundle, Transform, With, Without, + App as BevyApp, AssetServer, Camera2dBundle, Commands, Component, Handle, Input, KeyCode, + Query, Res, ResMut, Sprite, SpriteBundle, Transform, With, Without, }, - render::{camera::OrthographicCameraBundle, color::Color}, + render::color::Color, window::WindowDescriptor, DefaultPlugins, }; @@ -15,8 +15,8 @@ use renderer::{FontRenderPlugin, Text}; mod renderer; const FONT_SIZE: f32 = 24.0; -const INITIAL_SIZE: Vec2 = const_vec2!([400.0, 300.0]); -const INITIAL_POS: Vec2 = const_vec2!([-200.0, 0.0]); +const INITIAL_SIZE: Vec2 = Vec2::from_array([400.0, 300.0]); +const INITIAL_POS: Vec2 = Vec2::from_array([-200.0, 0.0]); const INSTRUCTIONS: &str = "Press 'A' and 'D' to shrink and grow the text box.\nPress 'Space' to cycle text alignment."; @@ -24,7 +24,7 @@ const INSTRUCTIONS: &str = struct Instructions; fn startup(mut commands: Commands, asset_server: Res<AssetServer>) { - commands.spawn_bundle(OrthographicCameraBundle::new_2d()); + commands.spawn_bundle(Camera2dBundle::default()); let font_handle: Handle<KayakFont> = asset_server.load("roboto.kayak_font"); diff --git a/kayak_font/examples/renderer/extract.rs b/kayak_font/examples/renderer/extract.rs index 9991336..0c90bdb 100644 --- a/kayak_font/examples/renderer/extract.rs +++ b/kayak_font/examples/renderer/extract.rs @@ -1,7 +1,7 @@ use bevy::{ math::Vec2, prelude::{Assets, Commands, Handle, Query, Res}, - sprite::Rect, + sprite::Rect, render::Extract, }; use kayak_font::{KayakFont, TextProperties}; @@ -12,8 +12,8 @@ use super::{ pub fn extract( mut commands: Commands, - fonts: Res<Assets<KayakFont>>, - texts: Query<(&Text, &Handle<KayakFont>)>, + fonts: Extract<Res<Assets<KayakFont>>>, + texts: Extract<Query<(&Text, &Handle<KayakFont>)>>, ) { let mut extracted_texts = Vec::new(); diff --git a/kayak_font/examples/renderer/mod.rs b/kayak_font/examples/renderer/mod.rs index dec8300..10ccaff 100644 --- a/kayak_font/examples/renderer/mod.rs +++ b/kayak_font/examples/renderer/mod.rs @@ -1,5 +1,5 @@ use bevy::{ - core_pipeline::Transparent2d, + core_pipeline::core_2d::Transparent2d, prelude::{Assets, HandleUntyped, Plugin, Res, ResMut}, reflect::TypeUuid, render::{ diff --git a/kayak_font/examples/renderer/pipeline.rs b/kayak_font/examples/renderer/pipeline.rs index c372221..32f5efd 100644 --- a/kayak_font/examples/renderer/pipeline.rs +++ b/kayak_font/examples/renderer/pipeline.rs @@ -1,12 +1,10 @@ -use bevy::render::render_resource::std140::AsStd140; use bevy::{ - core::FloatOrd, - core_pipeline::Transparent2d, + core_pipeline::core_2d::Transparent2d, ecs::system::{ lifetimeless::{Read, SQuery, SRes}, SystemState, }, - math::{const_vec3, Mat4, Quat, Vec2, Vec3, Vec4}, + math::{Mat4, Quat, Vec2, Vec3, Vec4}, prelude::{Bundle, Component, Entity, FromWorld, Handle, Query, Res, ResMut, World}, render::{ color::Color, @@ -18,7 +16,7 @@ use bevy::{ BufferVec, CachedRenderPipelineId, ColorTargetState, ColorWrites, FragmentState, FrontFace, MultisampleState, PipelineCache, PolygonMode, PrimitiveState, PrimitiveTopology, RenderPipelineDescriptor, SamplerBindingType, Shader, ShaderStages, - TextureFormat, TextureSampleType, TextureViewDimension, VertexAttribute, + ShaderType, TextureFormat, TextureSampleType, TextureViewDimension, VertexAttribute, VertexBufferLayout, VertexFormat, VertexState, VertexStepMode, }, renderer::{RenderDevice, RenderQueue}, @@ -26,6 +24,7 @@ use bevy::{ view::{ViewUniformOffset, ViewUniforms}, }, sprite::Rect, + utils::FloatOrd, }; use bytemuck::{Pod, Zeroable}; use kayak_font::{ @@ -43,12 +42,12 @@ pub struct FontPipeline { } const QUAD_VERTEX_POSITIONS: &[Vec3] = &[ - const_vec3!([0.0, 0.0, 0.0]), - const_vec3!([1.0, 1.0, 0.0]), - const_vec3!([0.0, 1.0, 0.0]), - const_vec3!([0.0, 0.0, 0.0]), - const_vec3!([1.0, 0.0, 0.0]), - const_vec3!([1.0, 1.0, 0.0]), + Vec3::from_array([0.0, 0.0, 0.0]), + Vec3::from_array([1.0, 1.0, 0.0]), + Vec3::from_array([0.0, 1.0, 0.0]), + Vec3::from_array([0.0, 0.0, 0.0]), + Vec3::from_array([1.0, 0.0, 0.0]), + Vec3::from_array([1.0, 1.0, 0.0]), ]; impl FontRenderingPipeline for FontPipeline { @@ -70,8 +69,6 @@ impl FromWorld for FontPipeline { ty: BindingType::Buffer { ty: BufferBindingType::Uniform, has_dynamic_offset: true, - // TODO: change this to ViewUniform::std140_size_static once crevice fixes this! - // Context: https://github.com/LPGhatguy/crevice/issues/29 min_binding_size: BufferSize::new(144), }, count: None, @@ -143,7 +140,7 @@ impl FromWorld for FontPipeline { shader: FONT_SHADER_HANDLE.typed::<Shader>(), shader_defs: vec![], entry_point: "fragment".into(), - targets: vec![ColorTargetState { + targets: vec![Some(ColorTargetState { format: TextureFormat::bevy_default(), blend: Some(BlendState { color: BlendComponent { @@ -158,7 +155,7 @@ impl FromWorld for FontPipeline { }, }), write_mask: ColorWrites::ALL, - }], + })], }), layout: Some(vec![view_layout.clone(), font_image_layout.clone()]), primitive: PrimitiveState { @@ -213,7 +210,7 @@ struct QuadVertex { } #[repr(C)] -#[derive(Copy, Clone, AsStd140)] +#[derive(Copy, Clone, ShaderType)] struct QuadType { pub t: i32, } diff --git a/kayak_font/examples/renderer/shader.wgsl b/kayak_font/examples/renderer/shader.wgsl index 5213429..7d251ec 100644 --- a/kayak_font/examples/renderer/shader.wgsl +++ b/kayak_font/examples/renderer/shader.wgsl @@ -1,26 +1,27 @@ struct View { - view_proj: mat4x4<f32>; - world_position: vec3<f32>; -}; -[[group(0), binding(0)]] + view_proj: mat4x4<f32>, + world_position: vec3<f32>, +} + +@group(0) @binding(0) var<uniform> view: View; struct VertexOutput { - [[builtin(position)]] position: vec4<f32>; - [[location(0)]] color: vec4<f32>; - [[location(1)]] uv: vec3<f32>; - [[location(2)]] pos: vec2<f32>; - [[location(3)]] size: vec2<f32>; - [[location(4)]] screen_position: vec2<f32>; - [[location(5)]] border_radius: f32; + @builtin(position) position: vec4<f32>, + @location(0) color: vec4<f32>, + @location(1) uv: vec3<f32>, + @location(2) pos: vec2<f32>, + @location(3) size: vec2<f32>, + @location(4) screen_position: vec2<f32>, + @location(5) border_radius: f32, }; -[[stage(vertex)]] +@vertex fn vertex( - [[location(0)]] vertex_position: vec3<f32>, - [[location(1)]] vertex_color: vec4<f32>, - [[location(2)]] vertex_uv: vec4<f32>, - [[location(3)]] vertex_pos_size: vec4<f32>, + @location(0) vertex_position: vec3<f32>, + @location(1) vertex_color: vec4<f32>, + @location(2) vertex_uv: vec4<f32>, + @location(3) vertex_pos_size: vec4<f32>, ) -> VertexOutput { var out: VertexOutput; out.color = vertex_color; @@ -33,13 +34,13 @@ fn vertex( return out; } -[[group(1), binding(0)]] +@group(1) @binding(0) var font_texture: texture_2d_array<f32>; -[[group(1), binding(1)]] +@group(1) @binding(1) var font_sampler: sampler; -[[stage(fragment)]] -fn fragment(in: VertexOutput) -> [[location(0)]] vec4<f32> { +@fragment +fn fragment(in: VertexOutput) -> @location(0) vec4<f32> { var px_range = 2.5; var tex_dimensions = textureDimensions(font_texture); var msdf_unit = vec2<f32>(px_range, px_range) / vec2<f32>(f32(tex_dimensions.x), f32(tex_dimensions.y)); diff --git a/kayak_font/src/atlas.rs b/kayak_font/src/atlas.rs index 97e6f54..e710863 100644 --- a/kayak_font/src/atlas.rs +++ b/kayak_font/src/atlas.rs @@ -1,33 +1,33 @@ -use serde::Deserialize; +use nanoserde::DeJson; -#[derive(Deserialize, Debug, Copy, Clone, PartialEq)] +#[derive(DeJson, Debug, Copy, Clone, PartialEq)] pub enum SDFType { - #[serde(alias = "msdf")] + #[nserde(rename = "msdf")] Msdf, } -#[derive(Deserialize, Debug, Copy, Clone, PartialEq)] +#[derive(DeJson, Debug, Copy, Clone, PartialEq)] pub enum Origin { - #[serde(alias = "bottom")] + #[nserde(rename = "bottom")] Bottom, - #[serde(alias = "left")] + #[nserde(rename = "left")] Left, - #[serde(alias = "right")] + #[nserde(rename = "right")] Right, - #[serde(alias = "top")] + #[nserde(rename = "top")] Top, } -#[derive(Deserialize, Debug, Copy, Clone, PartialEq)] +#[derive(DeJson, Debug, Copy, Clone, PartialEq)] pub struct Atlas { - #[serde(alias = "type")] + #[nserde(rename = "type")] pub sdf_type: SDFType, - #[serde(alias = "distanceRange")] + #[nserde(rename = "distanceRange")] pub distance_range: f32, - #[serde(alias = "size")] + #[nserde(rename = "size")] pub font_size: f32, pub width: u32, pub height: u32, - #[serde(alias = "yOrigin")] + #[nserde(rename = "yOrigin")] pub y_origin: Origin, } diff --git a/kayak_font/src/bevy/font_texture.rs b/kayak_font/src/bevy/font_texture.rs index c0868a9..26110bf 100644 --- a/kayak_font/src/bevy/font_texture.rs +++ b/kayak_font/src/bevy/font_texture.rs @@ -1,6 +1,7 @@ use crate::KayakFont; use bevy::prelude::{AssetEvent, Assets, EventReader, Handle, Image, Local, Res, ResMut}; -use bevy::render::render_resource::{FilterMode, TextureFormat, TextureUsages}; +use bevy::render::render_resource::{FilterMode, SamplerDescriptor, TextureFormat, TextureUsages}; +use bevy::render::texture::ImageSampler; pub fn init_font_texture( mut not_processed: Local<Vec<Handle<KayakFont>>>, @@ -23,9 +24,13 @@ pub fn init_font_texture( if let Some(font) = fonts.get(&font_handle) { if let Some(mut texture) = images.get_mut(&font.atlas_image) { texture.texture_descriptor.format = TextureFormat::Rgba8Unorm; - texture.sampler_descriptor.min_filter = FilterMode::Linear; - texture.sampler_descriptor.mipmap_filter = FilterMode::Linear; - texture.sampler_descriptor.mag_filter = FilterMode::Linear; + texture.sampler_descriptor = ImageSampler::Descriptor(SamplerDescriptor { + label: Some("Present Sampler"), + mag_filter: FilterMode::Linear, + min_filter: FilterMode::Linear, + + ..Default::default() + }); texture.texture_descriptor.usage = TextureUsages::TEXTURE_BINDING | TextureUsages::COPY_DST | TextureUsages::COPY_SRC; diff --git a/kayak_font/src/bevy/renderer/extract.rs b/kayak_font/src/bevy/renderer/extract.rs index 16a9dbe..490ba4c 100644 --- a/kayak_font/src/bevy/renderer/extract.rs +++ b/kayak_font/src/bevy/renderer/extract.rs @@ -1,7 +1,10 @@ use crate::bevy::renderer::FontTextureCache; use crate::KayakFont; use bevy::prelude::{AssetEvent, Assets, Commands, EventReader, Handle, Image, Local, Res, ResMut}; -use bevy::render::render_resource::{TextureFormat, TextureUsages}; +use bevy::render::{ + render_resource::{TextureFormat, TextureUsages}, + Extract, +}; use bevy::utils::HashSet; #[derive(Default)] @@ -12,9 +15,9 @@ pub struct ExtractedFonts { pub(crate) fn extract_fonts( mut not_processed: Local<Vec<Handle<KayakFont>>>, mut commands: Commands, - font_assets: Res<Assets<KayakFont>>, - mut events: EventReader<AssetEvent<KayakFont>>, - textures: Res<Assets<Image>>, + font_assets: Extract<Res<Assets<KayakFont>>>, + mut events: Extract<EventReader<AssetEvent<KayakFont>>>, + textures: Extract<Res<Assets<Image>>>, ) { let mut extracted_fonts = ExtractedFonts { fonts: Vec::new() }; let mut changed_assets = HashSet::default(); diff --git a/kayak_font/src/bevy/renderer/font_texture_cache.rs b/kayak_font/src/bevy/renderer/font_texture_cache.rs index 5b18fbc..3d105f5 100644 --- a/kayak_font/src/bevy/renderer/font_texture_cache.rs +++ b/kayak_font/src/bevy/renderer/font_texture_cache.rs @@ -1,6 +1,6 @@ use crate::{KayakFont, Sdf}; use bevy::{ - math::{Size, Vec2}, + math::Vec2, prelude::{Handle, Res}, render::{ render_asset::RenderAssets, @@ -150,9 +150,9 @@ impl FontTextureCache { texture, sampler, texture_view, - size: Size { - width: size.0 as f32, - height: size.1 as f32, + size: Vec2 { + x: size.0 as f32, + y: size.1 as f32, }, texture_format: format, }; @@ -195,9 +195,9 @@ impl FontTextureCache { texture, sampler, texture_view, - size: Size { - width: 1.0, - height: 1.0, + size: Vec2 { + x: 1.0, + y: 1.0, }, texture_format: TextureFormat::Rgba8Unorm, }; diff --git a/kayak_font/src/glyph.rs b/kayak_font/src/glyph.rs index 54301e0..0975e26 100644 --- a/kayak_font/src/glyph.rs +++ b/kayak_font/src/glyph.rs @@ -1,28 +1,50 @@ -use serde::{Deserialize, Deserializer}; - -fn from_u32<'de, D>(deserializer: D) -> Result<char, D::Error> -where - D: Deserializer<'de>, -{ - let number: u32 = Deserialize::deserialize(deserializer)?; - match char::from_u32(number) { - Some(c) => Ok(c), - None => Err(serde::de::Error::custom("Can't deserialize char from u32!")), +use nanoserde::{DeJson, DeJsonErr, DeJsonState, SerJson, SerJsonState}; + +pub struct UnicodeChar(char); + +impl DeJson for UnicodeChar { + fn de_json(state: &mut DeJsonState, input: &mut std::str::Chars) -> Result<Self, DeJsonErr> { + u32::de_json(state, input).and_then(|a| { + if let Some(a) = char::from_u32(a) { + Ok(Self(a)) + } else { + Err(state.err_parse("Not unicode")) + } + }) + } +} + +impl SerJson for UnicodeChar { + fn ser_json(&self, d: usize, s: &mut SerJsonState) { + let out = self.0 as u32; + out.ser_json(d, s) + } +} + +impl From<&char> for UnicodeChar { + fn from(c: &char) -> Self { + Self(*c) + } +} + +impl From<&UnicodeChar> for char { + fn from(uc: &UnicodeChar) -> Self { + uc.0 } } -#[derive(Deserialize, Debug, Clone, Copy, PartialEq)] +#[derive(DeJson, Debug, Clone, Copy, PartialEq)] pub struct Glyph { - #[serde(deserialize_with = "from_u32")] + #[nserde(proxy = "UnicodeChar")] pub unicode: char, pub advance: f32, - #[serde(alias = "atlasBounds")] + #[nserde(rename = "atlasBounds")] pub atlas_bounds: Option<Rect>, - #[serde(alias = "planeBounds")] + #[nserde(rename = "planeBounds")] pub plane_bounds: Option<Rect>, } -#[derive(Deserialize, Default, Clone, Copy, Debug, PartialEq)] +#[derive(DeJson, Default, Clone, Copy, Debug, PartialEq)] pub struct Rect { pub left: f32, pub bottom: f32, diff --git a/kayak_font/src/metrics.rs b/kayak_font/src/metrics.rs index 0e042bb..83d307f 100644 --- a/kayak_font/src/metrics.rs +++ b/kayak_font/src/metrics.rs @@ -1,15 +1,15 @@ -use serde::Deserialize; +use nanoserde::DeJson; -#[derive(Deserialize, Debug, Copy, Clone, PartialEq)] +#[derive(DeJson, Debug, Copy, Clone, PartialEq)] pub struct Metrics { - #[serde(alias = "emSize")] + #[nserde(rename = "emSize")] em_size: f32, - #[serde(alias = "lineHeight")] + #[nserde(rename = "lineHeight")] line_height: f32, ascender: f32, descender: f32, - #[serde(alias = "underlineY")] + #[nserde(rename = "underlineY")] underline_y: f32, - #[serde(alias = "underlineThickness")] + #[nserde(rename = "underlineThickness")] underline_thickness: f32, } diff --git a/kayak_font/src/sdf.rs b/kayak_font/src/sdf.rs index 13fe4d9..ec6ed8e 100644 --- a/kayak_font/src/sdf.rs +++ b/kayak_font/src/sdf.rs @@ -1,7 +1,7 @@ use crate::{atlas::Atlas, glyph::Glyph, metrics::Metrics}; -use serde::Deserialize; +use nanoserde::DeJson; -#[derive(Deserialize, Debug, Clone, PartialEq)] +#[derive(DeJson, Debug, Clone, PartialEq)] pub struct Sdf { pub atlas: Atlas, metrics: Metrics, @@ -9,7 +9,7 @@ pub struct Sdf { kerning: Vec<KerningData>, } -#[derive(Deserialize, Debug, Clone, Copy, PartialEq)] +#[derive(DeJson, Debug, Clone, Copy, PartialEq)] pub struct KerningData { pub unicode1: u32, pub unicode2: u32, @@ -18,14 +18,10 @@ pub struct KerningData { impl Sdf { pub fn from_string(data: String) -> Sdf { - let value: Sdf = match serde_path_to_error::deserialize( - &mut serde_json::Deserializer::from_str(&data), - ) { + let value: Sdf = match DeJson::deserialize_json(data.as_str()) { Ok(v) => v, Err(err) => { - let path = err.path().to_string(); - dbg!(err); - panic!("failed to deserialize json! path: {}", path); + panic!("{}", dbg!(err)); } }; @@ -33,14 +29,10 @@ impl Sdf { } pub fn from_bytes(data: &[u8]) -> Sdf { - let value: Sdf = match serde_path_to_error::deserialize( - &mut serde_json::Deserializer::from_slice(&data), - ) { + let value: Sdf = match DeJson::deserialize_json(std::str::from_utf8(data).unwrap()) { Ok(v) => v, Err(err) => { - let path = err.path().to_string(); - dbg!(err); - panic!("failed to deserialize json! path: {}", path); + panic!("{}", dbg!(err)); } }; @@ -49,6 +41,7 @@ impl Sdf { pub fn max_glyph_size(&self) -> (f32, f32) { let mut size = (0.0, 0.0); + self.glyphs.iter().for_each(|glyph| { if let Some(atlas_bounds) = glyph.atlas_bounds { let atlas_size = atlas_bounds.size(); diff --git a/kayak_render_macros/Cargo.toml b/kayak_render_macros/Cargo.toml index 3866bb4..559d82c 100644 --- a/kayak_render_macros/Cargo.toml +++ b/kayak_render_macros/Cargo.toml @@ -10,7 +10,7 @@ proc-macro = true default = [] [dependencies] -syn = { version = "1.0", features = ["full"] } +syn = { version = "1.0", features = ["full", "extra-traits"] } quote = "1.0" proc-macro2 = "1.0" proc-macro-error = "1.0" @@ -18,4 +18,4 @@ proc-macro-crate = "1.1" [dev-dependencies] kayak_core = { path = "../kayak_core", version = "0.1.0" } -pretty_assertions = "0.3.4" +pretty_assertions = "1.2.1" -- GitLab