Update code after changes of systems api in bevy (#208)

Breaking changes were introduced in bevyengine/bevy#8079
Nilirad · Mar 23, 2023 · 057f3e8 · 057f3e8
1 parent df25ab3
commit 057f3e8
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ fn main() {
         .insert_resource(Msaa::Sample4)
         .add_plugins(DefaultPlugins)
         .add_plugin(ShapePlugin)
-        .add_startup_system(setup_system)
+        .add_systems(Startup, setup_system)
         .run();
 }
 

diff --git a/examples/dynamic_shape.rs b/examples/dynamic_shape.rs
@@ -8,10 +8,10 @@ fn main() {
         .insert_resource(Msaa::Sample4)
         .add_plugins(DefaultPlugins)
         .add_plugin(ShapePlugin)
-        .add_startup_system(setup_system)
-        .add_system(change_draw_mode_system)
-        .add_system(change_number_of_sides)
-        .add_system(rotate_shape_system)
+        .add_systems(Startup, setup_system)
+        .add_systems(Update, change_draw_mode_system)
+        .add_systems(Update, change_number_of_sides)
+        .add_systems(Update, rotate_shape_system)
         .run();
 }
 

diff --git a/examples/path.rs b/examples/path.rs
@@ -6,7 +6,7 @@ fn main() {
         .insert_resource(Msaa::Sample4)
         .add_plugins(DefaultPlugins)
         .add_plugin(ShapePlugin)
-        .add_startup_system(setup_system)
+        .add_systems(Startup, setup_system)
         .run();
 }
 

diff --git a/examples/readme.rs b/examples/readme.rs
@@ -9,7 +9,7 @@ fn main() {
         .insert_resource(Msaa::Sample4)
         .add_plugins(DefaultPlugins)
         .add_plugin(ShapePlugin)
-        .add_startup_system(setup_system)
+        .add_systems(Startup, setup_system)
         .run();
 }
 

diff --git a/examples/rounded_polygon.rs b/examples/rounded_polygon.rs
@@ -6,7 +6,7 @@ fn main() {
         .insert_resource(Msaa::Sample4)
         .add_plugins(DefaultPlugins)
         .add_plugin(ShapePlugin)
-        .add_startup_system(setup_system)
+        .add_systems(Startup, setup_system)
         .run();
 }
 

diff --git a/examples/svg.rs b/examples/svg.rs
@@ -7,7 +7,7 @@ fn main() {
         .insert_resource(Msaa::Sample4)
         .add_plugins(DefaultPlugins)
         .add_plugin(ShapePlugin)
-        .add_startup_system(setup_system)
+        .add_systems(Startup, setup_system)
         .run();
 }
 

diff --git a/src/plugin.rs b/src/plugin.rs
@@ -19,7 +19,9 @@ use bevy::{
         system::{Query, ResMut, Resource},
     },
     log::error,
-    prelude::{Color, CoreSet, Deref, DerefMut, IntoSystemConfig, IntoSystemSetConfig, SystemSet},
+    prelude::{
+        Color, Deref, DerefMut, IntoSystemConfigs, IntoSystemSetConfig, PostUpdate, SystemSet,
+    },
     render::{
         mesh::{Indices, Mesh},
         render_resource::PrimitiveTopology,
@@ -46,17 +48,16 @@ impl Plugin for ShapePlugin {
         app.insert_resource(FillTessellator(fill_tess))
             .insert_resource(StrokeTessellator(stroke_tess))
             .configure_set(
-                BuildShapes
-                    .in_base_set(CoreSet::PostUpdate)
-                    .after(bevy::transform::TransformSystem::TransformPropagate),
+                PostUpdate,
+                BuildShapes.after(bevy::transform::TransformSystem::TransformPropagate),
             )
-            .add_system(mesh_shapes_system.in_set(BuildShapes))
+            .add_systems(PostUpdate, mesh_shapes_system.in_set(BuildShapes))
             .add_plugin(ShapeMaterialPlugin);
     }
 }
 
-/// [`SystemLabel`] for the system that builds the meshes for newly-added
-/// or changed shapes. Resides in [`PostUpdate`](CoreStage::PostUpdate).
+/// [`SystemSet`] for the system that builds the meshes for newly-added
+/// or changed shapes. Resides in [`PostUpdate`] schedule.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, SystemSet)]
 pub struct BuildShapes;