Shift glyphs up by embolden amount

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

Author: nicoburns

crates/anyrender_vello/src/scene.rs

@@ -163,7 +163,7 @@ impl PaintScene for VelloScenePainter<'_, '_> {
                 glyphs.map(|g: anyrender::Glyph| vello::Glyph {
                     id: g.id,
                     x: g.x,
-                    y: g.y,
+                    y: g.y - embolden.y as f32,
                 }),
             );
     }

crates/anyrender_vello_cpu/src/scene.rs

@@ -138,14 +138,6 @@ impl PaintScene for VelloCpuScenePainter {
         self.render_ctx
             .set_paint(anyrender_paint_to_vello_cpu_paint(paint.into()));
 
-        fn into_vello_cpu_glyph(g: anyrender::Glyph) -> vello_cpu::Glyph {
-            vello_cpu::Glyph {
-                id: g.id,
-                x: g.x,
-                y: g.y,
-            }
-        }
-
         let style: StyleRef<'a> = style.into();
         match style {
             StyleRef::Fill(fill) => {
@@ -157,7 +149,11 @@ impl PaintScene for VelloCpuScenePainter {
                     .normalized_coords(normalized_coords)
                     .font_embolden(FontEmbolden::new(Diagonal2::new(embolden.x, embolden.y)))
                     .glyph_transform(glyph_transform.unwrap_or_default())
-                    .fill_glyphs(glyphs.map(into_vello_cpu_glyph));
+                    .fill_glyphs(glyphs.map(|g| vello_cpu::Glyph {
+                        id: g.id,
+                        x: g.x,
+                        y: g.y - embolden.y as f32,
+                    }));
             }
             StyleRef::Stroke(stroke) => {
                 self.render_ctx.set_stroke(stroke.clone());
@@ -167,7 +163,11 @@ impl PaintScene for VelloCpuScenePainter {
                     .hint(hint)
                     .normalized_coords(normalized_coords)
                     .glyph_transform(glyph_transform.unwrap_or_default())
-                    .stroke_glyphs(glyphs.map(into_vello_cpu_glyph));
+                    .stroke_glyphs(glyphs.map(|g| vello_cpu::Glyph {
+                        id: g.id,
+                        x: g.x,
+                        y: g.y,
+                    }));
             }
         }
     }

crates/anyrender_vello_hybrid/src/scene.rs

@@ -209,14 +209,6 @@ impl PaintScene for VelloHybridScenePainter<'_> {
         self.scene.set_paint(paint);
         self.scene.set_transform(transform);
 
-        fn into_vello_hybrid_glyph(g: anyrender::Glyph) -> glifo::Glyph {
-            glifo::Glyph {
-                id: g.id,
-                x: g.x,
-                y: g.y,
-            }
-        }
-
         let style: StyleRef<'a> = style.into();
         match style {
             StyleRef::Fill(fill) => {
@@ -228,7 +220,11 @@ impl PaintScene for VelloHybridScenePainter<'_> {
                     .normalized_coords(normalized_coords)
                     .font_embolden(FontEmbolden::new(Diagonal2::new(embolden.x, embolden.y)))
                     .glyph_transform(glyph_transform.unwrap_or_default())
-                    .fill_glyphs(glyphs.map(into_vello_hybrid_glyph));
+                    .fill_glyphs(glyphs.map(|g| glifo::Glyph {
+                        id: g.id,
+                        x: g.x,
+                        y: g.y - embolden.y as f32,
+                    }));
             }
             StyleRef::Stroke(stroke) => {
                 self.scene.set_stroke(stroke.clone());
@@ -238,7 +234,11 @@ impl PaintScene for VelloHybridScenePainter<'_> {
                     .hint(hint)
                     .normalized_coords(normalized_coords)
                     .glyph_transform(glyph_transform.unwrap_or_default())
-                    .stroke_glyphs(glyphs.map(into_vello_hybrid_glyph));
+                    .stroke_glyphs(glyphs.map(|g| glifo::Glyph {
+                        id: g.id,
+                        x: g.x,
+                        y: g.y,
+                    }));
             }
         }
     }

crates/anyrender_vello_hybrid/src/webgl_scene.rs

@@ -1,7 +1,8 @@
 //! WebGL-compatible [`PaintScene`] implementation for [`vello_hybrid::Scene`].
 
 use anyrender::{Glyph, NormalizedCoord, Paint, PaintRef, PaintScene, RenderContext};
-use kurbo::{Affine, Rect, Shape, Stroke};
+use glifo::FontEmbolden;
+use kurbo::{Affine, Diagonal2, Rect, Shape, Stroke};
 use peniko::{BlendMode, Color, Fill, FontData, StyleRef};
 use vello_common::paint::PaintType;
 
@@ -174,7 +175,7 @@ impl PaintScene for WebGlScenePainter<'_> {
         font_size: f32,
         hint: bool,
         normalized_coords: &'a [NormalizedCoord],
-        _embolden: kurbo::Vec2,
+        embolden: kurbo::Vec2,
         style: impl Into<StyleRef<'a>>,
         paint: impl Into<PaintRef<'a>>,
         _brush_alpha: f32,
@@ -186,14 +187,6 @@ impl PaintScene for WebGlScenePainter<'_> {
         self.scene.set_paint(paint);
         self.scene.set_transform(transform);
 
-        fn into_vello_glyph(g: Glyph) -> glifo::Glyph {
-            glifo::Glyph {
-                id: g.id,
-                x: g.x,
-                y: g.y,
-            }
-        }
-
         let style: StyleRef<'a> = style.into();
         match style {
             StyleRef::Fill(fill) => {
@@ -205,7 +198,11 @@ impl PaintScene for WebGlScenePainter<'_> {
                     .normalized_coords(normalized_coords)
                     .font_embolden(FontEmbolden::new(Diagonal2::new(embolden.x, embolden.y)))
                     .glyph_transform(glyph_transform.unwrap_or_default())
-                    .fill_glyphs(glyphs.map(into_vello_glyph));
+                    .fill_glyphs(glyphs.map(|g| glifo::Glyph {
+                        id: g.id,
+                        x: g.x,
+                        y: g.y - embolden.y as f32,
+                    }));
             }
             StyleRef::Stroke(stroke) => {
                 self.scene.set_stroke(stroke.clone());
@@ -215,7 +212,11 @@ impl PaintScene for WebGlScenePainter<'_> {
                     .hint(hint)
                     .normalized_coords(normalized_coords)
                     .glyph_transform(glyph_transform.unwrap_or_default())
-                    .stroke_glyphs(glyphs.map(into_vello_glyph));
+                    .stroke_glyphs(glyphs.map(|g| glifo::Glyph {
+                        id: g.id,
+                        x: g.x,
+                        y: g.y,
+                    }));
             }
         }
     }