Merge pull request #274 from NiseVoid/bevy_0.11

Upgrade to bevy 0.11
StarArawn · Nov 4, 2023 · 41706b3 · 41706b3
2 parents 041cfba + e4c183e
commit 41706b3
Show file tree

Hide file tree

Showing 73 changed files with 399 additions and 384 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -18,7 +18,10 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: dtolnay/rust-toolchain@stable
+    - uses: dtolnay/rust-toolchain@master
+      with:
+        toolchain: 1.70.0
+        components: clippy, rustfmt
     - uses: actions/checkout@v3
     - uses: actions/cache@v3
       with:
@@ -28,7 +31,7 @@ jobs:
           ~/.cargo/registry/cache/
           ~/.cargo/git/db/
           target/
-        key: ${{ runner.os }}-cargo-build-stable-${{ hashFiles('**/Cargo.toml') }}
+        key: ${{ runner.os }}-cargo-build-1.70.0-${{ hashFiles('**/Cargo.toml') }}
     - name: Install alsa and udev
       run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
       if: runner.os == 'linux'

diff --git a/Cargo.toml b/Cargo.toml
@@ -16,8 +16,8 @@ members = ["kayak_ui_macros", "kayak_font"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = { version = "0.10", default-features = false, features = ["bevy_render", "bevy_sprite", "bevy_asset", "bevy_winit", "bevy_core_pipeline"] }
-bevy_svg = { version="0.10.1", default-features = false }
+bevy = { version = "0.11", default-features = false, features = ["bevy_render", "bevy_asset", "bevy_winit", "bevy_core_pipeline"] }
+bevy_svg = { version="0.11", default-features = false }
 bitflags = "1.3.2"
 bytemuck = "1.12"
 dashmap = "5.4"
@@ -36,8 +36,8 @@ uuid = { version = "1.3", features = ["v4"] }
 
 [dev-dependencies]
 fastrand = "1.8"
-bevy-inspector-egui = "0.18"
-bevy = { version = "0.10", default-features = true }
+bevy-inspector-egui = "0.19"
+bevy = { version = "0.11", default-features = true }
 
 [[example]]
 name = "tabs"
@@ -48,4 +48,4 @@ name = "todo"
 path = "examples/todo/todo.rs"
 
 [package.metadata.docs.rs]
-features = ["bevy/x11"]
+features = ["bevy/x11"]
diff --git a/assets/rainbow_shader.wgsl b/assets/rainbow_shader.wgsl
@@ -1,6 +1,6 @@
-#import kayak_ui::bindings
-#import kayak_ui::sample_quad
-#import kayak_ui::vertex_output
+#import kayak_ui::bindings globals
+#import kayak_ui::sample_quad sample_quad
+#import kayak_ui::vertex_output VertexOutput
 
 fn hsv2rgb(c: vec3<f32>) -> vec3<f32>
 {

diff --git a/examples/accordion.rs b/examples/accordion.rs
@@ -118,9 +118,8 @@ fn startup(
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins.set(ImagePlugin::default_nearest()))
-        .add_plugin(KayakContextPlugin)
-        .add_plugin(KayakWidgets)
+        .add_plugins((KayakContextPlugin, KayakWidgets))
         // .add_plugin(bevy_inspector_egui::quick::WorldInspectorPlugin::default())
-        .add_startup_system(startup)
+        .add_systems(Startup, startup)
         .run()
 }
diff --git a/examples/avsb.rs b/examples/avsb.rs
@@ -213,10 +213,12 @@ fn swap(input: Res<Input<KeyCode>>, mut query: Query<&mut AvsBState, Without<Pre
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins.set(ImagePlugin::default_nearest()))
-        .add_plugin(bevy_inspector_egui::quick::WorldInspectorPlugin::new())
-        .add_plugin(KayakContextPlugin)
-        .add_plugin(KayakWidgets)
-        .add_startup_system(startup)
-        .add_system(swap)
+        .add_plugins((
+            bevy_inspector_egui::quick::WorldInspectorPlugin::new(),
+            KayakContextPlugin,
+            KayakWidgets,
+        ))
+        .add_systems(Startup, startup)
+        .add_systems(Update, swap)
         .run()
 }
diff --git a/examples/bevy_scene.rs b/examples/bevy_scene.rs
@@ -259,13 +259,16 @@ fn main() {
         .insert_resource(ClearColor(Color::rgb(0.0, 0.0, 0.0)))
         .insert_resource(ActiveColor { index: 0 })
         .add_plugins(DefaultPlugins)
-        .add_plugin(KayakContextPlugin)
-        .add_plugin(KayakWidgets)
-        .add_startup_system(startup)
-        .add_startup_system(world_setup)
-        .add_system(move_ghost_tile)
-        .add_system(set_active_tile_target)
-        .add_system(move_active_tile)
-        .add_system(on_color_change)
+        .add_plugins((KayakContextPlugin, KayakWidgets))
+        .add_systems(Startup, (startup, world_setup))
+        .add_systems(
+            Update,
+            (
+                move_ghost_tile,
+                set_active_tile_target,
+                move_active_tile,
+                on_color_change,
+            ),
+        )
         .run()
 }
diff --git a/examples/box_shadows.rs b/examples/box_shadows.rs
@@ -177,8 +177,7 @@ fn main() {
     App::new()
         .insert_resource(ClearColor(Color::rgb(1.0, 1.0, 1.0)))
         .add_plugins(DefaultPlugins.set(ImagePlugin::default_nearest()))
-        .add_plugin(KayakContextPlugin)
-        .add_plugin(KayakWidgets)
-        .add_startup_system(startup)
+        .add_plugins((KayakContextPlugin, KayakWidgets))
+        .add_systems(Startup, startup)
         .run()
 }
diff --git a/examples/clipping.rs b/examples/clipping.rs
@@ -67,8 +67,7 @@ fn main() {
     App::new()
         .insert_resource(ClearColor(Color::rgb(0.0, 0.0, 0.0)))
         .add_plugins(DefaultPlugins.set(ImagePlugin::default_nearest()))
-        .add_plugin(KayakContextPlugin)
-        .add_plugin(KayakWidgets)
-        .add_startup_system(startup)
+        .add_plugins((KayakContextPlugin, KayakWidgets))
+        .add_systems(Startup, startup)
         .run()
 }
diff --git a/examples/conditional_widget.rs b/examples/conditional_widget.rs
@@ -132,8 +132,7 @@ fn main() {
     App::new()
         .insert_resource(ClearColor(Color::rgb(0.0, 0.0, 0.0)))
         .add_plugins(DefaultPlugins)
-        .add_plugin(KayakContextPlugin)
-        .add_plugin(KayakWidgets)
-        .add_startup_system(startup)
+        .add_plugins((KayakContextPlugin, KayakWidgets))
+        .add_systems(Startup, startup)
         .run()
 }
diff --git a/examples/context.rs b/examples/context.rs
@@ -378,8 +378,7 @@ fn startup(
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(KayakContextPlugin)
-        .add_plugin(KayakWidgets)
-        .add_startup_system(startup)
+        .add_plugins((KayakContextPlugin, KayakWidgets))
+        .add_systems(Startup, startup)
         .run()
 }
diff --git a/examples/custom_shader.rs b/examples/custom_shader.rs
@@ -1,10 +1,14 @@
-use bevy::{prelude::*, reflect::TypeUuid, render::render_resource::AsBindGroup};
+use bevy::{
+    prelude::*,
+    reflect::{TypePath, TypeUuid},
+    render::render_resource::AsBindGroup,
+};
 use kayak_ui::{
     prelude::{widgets::*, *},
     CameraUIKayak,
 };
 
-#[derive(AsBindGroup, TypeUuid, Debug, Clone)]
+#[derive(AsBindGroup, TypeUuid, TypePath, Debug, Clone)]
 #[uuid = "94c4e6f9-6f10-422c-85ec-6d582d471afc"]
 pub struct MyUIMaterial {}
 impl MaterialUI for MyUIMaterial {
@@ -59,9 +63,11 @@ fn startup(
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(KayakContextPlugin)
-        .add_plugin(KayakWidgets)
-        .add_plugin(MaterialUIPlugin::<MyUIMaterial>::default())
-        .add_startup_system(startup)
+        .add_plugins((
+            KayakContextPlugin,
+            KayakWidgets,
+            MaterialUIPlugin::<MyUIMaterial>::default(),
+        ))
+        .add_systems(Startup, startup)
         .run()
 }
diff --git a/examples/demo.rs b/examples/demo.rs
@@ -70,9 +70,8 @@ fn update_resource(
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(KayakContextPlugin)
-        .add_plugin(KayakWidgets)
-        .add_startup_system(startup)
-        .add_system(update_resource)
+        .add_plugins((KayakContextPlugin, KayakWidgets))
+        .add_systems(Startup, startup)
+        .add_systems(Update, update_resource)
         .run()
 }
diff --git a/examples/font_size_test.rs b/examples/font_size_test.rs
@@ -54,8 +54,7 @@ fn startup(
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(KayakContextPlugin)
-        .add_plugin(KayakWidgets)
-        .add_startup_system(startup)
+        .add_plugins((KayakContextPlugin, KayakWidgets))
+        .add_systems(Startup, startup)
         .run()
 }
diff --git a/examples/hello_world.rs b/examples/hello_world.rs
@@ -38,8 +38,7 @@ fn startup(
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(KayakContextPlugin)
-        .add_plugin(KayakWidgets)
-        .add_startup_system(startup)
+        .add_plugins((KayakContextPlugin, KayakWidgets))
+        .add_systems(Startup, startup)
         .run()
 }
diff --git a/examples/hello_world_no_macro.rs b/examples/hello_world_no_macro.rs
@@ -49,8 +49,7 @@ fn startup(
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(KayakContextPlugin)
-        .add_plugin(KayakWidgets)
-        .add_startup_system(startup)
+        .add_plugins((KayakContextPlugin, KayakWidgets))
+        .add_systems(Startup, startup)
         .run()
 }
diff --git a/examples/image.rs b/examples/image.rs
@@ -40,8 +40,7 @@ fn startup(
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins.set(ImagePlugin::default_nearest()))
-        .add_plugin(KayakContextPlugin)
-        .add_plugin(KayakWidgets)
-        .add_startup_system(startup)
+        .add_plugins((KayakContextPlugin, KayakWidgets))
+        .add_systems(Startup, startup)
         .run()
 }
diff --git a/examples/layout.rs b/examples/layout.rs
@@ -136,8 +136,7 @@ fn startup(
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(KayakContextPlugin)
-        .add_plugin(KayakWidgets)
-        .add_startup_system(startup)
+        .add_plugins((KayakContextPlugin, KayakWidgets))
+        .add_systems(Startup, startup)
         .run()
 }
diff --git a/examples/main_menu.rs b/examples/main_menu.rs
@@ -215,8 +215,7 @@ fn main() {
     App::new()
         .init_resource::<PreloadResource>()
         .add_plugins(DefaultPlugins.set(ImagePlugin::default_nearest()))
-        .add_plugin(KayakContextPlugin)
-        .add_plugin(KayakWidgets)
-        .add_startup_system(startup)
+        .add_plugins((KayakContextPlugin, KayakWidgets))
+        .add_systems(Startup, startup)
         .run()
 }
diff --git a/examples/modal.rs b/examples/modal.rs
@@ -1,7 +1,11 @@
-use bevy::{prelude::*, reflect::TypeUuid, render::render_resource::AsBindGroup};
+use bevy::{
+    prelude::*,
+    reflect::{TypePath, TypeUuid},
+    render::render_resource::AsBindGroup,
+};
 use kayak_ui::prelude::{widgets::*, *};
 
-#[derive(AsBindGroup, TypeUuid, Debug, Clone)]
+#[derive(AsBindGroup, TypeUuid, TypePath, Debug, Clone)]
 #[uuid = "94c4e6f9-6f10-422c-85ec-6d582d471afc"]
 pub struct MyUIMaterial {}
 impl MaterialUI for MyUIMaterial {
@@ -158,9 +162,11 @@ fn main() {
     App::new()
         .insert_resource(ClearColor(Color::rgb(0.0, 0.0, 0.0)))
         .add_plugins(DefaultPlugins)
-        .add_plugin(KayakContextPlugin)
-        .add_plugin(KayakWidgets)
-        .add_plugin(MaterialUIPlugin::<MyUIMaterial>::default())
-        .add_startup_system(startup)
+        .add_plugins((
+            KayakContextPlugin,
+            KayakWidgets,
+            MaterialUIPlugin::<MyUIMaterial>::default(),
+        ))
+        .add_systems(Startup, startup)
         .run()
 }
diff --git a/examples/nine_patch.rs b/examples/nine_patch.rs
@@ -61,8 +61,7 @@ fn startup(
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins.set(ImagePlugin::default_nearest()))
-        .add_plugin(KayakContextPlugin)
-        .add_plugin(KayakWidgets)
-        .add_startup_system(startup)
+        .add_plugins((KayakContextPlugin, KayakWidgets))
+        .add_systems(Startup, startup)
         .run()
 }
diff --git a/examples/opacity_layers.rs b/examples/opacity_layers.rs
@@ -56,8 +56,7 @@ fn main() {
     App::new()
         .insert_resource(ClearColor(Color::rgb(0.0, 0.0, 0.0)))
         .add_plugins(DefaultPlugins)
-        .add_plugin(KayakContextPlugin)
-        .add_plugin(KayakWidgets)
-        .add_startup_system(startup)
+        .add_plugins((KayakContextPlugin, KayakWidgets))
+        .add_systems(Startup, startup)
         .run()
 }
diff --git a/examples/quads.rs b/examples/quads.rs
@@ -135,10 +135,12 @@ fn startup(
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(LogDiagnosticsPlugin::default())
-        .add_plugin(FrameTimeDiagnosticsPlugin::default())
-        .add_plugin(KayakContextPlugin)
-        .add_plugin(KayakWidgets)
-        .add_startup_system(startup)
+        .add_plugins((
+            LogDiagnosticsPlugin::default(),
+            FrameTimeDiagnosticsPlugin::default(),
+            KayakContextPlugin,
+            KayakWidgets,
+        ))
+        .add_systems(Startup, startup)
         .run()
 }
diff --git a/examples/render_target.rs b/examples/render_target.rs
@@ -182,10 +182,8 @@ fn depsawn_ui(
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(KayakContextPlugin)
-        .add_plugin(KayakWidgets)
-        .add_startup_system(startup)
-        .add_system(cube_rotator_system)
-        .add_system(depsawn_ui)
+        .add_plugins((KayakContextPlugin, KayakWidgets))
+        .add_systems(Startup, startup)
+        .add_systems(Update, (cube_rotator_system, depsawn_ui))
         .run()
 }
diff --git a/examples/scrolling.rs b/examples/scrolling.rs
@@ -70,10 +70,12 @@ fn main() {
     App::new()
         .insert_resource(ClearColor(Color::rgb(0.0, 0.0, 0.0)))
         .add_plugins(DefaultPlugins.set(ImagePlugin::default_nearest()))
-        .add_plugin(LogDiagnosticsPlugin::default())
-        .add_plugin(FrameTimeDiagnosticsPlugin::default())
-        .add_plugin(KayakContextPlugin)
-        .add_plugin(KayakWidgets)
-        .add_startup_system(startup)
+        .add_plugins((
+            KayakContextPlugin,
+            KayakWidgets,
+            LogDiagnosticsPlugin::default(),
+            FrameTimeDiagnosticsPlugin::default(),
+        ))
+        .add_systems(Startup, startup)
         .run()
 }
diff --git a/examples/simple_state.rs b/examples/simple_state.rs
@@ -138,8 +138,7 @@ fn main() {
     App::new()
         .insert_resource(ClearColor(Color::rgb(0.0, 0.0, 0.0)))
         .add_plugins(DefaultPlugins)
-        .add_plugin(KayakContextPlugin)
-        .add_plugin(KayakWidgets)
-        .add_startup_system(startup)
+        .add_plugins((KayakContextPlugin, KayakWidgets))
+        .add_systems(Startup, startup)
         .run()
 }
diff --git a/examples/svg.rs b/examples/svg.rs
@@ -47,9 +47,11 @@ fn main() {
     App::new()
         .insert_resource(Msaa::Sample8)
         .add_plugins(DefaultPlugins.set(ImagePlugin::default_nearest()))
-        .add_plugin(KayakContextPlugin)
-        .add_plugin(KayakWidgets)
-        .add_plugin(bevy_svg::prelude::SvgPlugin)
-        .add_startup_system(startup)
+        .add_plugins((
+            KayakContextPlugin,
+            KayakWidgets,
+            bevy_svg::prelude::SvgPlugin,
+        ))
+        .add_systems(Startup, startup)
         .run()
 }