Upgrade to vello with font-embolden support

Signed-off-by: Nico Burns <nico@nicoburns.com>

Author: nicoburns

Cargo.lock

@@ -42,17 +42,17 @@ serde = "1.0.228"
 serde_json = "1.0"
 zip = { version = "2.1", default-features = false, features = ["deflate"] }
 sha2 = "0.10"
-skera = "=0.1.0" # pin because of breaking changes in past patch releases
+skera = "=0.1.0"                                                            # pin because of breaking changes in past patch releases
 read-fonts = "0.37"
 ttf2woff2 = "0.11"
 wuff = "0.2"
 
 # Linebender
-color = "0.3"
+
 linebender_resource_handle = "0.1"
 peniko = "0.6"
 kurbo = "0.13"
-# glifo = { version = "0.0.0" }
+# glifo = { version = "0.0.0" }color = "0.3"
 # vello = { version = "0.8", features = ["wgpu"] }
 # vello_cpu = { version = "0.0.7", default-features = false, features = [
 #   "std",
@@ -61,17 +61,17 @@ kurbo = "0.13"
 # ] }
 # vello_hybrid = { version = "0.0.7" }
 # vello_common = { version = "0.0.7" }
-glifo = { git = "https://github.com/linebender/vello", rev = "b5c4a3192c1a2a5cc1dc2fe45342de1de95a1dc5" }
-vello = { git = "https://github.com/linebender/vello", rev = "b5c4a3192c1a2a5cc1dc2fe45342de1de95a1dc5", features = [
+glifo = { git = "https://github.com/linebender/vello", rev = "3e1aba3ffa1286012119052cb4bc7250e1b61a4b" }
+vello = { git = "https://github.com/linebender/vello", rev = "3e1aba3ffa1286012119052cb4bc7250e1b61a4b", features = [
   "wgpu",
 ] }
-vello_cpu = { git = "https://github.com/linebender/vello", rev = "b5c4a3192c1a2a5cc1dc2fe45342de1de95a1dc5", default-features = false, features = [
+vello_cpu = { git = "https://github.com/linebender/vello", rev = "3e1aba3ffa1286012119052cb4bc7250e1b61a4b", default-features = false, features = [
   "std",
   "text",
   "u8_pipeline",
 ] }
-vello_hybrid = { git = "https://github.com/linebender/vello", rev = "b5c4a3192c1a2a5cc1dc2fe45342de1de95a1dc5" }
-vello_common = { git = "https://github.com/linebender/vello", rev = "b5c4a3192c1a2a5cc1dc2fe45342de1de95a1dc5" }
+vello_hybrid = { git = "https://github.com/linebender/vello", rev = "3e1aba3ffa1286012119052cb4bc7250e1b61a4b" }
+vello_common = { git = "https://github.com/linebender/vello", rev = "3e1aba3ffa1286012119052cb4bc7250e1b61a4b" }
 
 # Rendering
 wgpu = "29"
@@ -94,3 +94,6 @@ wasm-bindgen-futures = "0.4"
 
 # Dev-dependencies
 winit = { version = "0.30.2", features = ["rwh_06"] }
+
+[patch.crates-io]
+kurbo = { git = "https://github.com/linebender/kurbo", rev = "6836244" }

Cargo.toml

@@ -229,6 +229,7 @@ pub trait PaintScene: RenderContext {
         font_size: f32,
         hint: bool,
         normalized_coords: &'a [NormalizedCoord],
+        embolden: kurbo::Vec2,
         style: impl Into<StyleRef<'a>>,
         brush: impl Into<PaintRef<'a>>,
         brush_alpha: f32,
@@ -294,6 +295,7 @@ pub trait PaintScene: RenderContext {
                     cmd.font_size,
                     cmd.hint,
                     &cmd.normalized_coords,
+                    cmd.embolden,
                     &cmd.style,
                     match cmd.brush {
                         Paint::Solid(alpha_color) => Paint::Solid(alpha_color),

crates/anyrender/src/lib.rs

@@ -135,6 +135,7 @@ impl PaintScene for NullScenePainter {
         _font_size: f32,
         _hint: bool,
         _normalized_coords: &'a [crate::NormalizedCoord],
+        _embolden: kurbo::Vec2,
         _style: impl Into<peniko::StyleRef<'a>>,
         _brush: impl Into<crate::PaintRef<'a>>,
         _brush_alpha: f32,

crates/anyrender/src/null_backend.rs

@@ -103,6 +103,8 @@ pub struct GlyphRunCommand<Font = FontData, Brush = Paint> {
     pub font_size: f32,
     pub hint: bool,
     pub normalized_coords: Vec<NormalizedCoord>,
+    #[cfg_attr(feature = "serde", serde(default = "Default::default"))]
+    pub embolden: kurbo::Vec2,
     pub style: Style,
     pub brush: Brush,
     pub brush_alpha: f32,
@@ -244,6 +246,7 @@ impl PaintScene for Scene {
         font_size: f32,
         hint: bool,
         normalized_coords: &'a [NormalizedCoord],
+        embolden: kurbo::Vec2,
         style: impl Into<StyleRef<'a>>,
         paint_ref: impl Into<PaintRef<'a>>,
         brush_alpha: f32,
@@ -257,6 +260,7 @@ impl PaintScene for Scene {
             font_size,
             hint,
             normalized_coords: normalized_coords.to_vec(),
+            embolden,
             style: style.into().to_owned(),
             brush,
             brush_alpha,

crates/anyrender/src/recording.rs

@@ -221,6 +221,7 @@ impl ResourceCollector {
                     font_size: glyph_run.font_size,
                     hint: glyph_run.hint,
                     normalized_coords: glyph_run.normalized_coords.clone(),
+                    embolden: glyph_run.embolden,
                     style: glyph_run.style.clone(),
                     brush,
                     brush_alpha: glyph_run.brush_alpha,
@@ -308,6 +309,7 @@ impl ResourceReconstructor {
                     font_size: glyph_run.font_size,
                     hint: glyph_run.hint,
                     normalized_coords: glyph_run.normalized_coords.clone(),
+                    embolden: glyph_run.embolden,
                     style: glyph_run.style.clone(),
                     brush,
                     brush_alpha: glyph_run.brush_alpha,

crates/anyrender_serialize/src/lib.rs

@@ -7,7 +7,7 @@ use anyrender::{Glyph, Paint, PaintScene};
 use anyrender_serialize::{
     ArchiveError, ResourceManifest, SceneArchive, SerializableRenderCommand, SerializeConfig,
 };
-use kurbo::{Affine, Rect, Stroke};
+use kurbo::{Affine, Rect, Stroke, Vec2};
 use peniko::{
     Blob, Color, Compose, Fill, FontData, ImageAlphaType, ImageBrush, ImageData, ImageFormat, Mix,
 };
@@ -282,6 +282,7 @@ fn test_font_deduplication() {
             12.0,
             false,
             &[],
+            Vec2 { x: 0.0, y: 0.0 },
             Fill::NonZero,
             Color::from_rgb8(0, 0, 0),
             1.0,
@@ -428,6 +429,8 @@ fn build_glyph_scene(font: &FontData) -> Scene {
         16.0,
         false,
         &[],
+        
+        Vec2 { x: 0.0, y: 0.0 },
         Fill::NonZero,
         Color::from_rgb8(0, 0, 0),
         1.0,

crates/anyrender_serialize/tests/serialize.rs

@@ -465,6 +465,7 @@ impl PaintScene for SkiaScenePainter<'_> {
         font_size: f32,
         hint: bool,
         normalized_coords: &'a [anyrender::NormalizedCoord],
+        _embolden: kurbo::Vec2,
         style: impl Into<peniko::StyleRef<'a>>,
         brush: impl Into<anyrender::PaintRef<'a>>,
         brush_alpha: f32,

crates/anyrender_skia/src/scene.rs

@@ -138,6 +138,7 @@ impl PaintScene for VelloScenePainter<'_, '_> {
         font_size: f32,
         hint: bool,
         normalized_coords: &'a [NormalizedCoord],
+        embolden: kurbo::Vec2,
         style: impl Into<StyleRef<'a>>,
         paint: impl Into<PaintRef<'a>>,
         brush_alpha: f32,
@@ -150,6 +151,9 @@ impl PaintScene for VelloScenePainter<'_, '_> {
             .font_size(font_size)
             .hint(hint)
             .normalized_coords(normalized_coords)
+            .font_embolden(vello::FontEmbolden::new(kurbo::Diagonal2::new(
+                embolden.x, embolden.y,
+            )))
             .brush(paint.into())
             .brush_alpha(brush_alpha)
             .transform(transform)

crates/anyrender_vello/src/scene.rs

@@ -125,6 +125,7 @@ impl PaintScene for VelloCpuScenePainter {
         font_size: f32,
         hint: bool,
         normalized_coords: &'a [NormalizedCoord],
+        _embolden: kurbo::Vec2,
         style: impl Into<StyleRef<'a>>,
         paint: impl Into<PaintRef<'a>>,
         _brush_alpha: f32,