Merge pull request #55 from StarArawn/update-bevy

Updated to the 0.6 release of bevy. Fixed some bugs.

Merge pull request #55 from StarArawn/update-bevy
Updated to the 0.6 release of bevy. Fixed some bugs.
dfdee362 · John · GitHub · 625bae6c · 91968e26 · dfdee362
Unverified Commit dfdee362 authored 3 years ago by John Committed by GitHub 3 years ago
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,12 +2,6 @@
 # It is not intended for manual editing.
 version = 3

-[[package]]
-name = "Inflector"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
-
 [[package]]
 name = "ab_glyph"
 version = "0.2.13"
@@ -192,16 +186,18 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"

 [[package]]
 name = "bevy"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b77ad2987710ed960746c43813ad8c103db5c4c090f5cbc9c32c0a90a91bc599"
 dependencies = [
 "bevy_internal",
 ]

 [[package]]
 name = "bevy-crevice-derive"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4cf594c9277eb1e426f45a00eaf70aa9ffdf479268d7e4538270263811e20bc"
 dependencies = [
 "bevy_macro_utils",
 "proc-macro2",
@@ -211,8 +207,9 @@ dependencies = [

 [[package]]
 name = "bevy_app"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58fe3d3f4140fb11cd294f43be7cb66a5783d9277ba0270743e2860e32b25ab5"
 dependencies = [
 "bevy_derive",
 "bevy_ecs",
@@ -224,8 +221,9 @@ dependencies = [

 [[package]]
 name = "bevy_asset"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb68a0259e2f857a32c4f05eb9b9447db1072297c61864ad07d02fea1838bde9"
 dependencies = [
 "anyhow",
 "bevy_app",
@@ -251,8 +249,9 @@ dependencies = [

 [[package]]
 name = "bevy_audio"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0291276cf0dd1dbbf3393112d0e0276e4110f633965542123b830d8dae44fff3"
 dependencies = [
 "anyhow",
 "bevy_app",
@@ -266,8 +265,9 @@ dependencies = [

 [[package]]
 name = "bevy_core"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c156430a5312c04a1b25fa434eeeab6349a41c6bb96ea0385406d53b3c43658"
 dependencies = [
 "bevy_app",
 "bevy_derive",
@@ -281,8 +281,9 @@ dependencies = [

 [[package]]
 name = "bevy_core_pipeline"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b422dca94195c904964ab21bc4557fbd11f692c299d46e38364715ac931841e"
 dependencies = [
 "bevy_app",
 "bevy_asset",
@@ -293,8 +294,9 @@ dependencies = [

 [[package]]
 name = "bevy_crevice"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06d3eeb3237df793e8e01a110ee71824eacd15421821f9b175f3bafca864614c"
 dependencies = [
 "bevy-crevice-derive",
 "bytemuck",
@@ -304,10 +306,10 @@ dependencies = [

 [[package]]
 name = "bevy_derive"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "918dc0dff01e8b4e8f989db89d74fd4042810ea80a70642d0459b3c265995e59"
 dependencies = [
- "Inflector",
 "bevy_macro_utils",
 "quote",
 "syn",
@@ -315,8 +317,9 @@ dependencies = [

 [[package]]
 name = "bevy_diagnostic"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adbe98f48873d4b20f6479723de18d957f4bc00c653efd36c245e6a66d6e8b71"
 dependencies = [
 "bevy_app",
 "bevy_core",
@@ -327,8 +330,9 @@ dependencies = [

 [[package]]
 name = "bevy_ecs"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b182092396e6c2caf5ab30d738511fcd382628aa86ef35878d28fabb325c933"
 dependencies = [
 "async-channel",
 "bevy_ecs_macros",
@@ -344,8 +348,9 @@ dependencies = [

 [[package]]
 name = "bevy_ecs_macros"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7e9e664b3ea45cfc9ab3251ee0255dfa6410f675b3a405e7bac8e59b2d76aa9"
 dependencies = [
 "bevy_macro_utils",
 "proc-macro2",
@@ -355,8 +360,9 @@ dependencies = [

 [[package]]
 name = "bevy_gilrs"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b457f720b1c54ede34afd6007beae3708503c0dd7a4ab4b416e36cb8bbd05ac1"
 dependencies = [
 "bevy_app",
 "bevy_ecs",
@@ -367,8 +373,9 @@ dependencies = [

 [[package]]
 name = "bevy_gltf"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34e4711f4f77542dccd59eec249c98f02e34e28a25ee079c14cd351061d08e5c"
 dependencies = [
 "anyhow",
 "base64",
@@ -391,8 +398,9 @@ dependencies = [

 [[package]]
 name = "bevy_input"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33989693efa636960dd40e540029ed7b7bc1af2f3eef26c009555b5e2a4e185a"
 dependencies = [
 "bevy_app",
 "bevy_ecs",
@@ -402,8 +410,9 @@ dependencies = [

 [[package]]
 name = "bevy_internal"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f92af28d95bba80d11840c24fa4ce8ff84ae27af1def2f5cf8a6891acce5d714"
 dependencies = [
 "bevy_app",
 "bevy_asset",
@@ -448,8 +457,9 @@ dependencies = [

 [[package]]
 name = "bevy_log"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bf0083e72bf76cbfa6607311ac6baef2f4f7c9306c35942cece8c0589cd3e5e"
 dependencies = [
 "android_log-sys",
 "bevy_app",
@@ -462,8 +472,9 @@ dependencies = [

 [[package]]
 name = "bevy_macro_utils"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57cf90b3b67606d0818cdac6c9134eb66fa174959977a4abba893364a571a7cd"
 dependencies = [
 "cargo-manifest",
 "quote",
@@ -472,8 +483,9 @@ dependencies = [

 [[package]]
 name = "bevy_math"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b0f9ebf2ef80a8fff3e5dca817594071004048cd089e72b9a1bf4e494b66112"
 dependencies = [
 "bevy_reflect",
 "glam",
@@ -481,8 +493,9 @@ dependencies = [

 [[package]]
 name = "bevy_pbr"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f5c00c4d1d806a93caf554c28ca9708cc6717463a63dd400e70b106918bd32c"
 dependencies = [
 "bevy_app",
 "bevy_asset",
@@ -501,8 +514,9 @@ dependencies = [

 [[package]]
 name = "bevy_reflect"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d84ce8cbd484a39d67171831eaf72c20d2684de71f1e9d79333c8dd6d6f3ebca"
 dependencies = [
 "bevy_reflect_derive",
 "bevy_utils",
@@ -517,8 +531,9 @@ dependencies = [

 [[package]]
 name = "bevy_reflect_derive"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7af3100febf44583a7c052d1469fbdb411f56aa85729333a0ac106a016bd379c"
 dependencies = [
 "bevy_macro_utils",
 "proc-macro2",
@@ -529,8 +544,9 @@ dependencies = [

 [[package]]
 name = "bevy_render"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4175b9afe0963d04d485980438f631c1e2b02d3a57f58503b8e9239c44d5c2bf"
 dependencies = [
 "anyhow",
 "bevy_app",
@@ -546,6 +562,7 @@ dependencies = [
 "bevy_window",
 "bitflags",
 "codespan-reporting",
+ "copyless",
 "downcast-rs",
 "futures-lite",
 "hex",
@@ -563,8 +580,9 @@ dependencies = [

 [[package]]
 name = "bevy_scene"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21eb2b01e4d1b074c75ea59a92409739cac24b56b1c723491ef80936d50e95df"
 dependencies = [
 "anyhow",
 "bevy_app",
@@ -581,8 +599,9 @@ dependencies = [

 [[package]]
 name = "bevy_sprite"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66439831ff57c11c7fb2692e7ccf8d0551f4368a9908908d3c38f2da53115b33"
 dependencies = [
 "bevy_app",
 "bevy_asset",
@@ -595,7 +614,9 @@ dependencies = [
 "bevy_render",
 "bevy_transform",
 "bevy_utils",
+ "bitflags",
 "bytemuck",
+ "copyless",
 "guillotiere",
 "rectangle-pack",
 "serde",
@@ -604,8 +625,9 @@ dependencies = [

 [[package]]
 name = "bevy_tasks"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dc4bce7f4cddbb489636092f52478b103dc26ee8526c585289bbdd9c0d0a99f"
 dependencies = [
 "async-channel",
 "async-executor",
@@ -617,8 +639,9 @@ dependencies = [

 [[package]]
 name = "bevy_text"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "233c4bb933435e8e6c34a1310317fd7f8c6617526270de572e643816070b236a"
 dependencies = [
 "ab_glyph",
 "anyhow",
@@ -640,8 +663,9 @@ dependencies = [

 [[package]]
 name = "bevy_transform"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9974c494f9cc721df46d2ba27c6a8df2a955ed8360a23adabd2bd66d1f73fa8f"
 dependencies = [
 "bevy_app",
 "bevy_ecs",
@@ -653,8 +677,9 @@ dependencies = [

 [[package]]
 name = "bevy_ui"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f30583acee76b40bf1961ece57887ba067becc1e4694ef5dddf18ce2c038886"
 dependencies = [
 "bevy_app",
 "bevy_asset",
@@ -680,8 +705,9 @@ dependencies = [

 [[package]]
 name = "bevy_utils"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "252f6674aa3ba68bacfec506b91570a3cc206ad09b7ef4b23661959ef0246396"
 dependencies = [
 "ahash",
 "bevy_derive",
@@ -693,8 +719,9 @@ dependencies = [

 [[package]]
 name = "bevy_window"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f4b52b766baf565e96f24f61dbc51bc85151f23202fed2b3650769f2edd0b21"
 dependencies = [
 "bevy_app",
 "bevy_math",
@@ -705,8 +732,9 @@ dependencies = [

 [[package]]
 name = "bevy_winit"
-version = "0.5.0"
-source = "git+https://github.com/bevyengine//bevy?rev=50b3f27a767e3b538694d5e7b3ccfdffca647f1b#50b3f27a767e3b538694d5e7b3ccfdffca647f1b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "699c927ef5422a09b71134e5907497117210fe5063676fc7250b7551926f4bba"
 dependencies = [
 "approx",
 "bevy_app",

--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,17 +17,14 @@ bevy_renderer = [
 ]

 [dependencies]
-bevy = { git = "https://github.com/bevyengine/bevy", optional = true }
+bevy = { version = "0.6.0", optional = true }
 kayak_core = { path = "kayak_core" }
 bevy_kayak_ui = { path = "bevy_kayak_ui", optional = true }
 kayak_font = { path = "kayak_font", optional = true }
 kayak_render_macros = { path = "kayak_render_macros" }

 [dev-dependencies]
-bevy = { git = "https://github.com/bevyengine/bevy" }
-
-[patch."https://github.com/bevyengine/bevy"]
-bevy = { git = "https://github.com/bevyengine//bevy", rev = "50b3f27a767e3b538694d5e7b3ccfdffca647f1b" }
+bevy = { version = "0.6.0" }

 [[example]]
 name = "todo"

--- a/bevy_kayak_ui/Cargo.toml
+++ b/bevy_kayak_ui/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"

 [dependencies]
 bytemuck = "1.7.2"
-bevy = { git = "https://github.com/bevyengine/bevy" }
+bevy = { version = "0.6.0" }
 kayak_core = { path = "../kayak_core" }
 kayak_font = { path = "../kayak_font" }
 serde = "1.0"

--- a/bevy_kayak_ui/src/render/unified/pipeline.rs
+++ b/bevy_kayak_ui/src/render/unified/pipeline.rs
+use bevy::math::Size;
 use bevy::render::render_resource::std140::AsStd140;
 use bevy::{
    core::FloatOrd,
@@ -260,6 +261,10 @@ impl FromWorld for UnifiedPipeline {
            texture,
            sampler,
            texture_view,
+            size: Size {
+                width: 1.0,
+                height: 1.0,
+            },
        };

        let binding = render_device.create_bind_group(&BindGroupDescriptor {

--- a/bevy_kayak_ui/src/render/unified/shader.wgsl
+++ b/bevy_kayak_ui/src/render/unified/shader.wgsl
@@ -86,7 +86,7 @@ fn fragment(in: VertexOutput) -> [[location(0)]] vec4<f32> {
        return vec4<f32>(in.color.rgb, dist);
    }
    if (quad_type.t == 1) {
-        var px_range = 2.5;
+        var px_range = 3.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));
        var x = textureSample(font_texture, font_sampler, vec2<f32>(in.uv.x, 1.0 - in.uv.y), i32(in.uv.z)); 

--- a/examples/counter.rs
+++ b/examples/counter.rs
@@ -7,7 +7,7 @@ use kayak_ui::bevy::{BevyContext, BevyKayakUIPlugin, FontMapping, UICameraBundle
 use kayak_ui::core::{
    render, rsx,
    styles::{Style, StyleProp, Units},
-    use_state, widget, Bound, EventType, Index, MutableBound, OnEvent,
+    use_state, widget, EventType, Index, OnEvent,
 };
 use kayak_ui::widgets::{App, Button, Text, Window};


--- a/examples/todo/add_button.rs
+++ b/examples/todo/add_button.rs
@@ -3,7 +3,7 @@ use kayak_ui::core::{
    render_command::RenderCommand,
    rsx,
    styles::{Style, StyleProp, Units},
-    use_state, widget, Bound, Children, EventType, MutableBound, OnEvent,
+    use_state, widget, Children, EventType, OnEvent,
 };

 use kayak_ui::widgets::{Background, Text};

--- a/examples/todo/delete_button.rs
+++ b/examples/todo/delete_button.rs
@@ -3,7 +3,7 @@ use kayak_ui::core::{
    render_command::RenderCommand,
    rsx,
    styles::{Style, StyleProp, Units},
-    use_state, widget, Bound, Children, EventType, MutableBound, OnEvent,
+    use_state, widget, Children, EventType, OnEvent,
 };

 use kayak_ui::widgets::{Background, Text};

--- a/examples/todo/todo.rs
+++ b/examples/todo/todo.rs
@@ -7,7 +7,7 @@ use kayak_ui::bevy::{BevyContext, BevyKayakUIPlugin, FontMapping, UICameraBundle
 use kayak_ui::core::{
    render, rsx,
    styles::{LayoutType, Style, StyleProp, Units},
-    use_state, widget, Bound, EventType, Handler, Index, MutableBound, OnEvent,
+    use_state, widget, EventType, Handler, Index, OnEvent,
 };
 use kayak_ui::widgets::{App, Element, OnChange, TextBox, Window};


--- a/kayak_core/Cargo.toml
+++ b/kayak_core/Cargo.toml
@@ -12,7 +12,7 @@ bevy_renderer = ["bevy"]
 [dependencies]
 as-any = "0.2"
 derivative = "2.2"
-bevy = { git = "https://github.com/bevyengine/bevy", optional = true }
+bevy = { version = "0.6.0", optional = true }
 flo_binding = { git = "https://github.com/StarArawn/flo_binding.git", rev = "c78431a56df5ec082b7e1c271871e6c0ac75e81e" }
 kayak_render_macros = { path = "../kayak_render_macros" }
 morphorm = { git = "https://github.com/geom3trik/morphorm", rev = "1243152d4cebea46fd3e5098df26402c73acae91" }

--- a/kayak_font/Cargo.toml
+++ b/kayak_font/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"

 [dependencies]
 anyhow = { version = "1.0" }
-bevy = { git = "https://github.com/bevyengine/bevy" }
+bevy = { version = "0.6.0" }
 bytemuck = "1.7.2"
 serde = "1.0"
 serde_json = "1.0"

--- a/kayak_font/examples/renderer/pipeline.rs
+++ b/kayak_font/examples/renderer/pipeline.rs
@@ -321,6 +321,7 @@ pub fn queue_quads(
                    pipeline: quad_pipeline.pipeline,
                    entity,
                    sort_key: FloatOrd(quad.z_index),
+                    batch_range: None,
                });
            }
        }

--- a/kayak_font/src/lib.rs
+++ b/kayak_font/src/lib.rs
@@ -117,6 +117,7 @@ fn extract_fonts(
                .texture_descriptor
                .usage
                .contains(TextureUsages::COPY_SRC)
+                || image.texture_descriptor.format != TextureFormat::Rgba8Unorm
            {
                not_processed.push(handle);
                continue;

--- a/kayak_font/src/renderer/font_texture_cache.rs
+++ b/kayak_font/src/renderer/font_texture_cache.rs
 use crate::{KayakFont, Sdf};
 use bevy::{
-    math::Vec2,
+    math::{Size, Vec2},
    prelude::{Handle, Res},
    render::{
        render_asset::RenderAssets,
@@ -137,7 +137,7 @@ impl FontTextureCache {

        let texture_view = texture.create_view(&TextureViewDescriptor {
            label: Some("font_texture_array_view"),
-            format: Some(format),
+            format: None,
            dimension: Some(TextureViewDimension::D2Array),
            aspect: bevy::render::render_resource::TextureAspect::All,
            base_mip_level: 0,
@@ -150,6 +150,10 @@ impl FontTextureCache {
            texture,
            sampler,
            texture_view,
+            size: Size {
+                width: size.0 as f32,
+                height: size.1 as f32,
+            },
        };

        images.insert(font_handle, image);
@@ -166,7 +170,7 @@ impl FontTextureCache {
            mip_level_count: 1,
            sample_count: 1,
            dimension: TextureDimension::D2,
-            format: TextureFormat::Rgba32Float,
+            format: TextureFormat::Rgba8Unorm,
            usage: TextureUsages::TEXTURE_BINDING | TextureUsages::COPY_DST,
        };

@@ -190,6 +194,10 @@ impl FontTextureCache {
            texture,
            sampler,
            texture_view,
+            size: Size {
+                width: 1.0,
+                height: 1.0,
+            },
        };

        let binding = device.create_bind_group(&BindGroupDescriptor {