Merge pull request #683 from hecrj/lyon-0.17

Update `lyon` to `0.17` in `iced_graphics`

4 files changed, 54 insertions, 51 deletions

diff --git a/graphics/Cargo.toml b/graphics/Cargo.toml
index ea9471c6..15aac4ed 100644
--- a/graphics/Cargo.toml
+++ b/graphics/Cargo.toml
@@ -36,7 +36,7 @@ version = "0.3"
 path = "../style"
 
 [dependencies.lyon]
-version = "0.16"
+version = "0.17"
 optional = true
 
 [dependencies.qrcode]
diff --git a/graphics/src/widget/canvas/frame.rs b/graphics/src/widget/canvas/frame.rs
index 5af9d11f..4873e7fb 100644
--- a/graphics/src/widget/canvas/frame.rs
+++ b/graphics/src/widget/canvas/frame.rs
@@ -5,15 +5,19 @@ use crate::{
     triangle, Primitive,
 };
 
+use lyon::tessellation;
+
 /// The frame of a [`Canvas`].
 ///
 /// [`Canvas`]: crate::widget::Canvas
-#[derive(Debug)]
+#[allow(missing_debug_implementations)]
 pub struct Frame {
     size: Size,
     buffers: lyon::tessellation::VertexBuffers<triangle::Vertex2D, u32>,
     primitives: Vec<Primitive>,
     transforms: Transforms,
+    fill_tessellator: tessellation::FillTessellator,
+    stroke_tessellator: tessellation::StrokeTessellator,
 }
 
 #[derive(Debug)]
@@ -45,6 +49,8 @@ impl Frame {
                     is_identity: true,
                 },
             },
+            fill_tessellator: tessellation::FillTessellator::new(),
+            stroke_tessellator: tessellation::StrokeTessellator::new(),
         }
     }
 
@@ -75,26 +81,30 @@ impl Frame {
     /// Draws the given [`Path`] on the [`Frame`] by filling it with the
     /// provided style.
     pub fn fill(&mut self, path: &Path, fill: impl Into<Fill>) {
-        use lyon::tessellation::{
-            BuffersBuilder, FillOptions, FillTessellator,
-        };
-
         let Fill { color, rule } = fill.into();
 
-        let mut buffers = BuffersBuilder::new(
+        let mut buffers = tessellation::BuffersBuilder::new(
             &mut self.buffers,
             FillVertex(color.into_linear()),
         );
 
-        let mut tessellator = FillTessellator::new();
-        let options = FillOptions::default().with_fill_rule(rule.into());
+        let options =
+            tessellation::FillOptions::default().with_fill_rule(rule.into());
 
         let result = if self.transforms.current.is_identity {
-            tessellator.tessellate_path(path.raw(), &options, &mut buffers)
+            self.fill_tessellator.tessellate_path(
+                path.raw(),
+                &options,
+                &mut buffers,
+            )
         } else {
             let path = path.transformed(&self.transforms.current.raw);
 
-            tessellator.tessellate_path(path.raw(), &options, &mut buffers)
+            self.fill_tessellator.tessellate_path(
+                path.raw(),
+                &options,
+                &mut buffers,
+            )
         };
 
         let _ = result.expect("Tessellate path");
@@ -108,11 +118,9 @@ impl Frame {
         size: Size,
         fill: impl Into<Fill>,
     ) {
-        use lyon::tessellation::{BuffersBuilder, FillOptions};
-
         let Fill { color, rule } = fill.into();
 
-        let mut buffers = BuffersBuilder::new(
+        let mut buffers = tessellation::BuffersBuilder::new(
             &mut self.buffers,
             FillVertex(color.into_linear()),
         );
@@ -127,42 +135,49 @@ impl Frame {
                 lyon::math::Vector::new(size.width, size.height),
             );
 
-        let _ = lyon::tessellation::basic_shapes::fill_rectangle(
-            &lyon::math::Rect::new(top_left, size.into()),
-            &FillOptions::default().with_fill_rule(rule.into()),
-            &mut buffers,
-        )
-        .expect("Fill rectangle");
+        let options =
+            tessellation::FillOptions::default().with_fill_rule(rule.into());
+
+        let _ = self
+            .fill_tessellator
+            .tessellate_rectangle(
+                &lyon::math::Rect::new(top_left, size.into()),
+                &options,
+                &mut buffers,
+            )
+            .expect("Fill rectangle");
     }
 
     /// Draws the stroke of the given [`Path`] on the [`Frame`] with the
     /// provided style.
     pub fn stroke(&mut self, path: &Path, stroke: impl Into<Stroke>) {
-        use lyon::tessellation::{
-            BuffersBuilder, StrokeOptions, StrokeTessellator,
-        };
-
         let stroke = stroke.into();
 
-        let mut buffers = BuffersBuilder::new(
+        let mut buffers = tessellation::BuffersBuilder::new(
             &mut self.buffers,
             StrokeVertex(stroke.color.into_linear()),
         );
 
-        let mut tessellator = StrokeTessellator::new();
-
-        let mut options = StrokeOptions::default();
+        let mut options = tessellation::StrokeOptions::default();
         options.line_width = stroke.width;
         options.start_cap = stroke.line_cap.into();
         options.end_cap = stroke.line_cap.into();
         options.line_join = stroke.line_join.into();
 
         let result = if self.transforms.current.is_identity {
-            tessellator.tessellate_path(path.raw(), &options, &mut buffers)
+            self.stroke_tessellator.tessellate_path(
+                path.raw(),
+                &options,
+                &mut buffers,
+            )
         } else {
             let path = path.transformed(&self.transforms.current.raw);
 
-            tessellator.tessellate_path(path.raw(), &options, &mut buffers)
+            self.stroke_tessellator.tessellate_path(
+                path.raw(),
+                &options,
+                &mut buffers,
+            )
         };
 
         let _ = result.expect("Stroke path");
@@ -282,28 +297,15 @@ impl Frame {
 
 struct FillVertex([f32; 4]);
 
-impl lyon::tessellation::BasicVertexConstructor<triangle::Vertex2D>
-    for FillVertex
-{
-    fn new_vertex(
-        &mut self,
-        position: lyon::math::Point,
-    ) -> triangle::Vertex2D {
-        triangle::Vertex2D {
-            position: [position.x, position.y],
-            color: self.0,
-        }
-    }
-}
-
 impl lyon::tessellation::FillVertexConstructor<triangle::Vertex2D>
     for FillVertex
 {
     fn new_vertex(
         &mut self,
-        position: lyon::math::Point,
-        _attributes: lyon::tessellation::FillAttributes<'_>,
+        vertex: lyon::tessellation::FillVertex<'_>,
     ) -> triangle::Vertex2D {
+        let position = vertex.position();
+
         triangle::Vertex2D {
             position: [position.x, position.y],
             color: self.0,
@@ -318,9 +320,10 @@ impl lyon::tessellation::StrokeVertexConstructor<triangle::Vertex2D>
 {
     fn new_vertex(
         &mut self,
-        position: lyon::math::Point,
-        _attributes: lyon::tessellation::StrokeAttributes<'_, '_>,
+        vertex: lyon::tessellation::StrokeVertex<'_, '_>,
     ) -> triangle::Vertex2D {
+        let position = vertex.position();
+
         triangle::Vertex2D {
             position: [position.x, position.y],
             color: self.0,
diff --git a/graphics/src/widget/canvas/path.rs b/graphics/src/widget/canvas/path.rs
index 6de19321..4e4fd734 100644
--- a/graphics/src/widget/canvas/path.rs
+++ b/graphics/src/widget/canvas/path.rs
@@ -62,7 +62,7 @@ impl Path {
         transform: &lyon::math::Transform,
     ) -> Path {
         Path {
-            raw: self.raw.transformed(transform),
+            raw: self.raw.clone().transformed(transform),
         }
     }
 }
diff --git a/graphics/src/widget/canvas/path/builder.rs b/graphics/src/widget/canvas/path/builder.rs
index 5ce0e02c..d04dbdde 100644
--- a/graphics/src/widget/canvas/path/builder.rs
+++ b/graphics/src/widget/canvas/path/builder.rs
@@ -1,14 +1,14 @@
 use crate::canvas::path::{arc, Arc, Path};
 
 use iced_native::{Point, Size};
-use lyon::path::builder::{Build, FlatPathBuilder, PathBuilder, SvgBuilder};
+use lyon::path::builder::SvgPathBuilder;
 
 /// A [`Path`] builder.
 ///
 /// Once a [`Path`] is built, it can no longer be mutated.
 #[allow(missing_debug_implementations)]
 pub struct Builder {
-    raw: lyon::path::builder::SvgPathBuilder<lyon::path::Builder>,
+    raw: lyon::path::builder::WithSvg<lyon::path::path::Builder>,
 }
 
 impl Builder {