From cd3a843c3d1cf9766331b08c795284cec2b0b423 Mon Sep 17 00:00:00 2001
From: StarArawn <toasterthegamer@gmail.com>
Date: Thu, 23 Dec 2021 09:02:43 -0500
Subject: [PATCH] Updated to the latest bevy version.
---
Cargo.lock | 115 +++++++++----------
Cargo.toml | 4 +-
README.md | 2 +-
bevy_kayak_ui/Cargo.toml | 4 +-
bevy_kayak_ui/src/render/unified/pipeline.rs | 20 ++--
bevy_kayak_ui/src/render/unified/shader.wgsl | 2 -
kayak_core/Cargo.toml | 2 +-
7 files changed, 66 insertions(+), 83 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 0fcd11e..ced2727 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -193,7 +193,7 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
[[package]]
name = "bevy"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"bevy_internal",
]
@@ -201,7 +201,7 @@ dependencies = [
[[package]]
name = "bevy_app"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"bevy_derive",
"bevy_ecs",
@@ -214,7 +214,7 @@ dependencies = [
[[package]]
name = "bevy_asset"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"anyhow",
"bevy_app",
@@ -241,7 +241,7 @@ dependencies = [
[[package]]
name = "bevy_audio"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"anyhow",
"bevy_app",
@@ -256,7 +256,7 @@ dependencies = [
[[package]]
name = "bevy_core"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"bevy_app",
"bevy_derive",
@@ -271,7 +271,7 @@ dependencies = [
[[package]]
name = "bevy_core_pipeline"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"bevy_app",
"bevy_asset",
@@ -283,7 +283,7 @@ dependencies = [
[[package]]
name = "bevy_derive"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"Inflector",
"bevy_macro_utils",
@@ -294,7 +294,7 @@ dependencies = [
[[package]]
name = "bevy_diagnostic"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"bevy_app",
"bevy_core",
@@ -306,7 +306,7 @@ dependencies = [
[[package]]
name = "bevy_ecs"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"async-channel",
"bevy_ecs_macros",
@@ -323,7 +323,7 @@ dependencies = [
[[package]]
name = "bevy_ecs_macros"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"bevy_macro_utils",
"proc-macro2",
@@ -334,7 +334,7 @@ dependencies = [
[[package]]
name = "bevy_gilrs"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"bevy_app",
"bevy_ecs",
@@ -346,7 +346,7 @@ dependencies = [
[[package]]
name = "bevy_gltf"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"anyhow",
"base64",
@@ -365,13 +365,12 @@ dependencies = [
"gltf",
"percent-encoding",
"thiserror",
- "wgpu",
]
[[package]]
name = "bevy_input"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"bevy_app",
"bevy_ecs",
@@ -382,7 +381,7 @@ dependencies = [
[[package]]
name = "bevy_internal"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"bevy_app",
"bevy_asset",
@@ -429,7 +428,7 @@ dependencies = [
[[package]]
name = "bevy_log"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"android_log-sys",
"bevy_app",
@@ -443,7 +442,7 @@ dependencies = [
[[package]]
name = "bevy_macro_utils"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"cargo-manifest",
"quote",
@@ -453,7 +452,7 @@ dependencies = [
[[package]]
name = "bevy_math"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"bevy_reflect",
"glam",
@@ -462,7 +461,7 @@ dependencies = [
[[package]]
name = "bevy_pbr"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"bevy_app",
"bevy_asset",
@@ -484,7 +483,7 @@ dependencies = [
[[package]]
name = "bevy_reflect"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"bevy_reflect_derive",
"bevy_utils",
@@ -500,7 +499,7 @@ dependencies = [
[[package]]
name = "bevy_reflect_derive"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"bevy_macro_utils",
"proc-macro2",
@@ -512,7 +511,7 @@ dependencies = [
[[package]]
name = "bevy_render"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"anyhow",
"bevy_app",
@@ -526,6 +525,7 @@ dependencies = [
"bevy_utils",
"bevy_window",
"bitflags",
+ "codespan-reporting",
"crevice",
"downcast-rs",
"futures-lite",
@@ -545,7 +545,7 @@ dependencies = [
[[package]]
name = "bevy_scene"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"anyhow",
"bevy_app",
@@ -563,7 +563,7 @@ dependencies = [
[[package]]
name = "bevy_sprite"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"bevy_app",
"bevy_asset",
@@ -587,7 +587,7 @@ dependencies = [
[[package]]
name = "bevy_tasks"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"async-channel",
"async-executor",
@@ -600,7 +600,7 @@ dependencies = [
[[package]]
name = "bevy_text"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"ab_glyph",
"anyhow",
@@ -623,7 +623,7 @@ dependencies = [
[[package]]
name = "bevy_transform"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"bevy_app",
"bevy_ecs",
@@ -636,7 +636,7 @@ dependencies = [
[[package]]
name = "bevy_ui"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"bevy_app",
"bevy_asset",
@@ -664,7 +664,7 @@ dependencies = [
[[package]]
name = "bevy_utils"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"ahash",
"bevy_derive",
@@ -677,19 +677,19 @@ dependencies = [
[[package]]
name = "bevy_window"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"bevy_app",
"bevy_math",
"bevy_utils",
- "raw-window-handle 0.4.2",
+ "raw-window-handle",
"web-sys",
]
[[package]]
name = "bevy_winit"
version = "0.5.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"approx",
"bevy_app",
@@ -698,7 +698,7 @@ dependencies = [
"bevy_math",
"bevy_utils",
"bevy_window",
- "raw-window-handle 0.4.2",
+ "raw-window-handle",
"wasm-bindgen",
"web-sys",
"winit",
@@ -1095,7 +1095,7 @@ dependencies = [
[[package]]
name = "crevice"
version = "0.8.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"bytemuck",
"crevice-derive",
@@ -1106,7 +1106,7 @@ dependencies = [
[[package]]
name = "crevice-derive"
version = "0.8.0"
-source = "git+https://github.com/bevyengine/bevy?rev=9a16a4d01830297987db40b45f03382ed3acad62#9a16a4d01830297987db40b45f03382ed3acad62"
+source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"proc-macro2",
"quote",
@@ -1561,9 +1561,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
[[package]]
name = "glow"
-version = "0.11.0"
+version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f04649123493bc2483cbef4daddb45d40bbdae5adb221a63a23efdb0cc99520"
+checksum = "4c07210904884e8e2e6a2d7f36f39040a9cefe3b379b721969b5275e9f5b464a"
dependencies = [
"js-sys",
"slotmap",
@@ -2115,20 +2115,20 @@ dependencies = [
[[package]]
name = "naga"
-version = "0.7.2"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63765d243f5d32ece09b2ff95c1f50ec7353266024a2ce89619a09e1b6aa4cce"
+checksum = "bc7216bec6be822a562dda435236539c7fb5aa5e5ceecc8c565e81139ed1d4b0"
dependencies = [
"bit-set",
"bitflags",
"codespan-reporting",
- "fxhash",
"hexf-parse",
"indexmap",
"log",
"num-traits",
"petgraph",
"pp-rs",
+ "rustc-hash",
"spirv",
"thiserror",
]
@@ -2657,16 +2657,6 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "63e935c45e09cc6dcf00d2f0b2d630a58f4095320223d47fc68918722f0538b6"
-[[package]]
-name = "raw-window-handle"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28f55143d0548dad60bb4fbdc835a3d7ac6acc3324506450c5fdd6e42903a76"
-dependencies = [
- "libc",
- "raw-window-handle 0.4.2",
-]
-
[[package]]
name = "raw-window-handle"
version = "0.4.2"
@@ -3286,16 +3276,16 @@ dependencies = [
[[package]]
name = "wgpu"
-version = "0.11.1"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eae7181fe6ba5f4b632a9079cc9e922a64555156c87def72c063f94b180c7d68"
+checksum = "b97cd781ff044d6d697b632a2e212032c2e957d1afaa21dbf58069cbb8f78567"
dependencies = [
"arrayvec",
"js-sys",
"log",
"naga",
"parking_lot",
- "raw-window-handle 0.3.4",
+ "raw-window-handle",
"smallvec",
"wasm-bindgen",
"wasm-bindgen-futures",
@@ -3307,20 +3297,21 @@ dependencies = [
[[package]]
name = "wgpu-core"
-version = "0.11.3"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35600627b6c718ad0e23ed75fb6140bfe32cdf21c8f539ce3c9ab8180e2cb38e"
+checksum = "659a371d93a66fd0c15f0a5a730d0877416c82e0c539fd46741673a49f02afad"
dependencies = [
"arrayvec",
"bitflags",
"cfg_aliases",
+ "codespan-reporting",
"copyless",
"fxhash",
"log",
"naga",
"parking_lot",
"profiling",
- "raw-window-handle 0.3.4",
+ "raw-window-handle",
"smallvec",
"thiserror",
"wgpu-hal",
@@ -3329,9 +3320,9 @@ dependencies = [
[[package]]
name = "wgpu-hal"
-version = "0.11.5"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af28b29ef0b44cd22dd9895d4349b9d5a687df42f58da234871198637eabe328"
+checksum = "1abbd51f4f3d61db9c02dd776f643437823b6fa85e8642b4bb6d278b74335fc1"
dependencies = [
"arrayvec",
"ash",
@@ -3356,7 +3347,7 @@ dependencies = [
"parking_lot",
"profiling",
"range-alloc",
- "raw-window-handle 0.3.4",
+ "raw-window-handle",
"renderdoc-sys",
"thiserror",
"wasm-bindgen",
@@ -3367,9 +3358,9 @@ dependencies = [
[[package]]
name = "wgpu-types"
-version = "0.11.0"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e15e44ba88ec415466e18e91881319e7c9e96cb905dc623305168aea65b85ccc"
+checksum = "549533d9e1cdd4b4cda7718d33ff500fc4c34b5467b71d76b547ae0324f3b2a2"
dependencies = [
"bitflags",
]
@@ -3429,7 +3420,7 @@ dependencies = [
"objc",
"parking_lot",
"percent-encoding",
- "raw-window-handle 0.4.2",
+ "raw-window-handle",
"wasm-bindgen",
"web-sys",
"winapi",
diff --git a/Cargo.toml b/Cargo.toml
index 379a78a..03c5f86 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,14 +17,14 @@ bevy_renderer = [
]
[dependencies]
-bevy = { git = "https://github.com/bevyengine/bevy", rev = "9a16a4d01830297987db40b45f03382ed3acad62", optional = true }
+bevy = { git = "https://github.com/bevyengine/bevy", rev = "081350916c39fc1c7c9d659ccb6d86413832b465", 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", rev = "9a16a4d01830297987db40b45f03382ed3acad62" }
+bevy = { git = "https://github.com/bevyengine/bevy", rev = "081350916c39fc1c7c9d659ccb6d86413832b465" }
[[example]]
name = "todo"
diff --git a/README.md b/README.md
index ff4d998..39bf71a 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ kayak_widgets = { git="https://github.com/StarArawn/kayak_ui", rev="{INSERT_COMM
bevy = { git="https://github.com/bevyengine/bevy", rev="{INSERT_COMMIT_SHA_HERE}" }
```
-It's also worth mentioning that you will need to use the same bevy revision that this library uses which is currently: `9a16a4d01830297987db40b45f03382ed3acad62`.
+It's also worth mentioning that you will need to use the same bevy revision that this library uses which is currently: `081350916c39fc1c7c9d659ccb6d86413832b465`.
This is temporary and will change when bevy 0.6 is released.
diff --git a/bevy_kayak_ui/Cargo.toml b/bevy_kayak_ui/Cargo.toml
index 8216639..8b0e661 100644
--- a/bevy_kayak_ui/Cargo.toml
+++ b/bevy_kayak_ui/Cargo.toml
@@ -5,11 +5,11 @@ edition = "2021"
[dependencies]
bytemuck = "1.7.2"
-bevy = { git = "https://github.com/bevyengine/bevy", rev = "9a16a4d01830297987db40b45f03382ed3acad62" }
+bevy = { git = "https://github.com/bevyengine/bevy", rev = "081350916c39fc1c7c9d659ccb6d86413832b465" }
kayak_core = { path = "../kayak_core" }
kayak_font = { path = "../kayak_font" }
#kayak_font = { path = "../kayak_font" }
-crevice = { git = "https://github.com/bevyengine/bevy", rev = "9a16a4d01830297987db40b45f03382ed3acad62" }
+crevice = { git = "https://github.com/bevyengine/bevy", rev = "081350916c39fc1c7c9d659ccb6d86413832b465" }
serde = "1.0"
serde_json = "1.0"
serde_path_to_error = "0.1"
diff --git a/bevy_kayak_ui/src/render/unified/pipeline.rs b/bevy_kayak_ui/src/render/unified/pipeline.rs
index 562a110..7faf68d 100644
--- a/bevy_kayak_ui/src/render/unified/pipeline.rs
+++ b/bevy_kayak_ui/src/render/unified/pipeline.rs
@@ -17,10 +17,10 @@ use bevy::{
BufferUsages, BufferVec, CachedPipelineId, ColorTargetState, ColorWrites,
DynamicUniformVec, Extent3d, FragmentState, FrontFace, MultisampleState, PolygonMode,
PrimitiveState, PrimitiveTopology, RenderPipelineCache, RenderPipelineDescriptor,
- SamplerDescriptor, Shader, ShaderStages, TextureDescriptor, TextureDimension,
- TextureFormat, TextureSampleType, TextureUsages, TextureViewDescriptor,
- TextureViewDimension, VertexAttribute, VertexBufferLayout, VertexFormat, VertexState,
- VertexStepMode,
+ SamplerBindingType, SamplerDescriptor, Shader, ShaderStages, TextureDescriptor,
+ TextureDimension, TextureFormat, TextureSampleType, TextureUsages,
+ TextureViewDescriptor, TextureViewDimension, VertexAttribute, VertexBufferLayout,
+ VertexFormat, VertexState, VertexStepMode,
},
renderer::{RenderDevice, RenderQueue},
texture::{BevyDefault, GpuImage, Image},
@@ -116,10 +116,7 @@ impl FromWorld for UnifiedPipeline {
BindGroupLayoutEntry {
binding: 1,
visibility: ShaderStages::FRAGMENT,
- ty: BindingType::Sampler {
- comparison: false,
- filtering: true,
- },
+ ty: BindingType::Sampler(SamplerBindingType::Filtering),
count: None,
},
],
@@ -141,10 +138,7 @@ impl FromWorld for UnifiedPipeline {
BindGroupLayoutEntry {
binding: 1,
visibility: ShaderStages::FRAGMENT,
- ty: BindingType::Sampler {
- comparison: false,
- filtering: true,
- },
+ ty: BindingType::Sampler(SamplerBindingType::Filtering),
count: None,
},
],
@@ -218,10 +212,10 @@ impl FromWorld for UnifiedPipeline {
front_face: FrontFace::Ccw,
cull_mode: None,
polygon_mode: PolygonMode::Fill,
- clamp_depth: false,
conservative: false,
topology: PrimitiveTopology::TriangleList,
strip_index_format: None,
+ unclipped_depth: false,
},
depth_stencil: None,
multisample: MultisampleState {
diff --git a/bevy_kayak_ui/src/render/unified/shader.wgsl b/bevy_kayak_ui/src/render/unified/shader.wgsl
index eb9607e..1933e3d 100644
--- a/bevy_kayak_ui/src/render/unified/shader.wgsl
+++ b/bevy_kayak_ui/src/render/unified/shader.wgsl
@@ -1,4 +1,3 @@
-[[block]]
struct View {
view_proj: mat4x4<f32>;
world_position: vec3<f32>;
@@ -6,7 +5,6 @@ struct View {
[[group(0), binding(0)]]
var<uniform> view: View;
-[[block]]
struct QuadType {
t: i32;
};
diff --git a/kayak_core/Cargo.toml b/kayak_core/Cargo.toml
index 468beaf..1807e85 100644
--- 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", rev = "9a16a4d01830297987db40b45f03382ed3acad62", optional = true }
+bevy = { git = "https://github.com/bevyengine/bevy", rev = "081350916c39fc1c7c9d659ccb6d86413832b465", 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" }
--
GitLab