Skip to content
Snippets Groups Projects
Commit dcf3ecc8 authored by StarArawn's avatar StarArawn
Browse files

Updated to newer bevy.

parent 4bf5e808
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 124 additions and 109 deletions
Cargo.lock
+ 93
− 90
View file @ dcf3ecc8
...@@ -193,15 +193,26 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" ...@@ -193,15 +193,26 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
[[package]] [[package]]
name = "bevy" name = "bevy"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"bevy_internal", "bevy_internal",
] ]
[[package]]
name = "bevy-crevice-derive"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [
"bevy_macro_utils",
"proc-macro2",
"quote",
"syn",
]
[[package]] [[package]]
name = "bevy_app" name = "bevy_app"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"bevy_derive", "bevy_derive",
"bevy_ecs", "bevy_ecs",
...@@ -214,7 +225,7 @@ dependencies = [ ...@@ -214,7 +225,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_asset" name = "bevy_asset"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bevy_app", "bevy_app",
...@@ -241,7 +252,7 @@ dependencies = [ ...@@ -241,7 +252,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_audio" name = "bevy_audio"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bevy_app", "bevy_app",
...@@ -256,7 +267,7 @@ dependencies = [ ...@@ -256,7 +267,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_core" name = "bevy_core"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_derive", "bevy_derive",
...@@ -271,7 +282,7 @@ dependencies = [ ...@@ -271,7 +282,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_core_pipeline" name = "bevy_core_pipeline"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_asset", "bevy_asset",
...@@ -280,10 +291,21 @@ dependencies = [ ...@@ -280,10 +291,21 @@ dependencies = [
"bevy_render", "bevy_render",
] ]
[[package]]
name = "bevy_crevice"
version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [
"bevy-crevice-derive",
"bytemuck",
"glam",
"mint",
]
[[package]] [[package]]
name = "bevy_derive" name = "bevy_derive"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"Inflector", "Inflector",
"bevy_macro_utils", "bevy_macro_utils",
...@@ -294,7 +316,7 @@ dependencies = [ ...@@ -294,7 +316,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_diagnostic" name = "bevy_diagnostic"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_core", "bevy_core",
...@@ -306,7 +328,7 @@ dependencies = [ ...@@ -306,7 +328,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_ecs" name = "bevy_ecs"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"async-channel", "async-channel",
"bevy_ecs_macros", "bevy_ecs_macros",
...@@ -323,7 +345,7 @@ dependencies = [ ...@@ -323,7 +345,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_ecs_macros" name = "bevy_ecs_macros"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"bevy_macro_utils", "bevy_macro_utils",
"proc-macro2", "proc-macro2",
...@@ -334,7 +356,7 @@ dependencies = [ ...@@ -334,7 +356,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_gilrs" name = "bevy_gilrs"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_ecs", "bevy_ecs",
...@@ -346,7 +368,7 @@ dependencies = [ ...@@ -346,7 +368,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_gltf" name = "bevy_gltf"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64", "base64",
...@@ -370,7 +392,7 @@ dependencies = [ ...@@ -370,7 +392,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_input" name = "bevy_input"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_ecs", "bevy_ecs",
...@@ -381,7 +403,7 @@ dependencies = [ ...@@ -381,7 +403,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_internal" name = "bevy_internal"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_asset", "bevy_asset",
...@@ -416,8 +438,8 @@ name = "bevy_kayak_ui" ...@@ -416,8 +438,8 @@ name = "bevy_kayak_ui"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"bevy", "bevy",
"bevy_crevice",
"bytemuck", "bytemuck",
"crevice",
"kayak_core", "kayak_core",
"kayak_font", "kayak_font",
"serde", "serde",
...@@ -428,7 +450,7 @@ dependencies = [ ...@@ -428,7 +450,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_log" name = "bevy_log"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"android_log-sys", "android_log-sys",
"bevy_app", "bevy_app",
...@@ -442,7 +464,7 @@ dependencies = [ ...@@ -442,7 +464,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_macro_utils" name = "bevy_macro_utils"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"cargo-manifest", "cargo-manifest",
"quote", "quote",
...@@ -452,7 +474,7 @@ dependencies = [ ...@@ -452,7 +474,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_math" name = "bevy_math"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"bevy_reflect", "bevy_reflect",
"glam", "glam",
...@@ -461,7 +483,7 @@ dependencies = [ ...@@ -461,7 +483,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_pbr" name = "bevy_pbr"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_asset", "bevy_asset",
...@@ -476,14 +498,12 @@ dependencies = [ ...@@ -476,14 +498,12 @@ dependencies = [
"bevy_window", "bevy_window",
"bitflags", "bitflags",
"bytemuck", "bytemuck",
"crevice",
"wgpu",
] ]
[[package]] [[package]]
name = "bevy_reflect" name = "bevy_reflect"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"bevy_reflect_derive", "bevy_reflect_derive",
"bevy_utils", "bevy_utils",
...@@ -499,7 +519,7 @@ dependencies = [ ...@@ -499,7 +519,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_reflect_derive" name = "bevy_reflect_derive"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"bevy_macro_utils", "bevy_macro_utils",
"proc-macro2", "proc-macro2",
...@@ -511,12 +531,13 @@ dependencies = [ ...@@ -511,12 +531,13 @@ dependencies = [
[[package]] [[package]]
name = "bevy_render" name = "bevy_render"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bevy_app", "bevy_app",
"bevy_asset", "bevy_asset",
"bevy_core", "bevy_core",
"bevy_crevice",
"bevy_derive", "bevy_derive",
"bevy_ecs", "bevy_ecs",
"bevy_math", "bevy_math",
...@@ -526,7 +547,6 @@ dependencies = [ ...@@ -526,7 +547,6 @@ dependencies = [
"bevy_window", "bevy_window",
"bitflags", "bitflags",
"codespan-reporting", "codespan-reporting",
"crevice",
"downcast-rs", "downcast-rs",
"futures-lite", "futures-lite",
"hex", "hex",
...@@ -545,7 +565,7 @@ dependencies = [ ...@@ -545,7 +565,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_scene" name = "bevy_scene"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bevy_app", "bevy_app",
...@@ -563,7 +583,7 @@ dependencies = [ ...@@ -563,7 +583,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_sprite" name = "bevy_sprite"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_asset", "bevy_asset",
...@@ -577,7 +597,6 @@ dependencies = [ ...@@ -577,7 +597,6 @@ dependencies = [
"bevy_transform", "bevy_transform",
"bevy_utils", "bevy_utils",
"bytemuck", "bytemuck",
"crevice",
"guillotiere", "guillotiere",
"rectangle-pack", "rectangle-pack",
"serde", "serde",
...@@ -587,7 +606,7 @@ dependencies = [ ...@@ -587,7 +606,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_tasks" name = "bevy_tasks"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"async-channel", "async-channel",
"async-executor", "async-executor",
...@@ -600,7 +619,7 @@ dependencies = [ ...@@ -600,7 +619,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_text" name = "bevy_text"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"ab_glyph", "ab_glyph",
"anyhow", "anyhow",
...@@ -623,7 +642,7 @@ dependencies = [ ...@@ -623,7 +642,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_transform" name = "bevy_transform"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_ecs", "bevy_ecs",
...@@ -636,7 +655,7 @@ dependencies = [ ...@@ -636,7 +655,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_ui" name = "bevy_ui"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_asset", "bevy_asset",
...@@ -655,7 +674,6 @@ dependencies = [ ...@@ -655,7 +674,6 @@ dependencies = [
"bevy_utils", "bevy_utils",
"bevy_window", "bevy_window",
"bytemuck", "bytemuck",
"crevice",
"serde", "serde",
"smallvec", "smallvec",
"stretch", "stretch",
...@@ -664,7 +682,7 @@ dependencies = [ ...@@ -664,7 +682,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_utils" name = "bevy_utils"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"ahash", "ahash",
"bevy_derive", "bevy_derive",
...@@ -677,7 +695,7 @@ dependencies = [ ...@@ -677,7 +695,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_window" name = "bevy_window"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"bevy_app", "bevy_app",
"bevy_math", "bevy_math",
...@@ -689,7 +707,7 @@ dependencies = [ ...@@ -689,7 +707,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_winit" name = "bevy_winit"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465" source = "git+https://github.com/bevyengine/bevy?rev=1d0d8a3397bd6fc2c14d42ffd0668d2443748912#1d0d8a3397bd6fc2c14d42ffd0668d2443748912"
dependencies = [ dependencies = [
"approx", "approx",
"bevy_app", "bevy_app",
...@@ -1092,27 +1110,6 @@ dependencies = [ ...@@ -1092,27 +1110,6 @@ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
] ]
[[package]]
name = "crevice"
version = "0.8.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"bytemuck",
"crevice-derive",
"glam",
"mint",
]
[[package]]
name = "crevice-derive"
version = "0.8.0"
source = "git+https://github.com/bevyengine/bevy?rev=081350916c39fc1c7c9d659ccb6d86413832b465#081350916c39fc1c7c9d659ccb6d86413832b465"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]] [[package]]
name = "crossbeam-channel" name = "crossbeam-channel"
version = "0.5.1" version = "0.5.1"
...@@ -1531,6 +1528,7 @@ checksum = "9a5e5bb97bf9a0d9519a28cf38839cf1d6d9bb572b48e3c67202271fec2ed5e7" ...@@ -1531,6 +1528,7 @@ checksum = "9a5e5bb97bf9a0d9519a28cf38839cf1d6d9bb572b48e3c67202271fec2ed5e7"
dependencies = [ dependencies = [
"core-foundation 0.6.4", "core-foundation 0.6.4",
"io-kit-sys", "io-kit-sys",
"js-sys",
"libc", "libc",
"libudev-sys", "libudev-sys",
"log", "log",
...@@ -1539,6 +1537,7 @@ dependencies = [ ...@@ -1539,6 +1537,7 @@ dependencies = [
"stdweb 0.4.20", "stdweb 0.4.20",
"uuid", "uuid",
"vec_map", "vec_map",
"web-sys",
"winapi", "winapi",
] ]
...@@ -1855,8 +1854,8 @@ version = "0.1.0" ...@@ -1855,8 +1854,8 @@ version = "0.1.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bevy", "bevy",
"bevy_crevice",
"bytemuck", "bytemuck",
"crevice",
"serde", "serde",
"serde_json", "serde_json",
"serde_path_to_error", "serde_path_to_error",
...@@ -1928,6 +1927,17 @@ version = "1.3.0" ...@@ -1928,6 +1927,17 @@ version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "lewton"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030"
dependencies = [
"byteorder",
"ogg",
"tinyvec",
]
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.111" version = "0.2.111"
...@@ -2034,26 +2044,6 @@ dependencies = [ ...@@ -2034,26 +2044,6 @@ dependencies = [
"objc", "objc",
] ]
[[package]]
name = "minimp3"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "985438f75febf74c392071a975a29641b420dd84431135a6e6db721de4b74372"
dependencies = [
"minimp3-sys",
"slice-deque",
"thiserror",
]
[[package]]
name = "minimp3-sys"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e21c73734c69dc95696c9ed8926a2b393171d98b3f5f5935686a26a487ab9b90"
dependencies = [
"cc",
]
[[package]] [[package]]
name = "miniz_oxide" name = "miniz_oxide"
version = "0.3.7" version = "0.3.7"
...@@ -2421,6 +2411,15 @@ dependencies = [ ...@@ -2421,6 +2411,15 @@ dependencies = [
"cc", "cc",
] ]
[[package]]
name = "ogg"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e"
dependencies = [
"byteorder",
]
[[package]] [[package]]
name = "once_cell" name = "once_cell"
version = "1.8.0" version = "1.8.0"
...@@ -2731,7 +2730,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" ...@@ -2731,7 +2730,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d98f5e557b61525057e2bc142c8cd7f0e70d75dc32852309bec440e6e046bf9" checksum = "4d98f5e557b61525057e2bc142c8cd7f0e70d75dc32852309bec440e6e046bf9"
dependencies = [ dependencies = [
"cpal", "cpal",
"minimp3", "lewton",
] ]
[[package]] [[package]]
...@@ -2880,17 +2879,6 @@ version = "0.4.5" ...@@ -2880,17 +2879,6 @@ version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5"
[[package]]
name = "slice-deque"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "31ef6ee280cdefba6d2d0b4b78a84a1c1a3f3a4cec98c2d4231c8bc225de0f25"
dependencies = [
"libc",
"mach 0.3.2",
"winapi",
]
[[package]] [[package]]
name = "slotmap" name = "slotmap"
version = "1.0.6" version = "1.0.6"
...@@ -3053,6 +3041,21 @@ dependencies = [ ...@@ -3053,6 +3041,21 @@ dependencies = [
"once_cell", "once_cell",
] ]
[[package]]
name = "tinyvec"
version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2"
dependencies = [
"tinyvec_macros",
]
[[package]]
name = "tinyvec_macros"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]] [[package]]
name = "toml" name = "toml"
version = "0.5.8" version = "0.5.8"
......
Cargo.toml
+ 2
− 2
View file @ dcf3ecc8
...@@ -17,14 +17,14 @@ bevy_renderer = [ ...@@ -17,14 +17,14 @@ bevy_renderer = [
] ]
[dependencies] [dependencies]
bevy = { git = "https://github.com/bevyengine/bevy", rev = "081350916c39fc1c7c9d659ccb6d86413832b465", optional = true } bevy = { git = "https://github.com/bevyengine/bevy", rev = "1d0d8a3397bd6fc2c14d42ffd0668d2443748912", optional = true }
kayak_core = { path = "kayak_core" } kayak_core = { path = "kayak_core" }
bevy_kayak_ui = { path = "bevy_kayak_ui", optional = true } bevy_kayak_ui = { path = "bevy_kayak_ui", optional = true }
kayak_font = { path = "kayak_font", optional = true } kayak_font = { path = "kayak_font", optional = true }
kayak_render_macros = { path = "kayak_render_macros" } kayak_render_macros = { path = "kayak_render_macros" }
[dev-dependencies] [dev-dependencies]
bevy = { git = "https://github.com/bevyengine/bevy", rev = "081350916c39fc1c7c9d659ccb6d86413832b465" } bevy = { git = "https://github.com/bevyengine/bevy", rev = "1d0d8a3397bd6fc2c14d42ffd0668d2443748912" }
[[example]] [[example]]
name = "todo" name = "todo"
......
README.md
+ 1
− 1
View file @ dcf3ecc8
...@@ -51,7 +51,7 @@ kayak_widgets = { git="https://github.com/StarArawn/kayak_ui", rev="{INSERT_COMM ...@@ -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}" } 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: `081350916c39fc1c7c9d659ccb6d86413832b465`. It's also worth mentioning that you will need to use the same bevy revision that this library uses which is currently: `1d0d8a3397bd6fc2c14d42ffd0668d2443748912`.
This is temporary and will change when bevy 0.6 is released. This is temporary and will change when bevy 0.6 is released.
......
bevy_kayak_ui/Cargo.toml
+ 2
− 3
View file @ dcf3ecc8
...@@ -5,11 +5,10 @@ edition = "2021" ...@@ -5,11 +5,10 @@ edition = "2021"
[dependencies] [dependencies]
bytemuck = "1.7.2" bytemuck = "1.7.2"
bevy = { git = "https://github.com/bevyengine/bevy", rev = "081350916c39fc1c7c9d659ccb6d86413832b465" } bevy = { git = "https://github.com/bevyengine/bevy", rev = "1d0d8a3397bd6fc2c14d42ffd0668d2443748912" }
bevy_crevice = { git = "https://github.com/bevyengine/bevy", rev = "1d0d8a3397bd6fc2c14d42ffd0668d2443748912" }
kayak_core = { path = "../kayak_core" } kayak_core = { path = "../kayak_core" }
kayak_font = { path = "../kayak_font" } kayak_font = { path = "../kayak_font" }
#kayak_font = { path = "../kayak_font" }
crevice = { git = "https://github.com/bevyengine/bevy", rev = "081350916c39fc1c7c9d659ccb6d86413832b465" }
serde = "1.0" serde = "1.0"
serde_json = "1.0" serde_json = "1.0"
serde_path_to_error = "0.1" serde_path_to_error = "0.1"
bevy_kayak_ui/src/render/mod.rs
+ 1
− 1
View file @ dcf3ecc8
...@@ -41,7 +41,7 @@ pub struct BevyKayakUIRenderPlugin; ...@@ -41,7 +41,7 @@ pub struct BevyKayakUIRenderPlugin;
impl Plugin for BevyKayakUIRenderPlugin { impl Plugin for BevyKayakUIRenderPlugin {
fn build(&self, app: &mut bevy::prelude::App) { fn build(&self, app: &mut bevy::prelude::App) {
let render_app = app.sub_app(RenderApp); let render_app = app.sub_app_mut(RenderApp);
render_app render_app
.init_resource::<DrawFunctions<TransparentUI>>() .init_resource::<DrawFunctions<TransparentUI>>()
.add_system_to_stage(RenderStage::Extract, extract_core_pipeline_camera_phases); .add_system_to_stage(RenderStage::Extract, extract_core_pipeline_camera_phases);
......
bevy_kayak_ui/src/render/unified/font/mod.rs
+ 1
− 1
View file @ dcf3ecc8
...@@ -24,7 +24,7 @@ impl Plugin for TextRendererPlugin { ...@@ -24,7 +24,7 @@ impl Plugin for TextRendererPlugin {
app.add_plugin(KayakFontPlugin) app.add_plugin(KayakFontPlugin)
.init_resource::<FontMapping>(); .init_resource::<FontMapping>();
let render_app = app.sub_app(RenderApp); let render_app = app.sub_app_mut(RenderApp);
render_app.add_system_to_stage(RenderStage::Queue, create_and_update_font_cache_texture); render_app.add_system_to_stage(RenderStage::Queue, create_and_update_font_cache_texture);
} }
} }
......
bevy_kayak_ui/src/render/unified/mod.rs
+ 1
− 1
View file @ dcf3ecc8
...@@ -42,7 +42,7 @@ impl Plugin for UnifiedRenderPlugin { ...@@ -42,7 +42,7 @@ impl Plugin for UnifiedRenderPlugin {
app.add_plugin(font::TextRendererPlugin) app.add_plugin(font::TextRendererPlugin)
.add_plugin(image::ImageRendererPlugin); .add_plugin(image::ImageRendererPlugin);
let render_app = app.sub_app(RenderApp); let render_app = app.sub_app_mut(RenderApp);
render_app render_app
.init_resource::<ImageBindGroups>() .init_resource::<ImageBindGroups>()
.init_resource::<UnifiedPipeline>() .init_resource::<UnifiedPipeline>()
......
bevy_kayak_ui/src/render/unified/pipeline.rs
+ 1
− 1
View file @ dcf3ecc8
...@@ -29,8 +29,8 @@ use bevy::{ ...@@ -29,8 +29,8 @@ use bevy::{
sprite::Rect, sprite::Rect,
utils::HashMap, utils::HashMap,
}; };
use bevy_crevice::std140::AsStd140;
use bytemuck::{Pod, Zeroable}; use bytemuck::{Pod, Zeroable};
use crevice::std140::AsStd140;
use kayak_font::{FontRenderingPipeline, FontTextureCache, KayakFont}; use kayak_font::{FontRenderingPipeline, FontTextureCache, KayakFont};
use super::{Dpi, UNIFIED_SHADER_HANDLE}; use super::{Dpi, UNIFIED_SHADER_HANDLE};
......
kayak_core/Cargo.toml
+ 1
− 1
View file @ dcf3ecc8
...@@ -12,7 +12,7 @@ bevy_renderer = ["bevy"] ...@@ -12,7 +12,7 @@ bevy_renderer = ["bevy"]
[dependencies] [dependencies]
as-any = "0.2" as-any = "0.2"
derivative = "2.2" derivative = "2.2"
bevy = { git = "https://github.com/bevyengine/bevy", rev = "081350916c39fc1c7c9d659ccb6d86413832b465", optional = true } bevy = { git = "https://github.com/bevyengine/bevy", rev = "1d0d8a3397bd6fc2c14d42ffd0668d2443748912", optional = true }
flo_binding = { git = "https://github.com/StarArawn/flo_binding.git", rev = "c78431a56df5ec082b7e1c271871e6c0ac75e81e" } flo_binding = { git = "https://github.com/StarArawn/flo_binding.git", rev = "c78431a56df5ec082b7e1c271871e6c0ac75e81e" }
kayak_render_macros = { path = "../kayak_render_macros" } kayak_render_macros = { path = "../kayak_render_macros" }
morphorm = { git = "https://github.com/geom3trik/morphorm", rev = "1243152d4cebea46fd3e5098df26402c73acae91" } morphorm = { git = "https://github.com/geom3trik/morphorm", rev = "1243152d4cebea46fd3e5098df26402c73acae91" }
......
kayak_font/Cargo.toml
+ 2
− 2
View file @ dcf3ecc8
...@@ -7,9 +7,9 @@ edition = "2021" ...@@ -7,9 +7,9 @@ edition = "2021"
[dependencies] [dependencies]
anyhow = { version = "1.0" } anyhow = { version = "1.0" }
bevy = { git = "https://github.com/bevyengine/bevy", rev = "081350916c39fc1c7c9d659ccb6d86413832b465" } bevy = { git = "https://github.com/bevyengine/bevy", rev = "1d0d8a3397bd6fc2c14d42ffd0668d2443748912" }
bevy_crevice = { git = "https://github.com/bevyengine/bevy", rev = "1d0d8a3397bd6fc2c14d42ffd0668d2443748912" }
bytemuck = "1.7.2" bytemuck = "1.7.2"
crevice = { git = "https://github.com/bevyengine/bevy", rev = "081350916c39fc1c7c9d659ccb6d86413832b465" }
serde = "1.0" serde = "1.0"
serde_json = "1.0" serde_json = "1.0"
serde_path_to_error = "0.1" serde_path_to_error = "0.1"
kayak_font/examples/renderer/mod.rs
+ 1
− 1
View file @ dcf3ecc8
...@@ -32,7 +32,7 @@ impl Plugin for FontRenderPlugin { ...@@ -32,7 +32,7 @@ impl Plugin for FontRenderPlugin {
let unified_shader = Shader::from_wgsl(include_str!("shader.wgsl")); let unified_shader = Shader::from_wgsl(include_str!("shader.wgsl"));
shaders.set_untracked(FONT_SHADER_HANDLE, unified_shader); shaders.set_untracked(FONT_SHADER_HANDLE, unified_shader);
let render_app = app.sub_app(RenderApp); let render_app = app.sub_app_mut(RenderApp);
render_app render_app
.init_resource::<QuadMeta>() .init_resource::<QuadMeta>()
.init_resource::<FontPipeline>() .init_resource::<FontPipeline>()
......
kayak_font/examples/renderer/pipeline.rs
+ 1
− 1
View file @ dcf3ecc8
...@@ -26,8 +26,8 @@ use bevy::{ ...@@ -26,8 +26,8 @@ use bevy::{
}, },
sprite::Rect, sprite::Rect,
}; };
use bevy_crevice::std140::AsStd140;
use bytemuck::{Pod, Zeroable}; use bytemuck::{Pod, Zeroable};
use crevice::std140::AsStd140;
use kayak_font::{FontRenderingPipeline, FontTextureCache, KayakFont}; use kayak_font::{FontRenderingPipeline, FontTextureCache, KayakFont};
use super::FONT_SHADER_HANDLE; use super::FONT_SHADER_HANDLE;
......
kayak_font/src/lib.rs
+ 1
− 1
View file @ dcf3ecc8
...@@ -32,7 +32,7 @@ impl Plugin for KayakFontPlugin { ...@@ -32,7 +32,7 @@ impl Plugin for KayakFontPlugin {
.add_asset_loader(KayakFontLoader) .add_asset_loader(KayakFontLoader)
.add_system(init_font_texture); .add_system(init_font_texture);
let render_app = app.sub_app(RenderApp); let render_app = app.sub_app_mut(RenderApp);
render_app render_app
.init_resource::<FontTextureCache>() .init_resource::<FontTextureCache>()
.init_resource::<ExtractedFonts>() .init_resource::<ExtractedFonts>()
......
kayak_render_macros/src/lib.rs
+ 16
− 3
View file @ dcf3ecc8
...@@ -8,9 +8,9 @@ mod attribute; ...@@ -8,9 +8,9 @@ mod attribute;
mod child; mod child;
mod children; mod children;
mod partial_eq; mod partial_eq;
mod use_effect;
mod widget; mod widget;
mod widget_attributes; mod widget_attributes;
mod use_effect;
use function_component::WidgetArguments; use function_component::WidgetArguments;
use partial_eq::impl_dyn_partial_eq; use partial_eq::impl_dyn_partial_eq;
...@@ -18,8 +18,8 @@ use proc_macro::TokenStream; ...@@ -18,8 +18,8 @@ use proc_macro::TokenStream;
use proc_macro_error::proc_macro_error; use proc_macro_error::proc_macro_error;
use quote::quote; use quote::quote;
use syn::{parse_macro_input, parse_quote}; use syn::{parse_macro_input, parse_quote};
use widget::ConstructedWidget;
use use_effect::UseEffect; use use_effect::UseEffect;
use widget::ConstructedWidget;
use crate::widget::Widget; use crate::widget::Widget;
...@@ -154,8 +154,21 @@ pub fn dyn_partial_eq(_: TokenStream, input: TokenStream) -> TokenStream { ...@@ -154,8 +154,21 @@ pub fn dyn_partial_eq(_: TokenStream, input: TokenStream) -> TokenStream {
#[proc_macro] #[proc_macro]
pub fn use_state(initial_state: TokenStream) -> TokenStream { pub fn use_state(initial_state: TokenStream) -> TokenStream {
let initial_state = parse_macro_input!(initial_state as syn::Expr); let initial_state = parse_macro_input!(initial_state as syn::Expr);
let found_crate = proc_macro_crate::crate_name("kayak_core");
let kayak_core = if let Ok(found_crate) = found_crate {
match found_crate {
proc_macro_crate::FoundCrate::Itself => quote! { crate },
proc_macro_crate::FoundCrate::Name(name) => {
let ident = syn::Ident::new(&name, proc_macro2::Span::call_site());
quote!(#ident)
}
}
} else {
quote!(kayak_ui::core)
};
let result = quote! {{ let result = quote! {{
use kayak_core::{Bound, MutableBound}; use #kayak_core::{Bound, MutableBound};
let state = context.create_state(#initial_state).unwrap(); let state = context.create_state(#initial_state).unwrap();
let cloned_state = state.clone(); let cloned_state = state.clone();
let set_state = move |value| { let set_state = move |value| {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment