v0.14 update

.github/workflows/dependencies.yml

@@ -5,14 +5,14 @@ name: Dependencies
 on:
   pull_request:
     paths:
-      - '**/Cargo.toml'
-      - 'deny.toml'
+      - "**/Cargo.toml"
+      - "deny.toml"
   push:
     paths:
-      - '**/Cargo.toml'
-      - 'deny.toml'
+      - "**/Cargo.toml"
+      - "deny.toml"
     branches-ignore:
-      - 'dependabot/**'
+      - "dependabot/**"
       - staging-squash-merge.tmp
   schedule:
     - cron: "0 0 * * 0"
@@ -26,7 +26,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: master
+          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'master' }}
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable
@@ -40,7 +40,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: master
+          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'master' }}
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable
@@ -54,7 +54,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: master
+          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'master' }}
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable
@@ -68,7 +68,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: master
+          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'master' }}
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable

Cargo.toml

@@ -8,20 +8,21 @@ license = "MIT OR Apache-2.0"
 name = "bevy_prototype_lyon"
 readme = "README.md"
 repository = "https://github.com/Nilirad/bevy_prototype_lyon/"
-version = "0.13.0"
+version = "0.14.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = { version = "0.15.0", default-features = false, features = [
-	"bevy_sprite",
-	"bevy_render",
-	"bevy_core_pipeline",
+bevy = { version = "0.16", default-features = false, features = [
 	"bevy_asset",
+	"bevy_core_pipeline",
+	"bevy_log",
+	"bevy_render",
+	"bevy_sprite",
 ] }
 lyon_tessellation = "1"
 lyon_algorithms = "1"
 svgtypes = "0.15"
 
 [dev-dependencies]
-bevy = "0.15.0"
+bevy = "0.16"

README.md

@@ -63,6 +63,7 @@ The following table shows the latest version of `bevy_prototype_lyon` that suppo
 
 |bevy|bevy_prototype_lyon|license|
 |---|---|---|
+|0.16|0.14|MIT/Apache 2.0|
 |0.15|0.13|MIT/Apache 2.0|
 |0.14|0.12|MIT/Apache 2.0|
 |0.13|0.11|MIT/Apache 2.0|
@@ -82,8 +83,8 @@ The following table shows the latest version of `bevy_prototype_lyon` that suppo
 
 Licensed under either of
 
- * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
- * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
+* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or <http://www.apache.org/licenses/LICENSE-2.0>)
+* MIT license ([LICENSE-MIT](LICENSE-MIT) or <http://opensource.org/licenses/MIT>)
 
 at your option.
 

deny.toml

@@ -5,7 +5,7 @@ version = 2
 db-path = "~/.cargo/advisory-db"
 db-urls = ["https://github.com/rustsec/advisory-db"]
 ignore = [
-  "RUSTSEC-2022-0048", # xml-rs unmaintained
+  "RUSTSEC-2024-0436", # `paste` unmaintained, but is a Bevy dependency
 ]
 yanked = "deny"
 
@@ -23,7 +23,10 @@ allow = [
   "CC0-1.0",
 ]
 exceptions = [
-    { name = "unicode-ident", allow = ["Unicode-DFS-2016", "Unicode-3.0"] },
+  { name = "unicode-ident", allow = [
+    "Unicode-DFS-2016",
+    "Unicode-3.0",
+  ] },
 ]
 
 [[licenses.clarify]]
@@ -32,7 +35,7 @@ license-files = []
 name = "stretch"
 
 [bans]
-multiple-versions = "allow" 
+multiple-versions = "allow"
 wildcards = "allow"
 
 [sources]

examples/dynamic_shape.rs

@@ -1,13 +1,16 @@
 use std::f64::consts::PI;
 
-use bevy::{color::palettes::css::*, prelude::*};
+use bevy::{color::palettes::css::*, input::common_conditions::input_just_pressed, prelude::*};
 use bevy_prototype_lyon::prelude::*;
 
 fn main() {
     App::new()
         .add_plugins((DefaultPlugins, ShapePlugin))
         .add_systems(Startup, setup_system)
-        .add_systems(Update, redraw_shape)
+        .add_systems(
+            Update,
+            redraw_shape.run_if(input_just_pressed(KeyCode::Space)),
+        )
         .add_systems(Update, rotate_shape_system)
         .run();
 }
@@ -34,7 +37,7 @@ fn redraw_shape(mut query: Query<&mut Shape, With<ExampleShape>>, time: Res<Time
         ..shapes::RegularPolygon::default()
     };
 
-    let mut shape = query.single_mut();
+    let mut shape = query.single_mut().expect("Shape entity must always exist");
     *shape = ShapeBuilder::with(&polygon)
         .fill(color)
         .stroke((BLACK, outline_width as f32))

examples/dynamic_stroke_size.rs

@@ -45,7 +45,7 @@ fn rotate_shape_by_size(mut query: Query<(&mut Transform, &Shape)>, time: Res<Ti
 fn redraw_line_width(mut query: Query<&mut Shape, With<HexagonShape>>, time: Res<Time>) {
     let outline_width = 2.0 + time.elapsed_secs_f64().sin().abs() * 10.0;
 
-    let mut shape = query.single_mut();
+    let mut shape = query.single_mut().expect("Shape entity must always exist");
     shape.stroke = shape.stroke.map(|mut s| {
         s.options.line_width = outline_width as f32;
         s
@@ -57,7 +57,7 @@ fn redraw_fill(mut query: Query<&mut Shape, With<TriangleShape>>, time: Res<Time
     let hue = (time.elapsed_secs_f64() * 50.0) % 360.0;
     let color = Color::hsl(hue as f32, 1.0, 0.5);
 
-    let mut shape = query.single_mut();
+    let mut shape = query.single_mut().expect("Shape entity must always exist");
     shape.fill = shape.fill.map(|mut f| {
         f.color = color;
         f

src/entity.rs

@@ -39,7 +39,7 @@ impl Default for ShapeBundle {
 ///
 /// It can be constructed using `ShapeBuilder`.
 #[derive(Component, Default, Clone)]
-#[require(Mesh2d, MeshMaterial2d<ColorMaterial>(color_material_handle), Transform, Visibility)]
+#[require(Mesh2d, MeshMaterial2d<ColorMaterial> = color_material_handle(), Transform, Visibility)]
 #[non_exhaustive]
 pub struct Shape {
     /// Geometry of a shape.

src/path.rs

@@ -135,5 +135,5 @@ fn match_action(action: Action, b: &mut WithSvg<BuilderImpl>) {
         Action::Close => {
             b.close();
         }
-    };
+    }
 }

src/plugin.rs

@@ -4,6 +4,7 @@
 //! boilerplate.
 
 use bevy::{
+    asset::weak_handle,
     prelude::*,
     render::{mesh::Indices, render_asset::RenderAssetUsages, render_resource::PrimitiveTopology},
 };
@@ -16,7 +17,7 @@ use crate::{
 };
 
 pub(crate) const COLOR_MATERIAL_HANDLE: Handle<ColorMaterial> =
-    Handle::weak_from_u128(0x7CC6_61A1_0CD6_C147_129A_2C01_882D_9580);
+    weak_handle!("7cc661a1-0cd6-c147-129a-2c01882d9580");
 
 /// A plugin that provides resources and a system to draw shapes in Bevy with
 /// less boilerplate.

src/shapes/svg.rs

@@ -43,7 +43,7 @@ pub struct SvgPathShape {
     pub svg_path_string: String,
 }
 fn get_y_in_bevy_orientation(y: f64) -> f32 {
-    y as f32 * -1.
+    -(y as f32)
 }
 fn get_y_after_offset(y: f64, offset_y: f32) -> f32 {
     get_y_in_bevy_orientation(y) + offset_y