Update to Vello 0.3, Peniko 0.2 (#37)

Author: waywardmonkeys

Cargo.lock

@@ -28,9 +28,9 @@ vello = ["dep:vello"]
 [dependencies]
 hashbrown = "0.15.1"
 keyframe = { version = "1.1.1", default-features = false, features = ["mint_types"] }
-kurbo = { version = "0.11", default-features = false }
-peniko = { version = "0.1.1", default-features = false }
-vello = { version = "0.2.0", default-features = false, optional = true }
+kurbo = { version = "0.11.1", default-features = false }
+peniko = { version = "0.2.0", default-features = false }
+vello = { version = "0.3.0", default-features = false, optional = true }
 
 [lints]
 rust.unsafe_code = "forbid"

Cargo.toml

@@ -407,7 +407,7 @@ impl Brush {
     /// Evaluates the animation at the specified time.
     pub fn evaluate(&self, alpha: f64, frame: f64) -> fixed::Brush {
         match self {
-            Self::Solid(value) => value.evaluate(frame).with_alpha_factor(alpha as f32).into(),
+            Self::Solid(value) => value.evaluate(frame).multiply_alpha(alpha as f32).into(),
             Self::Gradient(value) => value.evaluate(frame),
         }
     }

src/animated.rs

@@ -59,26 +59,3 @@ impl Repeater {
             * Affine::translate((-self.anchor_point.x, -self.anchor_point.y))
     }
 }
-
-// TODO: probably move this to peniko. The better option is to add an alpha
-// parameter to the draw methods in vello. This is already handled at the
-// encoding level.
-pub(crate) fn brush_with_alpha(brush: &Brush, alpha: f64) -> Brush {
-    if alpha == 1.0 {
-        brush.clone()
-    } else {
-        match brush {
-            Brush::Solid(color) => color.with_alpha_factor(alpha as f32).into(),
-            Brush::Gradient(gradient) => Brush::Gradient(peniko::Gradient {
-                kind: gradient.kind,
-                extend: gradient.extend,
-                stops: gradient
-                    .stops
-                    .iter()
-                    .map(|stop| stop.with_alpha_factor(alpha as f32))
-                    .collect(),
-            }),
-            _ => unreachable!(),
-        }
-    }
-}

src/fixed.rs

@@ -91,7 +91,7 @@ impl Brush {
                 if alpha == 1.0 {
                     ValueRef::Borrowed(value)
                 } else {
-                    ValueRef::Owned(fixed::brush_with_alpha(value, alpha))
+                    ValueRef::Owned(value.clone().multiply_alpha(alpha as f32))
                 }
             }
             Self::Animated(value) => ValueRef::Owned(value.evaluate(alpha, frame)),

src/lib.rs

@@ -353,7 +353,7 @@ impl Batch {
         for draw in self.draws.iter().rev() {
             // Some nastiness to avoid cloning the brush if unnecessary
             let modified_brush = if draw.alpha != 1.0 {
-                Some(fixed::brush_with_alpha(&draw.brush, draw.alpha))
+                Some(draw.brush.clone().multiply_alpha(draw.alpha as f32))
             } else {
                 None
             };