From eed2db4528752490cb65aab27dd757afe78590c5 Mon Sep 17 00:00:00 2001
From: julia <fabianpaci@protonmail.com>
Date: Thu, 20 Jun 2024 18:44:24 +1000
Subject: [PATCH] apply suggestions

---
 src/bezpath.rs | 23 +++++++++++++++++------
 src/circle.rs  |  8 ++++----
 src/head.rs    | 11 ++++++-----
 src/lib.rs     | 22 +++++++---------------
 src/line.rs    |  6 +++---
 src/rect.rs    | 12 +++++++++---
 6 files changed, 46 insertions(+), 36 deletions(-)

diff --git a/src/bezpath.rs b/src/bezpath.rs
index 18c8c2c..6b95ee1 100644
--- a/src/bezpath.rs
+++ b/src/bezpath.rs
@@ -141,14 +141,25 @@ fn interp_pathel(p0: kurbo::Point, pathel: kurbo::PathEl, t: f32) -> kurbo::Path
 }
 
 impl VectorBorder for VelloBezPath {
-    fn border_translation(&self, _time: f32) -> DVec2 {
+    fn border_translation(&self, time: f64) -> DVec2 {
         // TODO: def should not unwrap here
-        let p = self.path.iter().last().unwrap().end_point().unwrap_or_default().to_vec2();
-
-        DVec2::new(p.x, p.y)
+        let first = self.path.elements()[0]
+            .end_point()
+            .unwrap_or_default()
+            .to_vec2();
+        let last = self
+            .path
+            .iter()
+            .last()
+            .unwrap()
+            .end_point()
+            .unwrap_or_default()
+            .to_vec2();
+
+        DVec2::new(first.x, first.y).lerp(DVec2::new(last.x, last.y), time)
     }
 
-    fn border_tangent(&self, _time: f32) -> f64 {
-        self.border_translation(f32::default()).to_angle()
+    fn border_tangent(&self, time: f64) -> f64 {
+        self.border_translation(time).to_angle()
     }
 }
diff --git a/src/circle.rs b/src/circle.rs
index 5742255..597a804 100644
--- a/src/circle.rs
+++ b/src/circle.rs
@@ -28,11 +28,11 @@ impl VelloVector for VelloCircle {
 }
 
 impl VectorBorder for VelloCircle {
-    fn border_translation(&self, _time: f32) -> DVec2 {
-        DVec2::new(0.0, self.radius)
+    fn border_translation(&self, time: f64) -> DVec2 {
+        DVec2::new(0.0, self.radius).lerp(DVec2::new(0.0, 0.0), time)
     }
 
-    fn border_tangent(&self, _time: f32) -> f64 {
-        0.0
+    fn border_tangent(&self, time: f64) -> f64 {
+        self.border_translation(time).to_angle()
     }
 }
diff --git a/src/head.rs b/src/head.rs
index be12e0a..9575ad1 100644
--- a/src/head.rs
+++ b/src/head.rs
@@ -8,8 +8,9 @@ pub struct ShapeId(Uuid);
 #[derive(Component, Default, Copy, Clone)]
 pub struct Head {
     pub shape_id: ShapeId,
+    pub time: f64,
 
-    pub scale: f32,
+    pub scale: f64,
     pub offset: f32,
     pub rotation_offset: f32,
 }
@@ -20,8 +21,8 @@ pub struct Shapes {
 }
 
 pub trait VectorBorder {
-    /// translation of the chosen "apex"
-    fn border_translation(&self, time: f32) -> DVec2;
-    /// gradient of the tangent to the border
-    fn border_tangent(&self, time: f32) -> f64;
+    /// Translation of the of the border at a specific `time` value.
+    fn border_translation(&self, time: f64) -> DVec2;
+    /// The gradient of the tangent to the border at a specific `time` value.
+    fn border_tangent(&self, time: f64) -> f64;
 }
diff --git a/src/lib.rs b/src/lib.rs
index 651915f..c45341c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -39,10 +39,6 @@ impl Plugin for VelloGraphicsPlugin {
                 build_vector::<VelloCircle>(),
                 build_vector::<VelloLine>(),
                 build_vector::<VelloBezPath>(),
-                build_head::<VelloRect>(),
-                build_head::<VelloCircle>(),
-                build_head::<VelloLine>(),
-                build_head::<VelloBezPath>(),
             ),
         );
     }
@@ -74,19 +70,18 @@ pub trait VelloVector {
     }
 }
 
-pub(crate) fn build_vector<Vector: VelloVector + Component>() -> SystemConfigs {
+pub(crate) fn build_vector<Vector: VelloVector + Component + VectorBorder>() -> SystemConfigs {
     (
+        // vector
         build_fill_only_vector::<Vector>,
         build_stroke_only_vector::<Vector>,
         build_fill_and_stroke_vector::<Vector>,
+        // head
+        append_heads::<Vector>,
     )
         .into_configs()
 }
 
-pub(crate) fn build_head<HeadEquipt: VelloVector + VectorBorder + Component>() -> SystemConfigs {
-    append_heads::<HeadEquipt>.into_configs()
-}
-
 #[allow(clippy::type_complexity)]
 fn append_heads<HeadEquipt: VelloVector + VectorBorder + Component>(
     mut q_vectors: Query<
@@ -94,20 +89,17 @@ fn append_heads<HeadEquipt: VelloVector + VectorBorder + Component>(
         (Without<Stroke>, Or<(Changed<HeadEquipt>, Changed<Fill>)>),
     >,
     shapes: Res<Shapes>,
-    time: Res<Time>,
 ) {
-    let time = time.elapsed_seconds();
-
     for (vector, head, mut scene) in q_vectors.iter_mut() {
-        let translation = vector.border_translation(time);
+        let translation = vector.border_translation(head.time);
         let translation = kurbo::Vec2::new(translation.x, translation.y);
-        let tangent = vector.border_tangent(time);
+        let tangent = vector.border_tangent(head.time);
         let rotation = tangent.atan();
 
         let transform = kurbo::Affine::default()
             .with_translation(translation)
             .then_rotate(rotation)
-            .then_scale(head.scale as f64);
+            .then_scale(head.scale);
 
         let head_scene = shapes.scenes.get(&head.shape_id);
         if let Some(head_scene) = head_scene {
diff --git a/src/line.rs b/src/line.rs
index c3808b0..e2d4aa9 100644
--- a/src/line.rs
+++ b/src/line.rs
@@ -44,11 +44,11 @@ impl VelloVector for VelloLine {
 }
 
 impl VectorBorder for VelloLine {
-    fn border_translation(&self, _time: f32) -> DVec2 {
-        self.p1
+    fn border_translation(&self, time: f64) -> DVec2 {
+        self.p0.lerp(self.p1, time)
     }
 
-    fn border_tangent(&self, _time: f32) -> f64 {
+    fn border_tangent(&self, _time: f64) -> f64 {
         (self.p1.y - self.p0.y) / (self.p1.x - self.p0.x)
     }
 }
diff --git a/src/rect.rs b/src/rect.rs
index 645bd02..6265367 100644
--- a/src/rect.rs
+++ b/src/rect.rs
@@ -50,11 +50,17 @@ impl VelloVector for VelloRect {
 }
 
 impl VectorBorder for VelloRect {
-    fn border_translation(&self, _time: f32) -> DVec2 {
-        DVec2::new(self.anchor.x, (1.0 - self.anchor.y) * self.size.y)
+    fn border_translation(&self, time: f64) -> DVec2 {
+        DVec2::new(-self.size.x * self.anchor.x, -self.size.y * self.anchor.y).lerp(
+            DVec2::new(
+                self.size.x * (1.0 - self.anchor.x),
+                self.size.y * (1.0 - self.anchor.y),
+            ),
+            time,
+        )
     }
 
-    fn border_tangent(&self, _time: f32) -> f64 {
+    fn border_tangent(&self, _time: f64) -> f64 {
         0.0
     }
 }