From bb71d8843d1897c3a6ae8040260b0f844a1d6251 Mon Sep 17 00:00:00 2001
From: Nilirad <gisquerin@gmail.com>
Date: Tue, 29 Oct 2024 16:48:08 +0100
Subject: [PATCH] Adapt changes to `bevy v0.15.0-rc.2`

---
 CHANGELOG.md                |  5 +++++
 Cargo.toml                  |  8 ++++----
 examples/dynamic_shape.rs   | 11 +++++------
 examples/path.rs            |  9 +++------
 examples/readme.rs          |  3 +--
 examples/rounded_polygon.rs |  3 +--
 examples/svg.rs             | 22 ++++++++--------------
 src/entity.rs               | 14 ++++++++------
 src/plugin.rs               |  3 +--
 9 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ce313b..33700b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,9 @@
 # Changelog
+
+## 0.13.0-rc.1
+- Support for Bevy 0.15.0-rc.2.
+- Removed deprecated `SpatialBundle` from `ShapeBundle`: `Transform` and `Visibility` are now added separately.
+
 ## 0.12.0
 - Support for Bevy 0.14.
 
diff --git a/Cargo.toml b/Cargo.toml
index 173d2f0..41f6139 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,12 +8,12 @@ license = "MIT OR Apache-2.0"
 name = "bevy_prototype_lyon"
 readme = "README.md"
 repository = "https://github.com/Nilirad/bevy_prototype_lyon/"
-version = "0.12.0"
+version = "0.13.0-rc.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = { version = "0.14", default-features = false, features = [
+bevy = { version = "0.15.0-rc.2", default-features = false, features = [
 	"bevy_sprite",
 	"bevy_render",
 	"bevy_core_pipeline",
@@ -21,10 +21,10 @@ bevy = { version = "0.14", default-features = false, features = [
 ] }
 lyon_tessellation = "1"
 lyon_algorithms = "1"
-svgtypes = "0.12"
+svgtypes = "0.15"
 
 [dev-dependencies]
-bevy = { version = "0.14", default-features = false, features = [
+bevy = { version = "0.15.0-rc.2", default-features = false, features = [
 	"x11",
 	"bevy_asset",
 ] }
diff --git a/examples/dynamic_shape.rs b/examples/dynamic_shape.rs
index 3e9b741..a272f62 100644
--- a/examples/dynamic_shape.rs
+++ b/examples/dynamic_shape.rs
@@ -5,7 +5,6 @@ use bevy_prototype_lyon::prelude::*;
 
 fn main() {
     App::new()
-        .insert_resource(Msaa::Sample4)
         .add_plugins((DefaultPlugins, ShapePlugin))
         .add_systems(Startup, setup_system)
         .add_systems(Update, change_draw_mode_system)
@@ -18,7 +17,7 @@ fn main() {
 struct ExampleShape;
 
 fn rotate_shape_system(mut query: Query<&mut Transform, With<ExampleShape>>, time: Res<Time>) {
-    let delta = time.delta_seconds();
+    let delta = time.delta_secs();
 
     for mut transform in query.iter_mut() {
         transform.rotate(Quat::from_rotation_z(0.2 * delta));
@@ -26,8 +25,8 @@ fn rotate_shape_system(mut query: Query<&mut Transform, With<ExampleShape>>, tim
 }
 
 fn change_draw_mode_system(mut query: Query<(&mut Fill, &mut Stroke)>, time: Res<Time>) {
-    let hue = (time.elapsed_seconds_f64() * 50.0) % 360.0;
-    let outline_width = 2.0 + time.elapsed_seconds_f64().sin().abs() * 10.0;
+    let hue = (time.elapsed_secs_f64() * 50.0) % 360.0;
+    let outline_width = 2.0 + time.elapsed_secs_f64().sin().abs() * 10.0;
 
     for (mut fill_mode, mut stroke_mode) in query.iter_mut() {
         fill_mode.color = Color::hsl(hue as f32, 1.0, 0.5);
@@ -36,7 +35,7 @@ fn change_draw_mode_system(mut query: Query<(&mut Fill, &mut Stroke)>, time: Res
 }
 
 fn change_number_of_sides(mut query: Query<&mut Path>, time: Res<Time>) {
-    let sides = ((time.elapsed_seconds_f64() - PI * 2.5).sin() * 2.5 + 5.5).round() as usize;
+    let sides = ((time.elapsed_secs_f64() - PI * 2.5).sin() * 2.5 + 5.5).round() as usize;
 
     for mut path in query.iter_mut() {
         let polygon = shapes::RegularPolygon {
@@ -56,7 +55,7 @@ fn setup_system(mut commands: Commands) {
         ..shapes::RegularPolygon::default()
     };
 
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn((Camera2d, Msaa::Sample4));
     commands.spawn((
         ShapeBundle {
             path: GeometryBuilder::build_as(&shape),
diff --git a/examples/path.rs b/examples/path.rs
index 571396c..29143d1 100644
--- a/examples/path.rs
+++ b/examples/path.rs
@@ -3,7 +3,6 @@ use bevy_prototype_lyon::prelude::*;
 
 fn main() {
     App::new()
-        .insert_resource(Msaa::Sample4)
         .add_plugins((DefaultPlugins, ShapePlugin))
         .add_systems(Startup, setup_system)
         .run();
@@ -25,14 +24,12 @@ fn setup_system(mut commands: Commands) {
     path_builder.close();
     let path = path_builder.build();
 
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn((Camera2d, Msaa::Sample4));
     commands.spawn((
         ShapeBundle {
             path,
-            spatial: SpatialBundle {
-                transform: Transform::from_xyz(0., 75., 0.),
-                ..default()
-            },
+            transform: Transform::from_xyz(0., 75., 0.),
+            visibility: default(),
             ..default()
         },
         Stroke::new(BLACK, 10.0),
diff --git a/examples/readme.rs b/examples/readme.rs
index a655b21..4c7b139 100644
--- a/examples/readme.rs
+++ b/examples/readme.rs
@@ -6,7 +6,6 @@ use bevy_prototype_lyon::prelude::*;
 
 fn main() {
     App::new()
-        .insert_resource(Msaa::Sample4)
         .add_plugins((DefaultPlugins, ShapePlugin))
         .add_systems(Startup, setup_system)
         .run();
@@ -19,7 +18,7 @@ fn setup_system(mut commands: Commands) {
         ..shapes::RegularPolygon::default()
     };
 
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn((Camera2d, Msaa::Sample4));
     commands.spawn((
         ShapeBundle {
             path: GeometryBuilder::build_as(&shape),
diff --git a/examples/rounded_polygon.rs b/examples/rounded_polygon.rs
index 5db2947..c48ebfe 100644
--- a/examples/rounded_polygon.rs
+++ b/examples/rounded_polygon.rs
@@ -3,7 +3,6 @@ use bevy_prototype_lyon::prelude::*;
 
 fn main() {
     App::new()
-        .insert_resource(Msaa::Sample4)
         .add_plugins((DefaultPlugins, ShapePlugin))
         .add_systems(Startup, setup_system)
         .run();
@@ -27,7 +26,7 @@ fn setup_system(mut commands: Commands) {
         closed: false,
     };
 
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn((Camera2d, Msaa::Sample4));
     commands.spawn((
         ShapeBundle {
             path: GeometryBuilder::build_as(&shape),
diff --git a/examples/svg.rs b/examples/svg.rs
index 6ecc472..09d1539 100644
--- a/examples/svg.rs
+++ b/examples/svg.rs
@@ -3,8 +3,6 @@ use bevy_prototype_lyon::prelude::*;
 
 fn main() {
     App::new()
-        //Added msaa to reduce aliasing
-        .insert_resource(Msaa::Sample4)
         .add_plugins((DefaultPlugins, ShapePlugin))
         .add_systems(Startup, setup_system)
         .run();
@@ -17,16 +15,14 @@ struct BlacksmithMarker;
 struct ToolShackMarker;
 
 fn setup_system(mut commands: Commands) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn((Camera2d, Msaa::Sample4));
 
     commands
         .spawn((
             Name::new("Blacksmith"),
             BlacksmithMarker,
-            SpatialBundle {
-                transform: Transform::from_translation(Vec3::new(-50., 0., 0.)),
-                ..default()
-            },
+            Transform::from_translation(Vec3::new(-50., 0., 0.)),
+            Visibility::default(),
         ))
         //we split our art in this example to two children because our art is made out of 2 paths,
         //one path who's width is 4,
@@ -60,14 +56,12 @@ fn setup_system(mut commands: Commands) {
         .spawn((
             Name::new("Shack"),
             ToolShackMarker,
-            SpatialBundle {
-                transform: Transform {
-                    translation: Vec3::new(375., 0., 0.),
-                    scale: Vec3::new(0.1, 0.1, 1.),
-                    ..Default::default()
-                },
-                ..default()
+            Transform {
+                translation: Vec3::new(375., 0., 0.),
+                scale: Vec3::new(0.1, 0.1, 1.),
+                ..Default::default()
             },
+            Visibility::default(),
         ))
         //we split our art in this example to two children because our art is made out of 2 paths,
         //one path who's width is 4,
diff --git a/src/entity.rs b/src/entity.rs
index 244a230..182dcaa 100644
--- a/src/entity.rs
+++ b/src/entity.rs
@@ -1,6 +1,6 @@
 //! Custom Bevy ECS bundle for shapes.
 
-use bevy::{prelude::*, sprite::Mesh2dHandle};
+use bevy::prelude::*;
 use lyon_tessellation::{self as tess};
 
 use crate::{geometry::Geometry, plugin::COLOR_MATERIAL_HANDLE};
@@ -10,9 +10,10 @@ use crate::{geometry::Geometry, plugin::COLOR_MATERIAL_HANDLE};
 #[derive(Bundle, Clone)]
 pub struct ShapeBundle {
     pub path: Path,
-    pub mesh: Mesh2dHandle,
-    pub material: Handle<ColorMaterial>,
-    pub spatial: SpatialBundle,
+    pub mesh: Mesh2d,
+    pub material: MeshMaterial2d<ColorMaterial>,
+    pub transform: Transform,
+    pub visibility: Visibility,
 }
 
 impl Default for ShapeBundle {
@@ -20,8 +21,9 @@ impl Default for ShapeBundle {
         Self {
             path: default(),
             mesh: default(),
-            material: COLOR_MATERIAL_HANDLE,
-            spatial: default(),
+            material: MeshMaterial2d(COLOR_MATERIAL_HANDLE),
+            transform: default(),
+            visibility: default(),
         }
     }
 }
diff --git a/src/plugin.rs b/src/plugin.rs
index fca8819..9c8a715 100644
--- a/src/plugin.rs
+++ b/src/plugin.rs
@@ -15,7 +15,6 @@ use bevy::{
     color::palettes,
     prelude::*,
     render::{mesh::Indices, render_asset::RenderAssetUsages, render_resource::PrimitiveTopology},
-    sprite::Mesh2dHandle,
 };
 use lyon_tessellation::{self as tess, BuffersBuilder};
 
@@ -69,7 +68,7 @@ fn mesh_shapes_system(
     mut fill_tess: ResMut<FillTessellator>,
     mut stroke_tess: ResMut<StrokeTessellator>,
     mut query: Query<
-        (Option<&Fill>, Option<&Stroke>, &Path, &mut Mesh2dHandle),
+        (Option<&Fill>, Option<&Stroke>, &Path, &mut Mesh2d),
         Or<(Changed<Path>, Changed<Fill>, Changed<Stroke>)>,
     >,
 ) {