From 5a9f4d04946dfcb05e66ae17d2b0bdf1ca4891ae Mon Sep 17 00:00:00 2001
From: NiseVoid <nisevoid@gmail.com>
Date: Mon, 10 Jul 2023 01:50:28 +0200
Subject: [PATCH] Fix examples
---
examples/avsb.rs | 12 +++++++-----
examples/bevy_scene.rs | 19 +++++++++++--------
examples/box_shadows.rs | 5 ++---
examples/clipping.rs | 5 ++---
examples/conditional_widget.rs | 5 ++---
examples/context.rs | 5 ++---
examples/custom_shader.rs | 18 ++++++++++++------
examples/demo.rs | 7 +++----
examples/font_size_test.rs | 5 ++---
examples/hello_world.rs | 5 ++---
examples/hello_world_no_macro.rs | 5 ++---
examples/image.rs | 5 ++---
examples/layout.rs | 5 ++---
examples/modal.rs | 18 ++++++++++++------
examples/nine_patch.rs | 5 ++---
examples/opacity_layers.rs | 5 ++---
examples/quads.rs | 12 +++++++-----
examples/render_target.rs | 8 +++-----
examples/scrolling.rs | 12 +++++++-----
examples/simple_state.rs | 5 ++---
examples/svg.rs | 10 ++++++----
examples/tabs/tabs.rs | 5 ++---
examples/test_no_startup.rs | 7 +++----
examples/text.rs | 7 +++----
examples/text_box.rs | 5 ++---
examples/texture_atlas.rs | 5 ++---
examples/todo/todo.rs | 10 ++++++----
examples/transitions.rs | 12 +++++++-----
examples/vec.rs | 5 ++---
29 files changed, 119 insertions(+), 113 deletions(-)
diff --git a/examples/avsb.rs b/examples/avsb.rs
index 30efc51..46bcb9d 100644
--- 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
index f6d4064..4628606 100644
--- 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
index 0f7dab1..400c83e 100644
--- 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
index c53e46c..9c6c7ac 100644
--- 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
index fb010a4..04b8b5b 100644
--- 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
index db24c81..28c4f0e 100644
--- 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
index 288c09d..9ddd463 100644
--- 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
index 7bd8842..eecc2df 100644
--- 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
index 84622da..39626c7 100644
--- 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
index 188504e..741a22e 100644
--- 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
index b67b5cb..46a55aa 100644
--- 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
index 40c7edb..089cab7 100644
--- 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
index f2a0e84..ee0950c 100644
--- 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/modal.rs b/examples/modal.rs
index 5d621de..a3907ca 100644
--- 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
index ea211a7..5c5b793 100644
--- 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
index 5edfb0c..0ed151d 100644
--- 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
index 1c95b8d..44ec9b7 100644
--- 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
index 52be41b..484b00c 100644
--- 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
index 5d93e0b..4b52d26 100644
--- 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
index e04d165..0cc77fe 100644
--- 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
index e00666f..880223b 100644
--- 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()
}
diff --git a/examples/tabs/tabs.rs b/examples/tabs/tabs.rs
index a695448..399d771 100644
--- a/examples/tabs/tabs.rs
+++ b/examples/tabs/tabs.rs
@@ -95,8 +95,7 @@ fn main() {
.insert_resource(ClearColor(Color::rgb(0.0, 0.0, 0.0)))
.add_plugins(DefaultPlugins)
// .add_plugin(bevy_inspector_egui::quick::WorldInspectorPlugin::new())
- .add_plugin(KayakContextPlugin)
- .add_plugin(KayakWidgets)
- .add_startup_system(startup)
+ .add_plugins((KayakContextPlugin, KayakWidgets))
+ .add_systems(Startup, startup)
.run()
}
diff --git a/examples/test_no_startup.rs b/examples/test_no_startup.rs
index 503a4ed..eaddf1e 100644
--- a/examples/test_no_startup.rs
+++ b/examples/test_no_startup.rs
@@ -44,10 +44,9 @@ fn second_sys(
fn main() {
App::new()
.add_plugins(DefaultPlugins)
- .add_plugin(KayakContextPlugin)
- .add_plugin(KayakWidgets)
+ .add_plugins((KayakContextPlugin, KayakWidgets))
.add_state::<GameState>()
- .add_system(first_sys.in_schedule(OnEnter(GameState::First)))
- .add_system(second_sys.in_schedule(OnEnter(GameState::Second)))
+ .add_systems(OnEnter(GameState::First), first_sys)
+ .add_systems(OnEnter(GameState::Second), second_sys)))
.run();
}
diff --git a/examples/text.rs b/examples/text.rs
index b789465..a405788 100644
--- a/examples/text.rs
+++ b/examples/text.rs
@@ -109,10 +109,9 @@ fn update_resource(keyboard_input: Res<Input<KeyCode>>, mut my_resource: ResMut<
fn main() {
App::new()
.add_plugins(DefaultPlugins)
- .add_plugin(KayakContextPlugin)
- .add_plugin(KayakWidgets)
+ .add_plugins((KayakContextPlugin, KayakWidgets))
.insert_resource(MyResource(1))
- .add_startup_system(startup)
- .add_system(update_resource)
+ .add_systems(Startup, startup)
+ .add_systems(Update, update_resource)
.run()
}
diff --git a/examples/text_box.rs b/examples/text_box.rs
index 5760c35..0a4d432 100644
--- a/examples/text_box.rs
+++ b/examples/text_box.rs
@@ -128,8 +128,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/texture_atlas.rs b/examples/texture_atlas.rs
index 69f7d7d..8880711 100644
--- a/examples/texture_atlas.rs
+++ b/examples/texture_atlas.rs
@@ -78,8 +78,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/todo/todo.rs b/examples/todo/todo.rs
index 125e43b..8b4fd1d 100644
--- a/examples/todo/todo.rs
+++ b/examples/todo/todo.rs
@@ -107,10 +107,12 @@ fn main() {
App::new()
.insert_resource(ClearColor(Color::rgb(0.0, 0.0, 0.0)))
.add_plugins(DefaultPlugins)
- .add_plugin(WorldInspectorPlugin::default())
- .add_plugin(KayakContextPlugin)
- .add_plugin(KayakWidgets)
+ .add_plugins((
+ KayakContextPlugin,
+ KayakWidgets,
+ WorldInspectorPlugin::default(),
+ ))
.insert_resource(TodoList::new())
- .add_startup_system(startup)
+ .add_systems(Startup, startup)
.run()
}
diff --git a/examples/transitions.rs b/examples/transitions.rs
index 1f5bd0b..41e24e6 100644
--- a/examples/transitions.rs
+++ b/examples/transitions.rs
@@ -176,10 +176,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((
+ KayakContextPlugin,
+ KayakWidgets,
+ LogDiagnosticsPlugin::default(),
+ FrameTimeDiagnosticsPlugin::default(),
+ ))
+ .add_systems(Startup, startup)
.run()
}
diff --git a/examples/vec.rs b/examples/vec.rs
index 066841f..d16c34a 100644
--- a/examples/vec.rs
+++ b/examples/vec.rs
@@ -84,8 +84,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()
}
--
GitLab