From 56eacdb3583e701cde8cca074e151b24c3fd8df3 Mon Sep 17 00:00:00 2001 From: Nick Senger Date: Thu, 8 Jun 2023 07:47:57 -0700 Subject: comment: cleanup imports --- examples/loading_spinners/src/easing.rs | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'examples/loading_spinners/src/easing.rs') diff --git a/examples/loading_spinners/src/easing.rs b/examples/loading_spinners/src/easing.rs index 04befa15..665b3329 100644 --- a/examples/loading_spinners/src/easing.rs +++ b/examples/loading_spinners/src/easing.rs @@ -1,9 +1,7 @@ -use iced_core::Point; -use lyon::algorithms::measure::PathMeasurements; -use lyon::path::builder::NoAttributes; -use lyon::path::path::BuilderImpl; -use lyon::path::Path; +use iced::Point; +use lyon_algorithms::measure::PathMeasurements; +use lyon_algorithms::path::{builder::NoAttributes, path::BuilderImpl, Path}; use once_cell::sync::Lazy; pub static EMPHASIZED: Lazy = Lazy::new(|| { @@ -56,7 +54,7 @@ impl Easing { pub fn y_at_x(&self, x: f32) -> f32 { let mut sampler = self.measurements.create_sampler( &self.path, - lyon::algorithms::measure::SampleType::Normalized, + lyon_algorithms::measure::SampleType::Normalized, ); let sample = sampler.sample(x); @@ -69,7 +67,7 @@ pub struct Builder(NoAttributes); impl Builder { pub fn new() -> Self { let mut builder = Path::builder(); - builder.begin(lyon::geom::point(0.0, 0.0)); + builder.begin(lyon_algorithms::geom::point(0.0, 0.0)); Self(builder) } @@ -110,7 +108,7 @@ impl Builder { } pub fn build(mut self) -> Easing { - self.0.line_to(lyon::geom::point(1.0, 1.0)); + self.0.line_to(lyon_algorithms::geom::point(1.0, 1.0)); self.0.end(false); let path = self.0.build(); @@ -119,9 +117,12 @@ impl Builder { Easing { path, measurements } } - fn point(p: impl Into) -> lyon::geom::Point { + fn point(p: impl Into) -> lyon_algorithms::geom::Point { let p: Point = p.into(); - lyon::geom::point(p.x.min(1.0).max(0.0), p.y.min(1.0).max(0.0)) + lyon_algorithms::geom::point( + p.x.min(1.0).max(0.0), + p.y.min(1.0).max(0.0), + ) } } -- cgit