Enable non-linear easing

.typos.toml

@@ -8,7 +8,7 @@
 
 # Match Identifier - Case Sensitive
 [default.extend-identifiers]
-t1_iy = "t1_iy"
+t0_iy = "t0_iy"
 tranform_before_mask_deprecated = "tranform_before_mask_deprecated"
 
 # Match Inside a Word - Case Insensitive

CHANGELOG.md

@@ -12,6 +12,14 @@ Subheadings to categorize changes are `added, changed, deprecated, removed, fixe
 
 This release has an [MSRV][] of 1.75.
 
+## [0.3.1]  - 2024-11-11
+
+This release has an [MSRV][] of 1.75.
+
+### Fixed
+
+- Non-linear easing is now correctly interpolated ([#42] by [@atoktoto])
+
 ## [0.3.0]  - 2024-07-04
 
 This release has an [MSRV][] of 1.75.
@@ -52,10 +60,12 @@ This release has an [MSRV][] of 1.75.
 [@luke1188]: https://github.com/luke1188
 [@MarijnS95]: https://github.com/MarijnS95
 [@simbleau]: https://github.com/simbleau
+[@atoktoto]: https://github.com/atoktoto
 
 [#16]: https://github.com/linebender/velato/pull/16
 [#17]: https://github.com/linebender/velato/pull/17
 [#19]: https://github.com/linebender/velato/pull/19
+[#42]: https://github.com/linebender/velato/pull/42
 
 [Unreleased]: https://github.com/linebender/velato/compare/v0.3.0...HEAD
 [0.3.0]: https://github.com/linebender/velato/compare/v0.2.0...v0.3.0

Cargo.toml

@@ -4,7 +4,7 @@ members = ["examples/with_winit", "examples/run_wasm", "examples/scenes"]
 
 [workspace.package]
 edition = "2021"
-version = "0.3.0"
+version = "0.3.1"
 license = "Apache-2.0 OR MIT"
 repository = "https://github.com/linebender/velato"
 # Keep in sync with RUST_MIN_VER in .github/workflows/ci.yml, with the relevant README.md files

src/runtime/model/value.rs

@@ -120,10 +120,10 @@ impl Time {
         let t0 = times[ix0];
         let t1 = times[ix1];
         let (t0_ox, t0_oy) = t0.out_tangent.map(|o| (o.x, o.y)).unwrap_or((0.0, 0.0));
-        let (t1_ix, t1_iy) = t1.in_tangent.map(|i| (i.x, i.y)).unwrap_or((1.0, 1.0));
+        let (t0_ix, t0_iy) = t0.in_tangent.map(|i| (i.x, i.y)).unwrap_or((1.0, 1.0));
         let easing = Easing {
             o: EasingHandle { x: t0_ox, y: t0_oy },
-            i: EasingHandle { x: t1_ix, y: t1_iy },
+            i: EasingHandle { x: t0_ix, y: t0_iy },
         };
         let hold = t0.hold;
         let t = (frame - t0.frame) / (t1.frame - t0.frame);
@@ -160,20 +160,16 @@ pub trait Tween: Clone + Default {
 }
 
 impl Tween for f64 {
-    fn tween(&self, other: &Self, t: f64, _easing: &Easing) -> Self {
-        // TODO: We are enforcing linear interpolation for now, but a decent amount of work is done for easings.
-        keyframe::ease(keyframe::functions::Linear, *self, *other, t)
-
-        // FIXME: Hopefully we can finish this up one day!
-        //keyframe::ease(
-        //    keyframe::functions::BezierCurve::from(
-        //        keyframe::mint::Vector2::from_slice(&[easing.o.x, easing.o.y]),
-        //        keyframe::mint::Vector2::from_slice(&[easing.i.x, easing.i.y]),
-        //    ),
-        //    *self,
-        //    *other,
-        //    t,
-        //)
+    fn tween(&self, other: &Self, t: f64, easing: &Easing) -> Self {
+        keyframe::ease(
+            keyframe::functions::BezierCurve::from(
+                keyframe::mint::Vector2::from_slice(&[easing.o.x, easing.o.y]),
+                keyframe::mint::Vector2::from_slice(&[easing.i.x, easing.i.y]),
+            ),
+            *self,
+            *other,
+            t,
+        )
     }
 }