mirror of
https://github.com/emilk/egui.git
synced 2026-08-29 04:40:03 -04:00
Replace ab_glyph with Skrifa + vello_cpu; enable font hinting (#7694)
<!-- Please read the "Making a PR" section of [`CONTRIBUTING.md`](https://github.com/emilk/egui/blob/main/CONTRIBUTING.md) before opening a Pull Request! * Keep your PR:s small and focused. * The PR title is what ends up in the changelog, so make it descriptive! * If applicable, add a screenshot or gif. * If it is a non-trivial addition, consider adding a demo for it to `egui_demo_lib`, or a new example. * Do NOT open PR:s from your `master` branch, as that makes it hard for maintainers to test and add commits to your PR. * Remember to run `cargo fmt` and `cargo clippy`. * Open the PR as a draft until you have self-reviewed it and run `./scripts/check.sh`. * When you have addressed a PR comment, mark it as resolved. Please be patient! I will review your PR, but my time is limited! --> * Closes N/A * [x] I have followed the instructions in the PR template I'll probably come back to this and clean it up a bit. This PR reimplements ab_glyph's functionality on top of Skrifa, a somewhat lower-level font API that's being used in Chrome now. Skrifa doesn't perform rasterization itself, so I'm using [vello_cpu](https://github.com/linebender/vello) from the Linebender project for rasterization. It's still in its early days, but I believe it's already quite fast. It also supports color and gradient fills, so color emoji support will be easier. Skrifa also supports font hinting, which should make text look a bit nicer / less blurry. Here's the current ab_glyph rendering: <img width="1592" height="1068" alt="image" src="https://github.com/user-attachments/assets/2385b66e-23f8-4c6e-b8c2-ea90e0eea4e4" /> Here's Skrifa *without* hinting--it looks almost identical, but there are some subpixel differences, probably due to rasterizer behavior: <img width="1592" height="1068" alt="image" src="https://github.com/user-attachments/assets/a815f3e9-65ac-4940-bc00-571177bef53d" /> Here's Skrifa *with* hinting: <img width="1592" height="1068" alt="image" src="https://github.com/user-attachments/assets/d6cc0669-3537-4377-bba9-ed5ef09664db" /> Hinting does make the horizontal strokes look a bit bolder, which makes me wonder once again about increasing the font weight from "light" to "regular". --------- Co-authored-by: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
This commit is contained in:
@@ -1,13 +1,20 @@
|
||||
#![allow(clippy::mem_forget)]
|
||||
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
use ab_glyph::{Font as _, OutlinedGlyph, PxScale};
|
||||
use emath::{GuiRounding as _, OrderedFloat, Vec2, vec2};
|
||||
use self_cell::self_cell;
|
||||
use skrifa::{
|
||||
MetadataProvider as _,
|
||||
raw::{TableProvider as _, tables::kern::SubtableKind},
|
||||
};
|
||||
use vello_cpu::{color, kurbo};
|
||||
|
||||
use crate::{
|
||||
TextureAtlas,
|
||||
TextOptions, TextureAtlas,
|
||||
text::{
|
||||
FontTweak,
|
||||
fonts::{CachedFamily, FontFaceKey},
|
||||
fonts::{Blob, CachedFamily, FontFaceKey},
|
||||
},
|
||||
};
|
||||
|
||||
@@ -43,9 +50,9 @@ pub struct GlyphInfo {
|
||||
/// Doesn't need to be unique.
|
||||
///
|
||||
/// Is `None` for a special "invisible" glyph.
|
||||
pub(crate) id: Option<ab_glyph::GlyphId>,
|
||||
pub(crate) id: Option<skrifa::GlyphId>,
|
||||
|
||||
/// In [`ab_glyph`]s "unscaled" coordinate system.
|
||||
/// In [`skrifa`]s "unscaled" coordinate system.
|
||||
pub advance_width_unscaled: OrderedFloat<f32>,
|
||||
}
|
||||
|
||||
@@ -123,8 +130,8 @@ pub struct GlyphAllocation {
|
||||
/// Used for pair-kerning.
|
||||
///
|
||||
/// Doesn't need to be unique.
|
||||
/// Use `ab_glyph::GlyphId(0)` if you just want to have an id, and don't care.
|
||||
pub(crate) id: ab_glyph::GlyphId,
|
||||
/// Use [`skrifa::GlyphId::NOTDEF`] if you just want to have an id, and don't care.
|
||||
pub(crate) id: skrifa::GlyphId,
|
||||
|
||||
/// Unit: screen pixels.
|
||||
pub advance_width_px: f32,
|
||||
@@ -139,7 +146,7 @@ struct GlyphCacheKey(u64);
|
||||
impl nohash_hasher::IsEnabled for GlyphCacheKey {}
|
||||
|
||||
impl GlyphCacheKey {
|
||||
fn new(glyph_id: ab_glyph::GlyphId, metrics: &ScaledMetrics, bin: SubpixelBin) -> Self {
|
||||
fn new(glyph_id: skrifa::GlyphId, metrics: &ScaledMetrics, bin: SubpixelBin) -> Self {
|
||||
let ScaledMetrics {
|
||||
pixels_per_point,
|
||||
px_scale_factor,
|
||||
@@ -164,41 +171,229 @@ impl GlyphCacheKey {
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
struct DependentFontData<'a> {
|
||||
skrifa: skrifa::FontRef<'a>,
|
||||
charmap: skrifa::charmap::Charmap<'a>,
|
||||
outline_glyphs: skrifa::outline::OutlineGlyphCollection<'a>,
|
||||
metrics: skrifa::metrics::Metrics,
|
||||
glyph_metrics: skrifa::metrics::GlyphMetrics<'a>,
|
||||
hinting_instance: Option<skrifa::outline::HintingInstance>,
|
||||
}
|
||||
|
||||
self_cell! {
|
||||
struct FontCell {
|
||||
owner: Blob,
|
||||
|
||||
#[covariant]
|
||||
dependent: DependentFontData,
|
||||
}
|
||||
}
|
||||
|
||||
impl FontCell {
|
||||
fn px_scale_factor(&self, scale: f32) -> f32 {
|
||||
let units_per_em = self.borrow_dependent().metrics.units_per_em as f32;
|
||||
scale / units_per_em
|
||||
}
|
||||
|
||||
fn allocate_glyph_uncached(
|
||||
&mut self,
|
||||
atlas: &mut TextureAtlas,
|
||||
metrics: &ScaledMetrics,
|
||||
glyph_info: &GlyphInfo,
|
||||
bin: SubpixelBin,
|
||||
) -> Option<GlyphAllocation> {
|
||||
let glyph_id = glyph_info.id?;
|
||||
|
||||
debug_assert!(
|
||||
glyph_id != skrifa::GlyphId::NOTDEF,
|
||||
"Can't allocate glyph for id 0"
|
||||
);
|
||||
|
||||
let mut path = kurbo::BezPath::new();
|
||||
let mut pen = VelloPen {
|
||||
path: &mut path,
|
||||
x_offset: bin.as_float() as f64,
|
||||
};
|
||||
|
||||
self.with_dependent_mut(|_, font_data| {
|
||||
let outline = font_data.outline_glyphs.get(glyph_id)?;
|
||||
|
||||
if let Some(hinting_instance) = &mut font_data.hinting_instance {
|
||||
let size = skrifa::instance::Size::new(metrics.scale);
|
||||
if hinting_instance.size() != size {
|
||||
hinting_instance
|
||||
.reconfigure(
|
||||
&font_data.outline_glyphs,
|
||||
size,
|
||||
skrifa::instance::LocationRef::default(),
|
||||
skrifa::outline::Target::Smooth {
|
||||
mode: skrifa::outline::SmoothMode::Normal,
|
||||
symmetric_rendering: true,
|
||||
preserve_linear_metrics: true,
|
||||
},
|
||||
)
|
||||
.ok()?;
|
||||
}
|
||||
let draw_settings = skrifa::outline::DrawSettings::hinted(hinting_instance, false);
|
||||
outline.draw(draw_settings, &mut pen).ok()?;
|
||||
} else {
|
||||
let draw_settings = skrifa::outline::DrawSettings::unhinted(
|
||||
skrifa::instance::Size::new(metrics.scale),
|
||||
skrifa::instance::LocationRef::default(),
|
||||
);
|
||||
outline.draw(draw_settings, &mut pen).ok()?;
|
||||
}
|
||||
|
||||
Some(())
|
||||
})?;
|
||||
|
||||
let bounds = path.control_box().expand();
|
||||
let width = bounds.width() as u16;
|
||||
let height = bounds.height() as u16;
|
||||
|
||||
let mut ctx = vello_cpu::RenderContext::new(width, height);
|
||||
ctx.set_transform(kurbo::Affine::translate((-bounds.x0, -bounds.y0)));
|
||||
ctx.set_paint(color::OpaqueColor::<color::Srgb>::WHITE);
|
||||
ctx.fill_path(&path);
|
||||
let mut dest = vello_cpu::Pixmap::new(width, height);
|
||||
ctx.render_to_pixmap(&mut dest);
|
||||
let uv_rect = if width == 0 || height == 0 {
|
||||
UvRect::default()
|
||||
} else {
|
||||
let glyph_pos = {
|
||||
let alpha_from_coverage = atlas.options().alpha_from_coverage;
|
||||
let (glyph_pos, image) = atlas.allocate((width as usize, height as usize));
|
||||
let pixels = dest.data_as_u8_slice();
|
||||
for y in 0..height as usize {
|
||||
for x in 0..width as usize {
|
||||
image[(x + glyph_pos.0, y + glyph_pos.1)] = alpha_from_coverage
|
||||
.color_from_coverage(
|
||||
pixels[((y * width as usize) + x) * 4 + 3] as f32 / 255.0,
|
||||
);
|
||||
}
|
||||
}
|
||||
glyph_pos
|
||||
};
|
||||
let offset_in_pixels = vec2(bounds.x0 as f32, bounds.y0 as f32);
|
||||
let offset =
|
||||
offset_in_pixels / metrics.pixels_per_point + metrics.y_offset_in_points * Vec2::Y;
|
||||
UvRect {
|
||||
offset,
|
||||
size: vec2(width as f32, height as f32) / metrics.pixels_per_point,
|
||||
min: [glyph_pos.0 as u16, glyph_pos.1 as u16],
|
||||
max: [
|
||||
(glyph_pos.0 + width as usize) as u16,
|
||||
(glyph_pos.1 + height as usize) as u16,
|
||||
],
|
||||
}
|
||||
};
|
||||
|
||||
Some(GlyphAllocation {
|
||||
id: glyph_id,
|
||||
advance_width_px: glyph_info.advance_width_unscaled.0 * metrics.px_scale_factor,
|
||||
uv_rect,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
struct VelloPen<'a> {
|
||||
path: &'a mut kurbo::BezPath,
|
||||
x_offset: f64,
|
||||
}
|
||||
|
||||
impl skrifa::outline::OutlinePen for VelloPen<'_> {
|
||||
fn move_to(&mut self, x: f32, y: f32) {
|
||||
self.path.move_to((x as f64 + self.x_offset, -y as f64));
|
||||
}
|
||||
|
||||
fn line_to(&mut self, x: f32, y: f32) {
|
||||
self.path.line_to((x as f64 + self.x_offset, -y as f64));
|
||||
}
|
||||
|
||||
fn quad_to(&mut self, cx0: f32, cy0: f32, x: f32, y: f32) {
|
||||
self.path.quad_to(
|
||||
(cx0 as f64 + self.x_offset, -cy0 as f64),
|
||||
(x as f64 + self.x_offset, -y as f64),
|
||||
);
|
||||
}
|
||||
|
||||
fn curve_to(&mut self, cx0: f32, cy0: f32, cx1: f32, cy1: f32, x: f32, y: f32) {
|
||||
self.path.curve_to(
|
||||
(cx0 as f64 + self.x_offset, -cy0 as f64),
|
||||
(cx1 as f64 + self.x_offset, -cy1 as f64),
|
||||
(x as f64 + self.x_offset, -y as f64),
|
||||
);
|
||||
}
|
||||
|
||||
fn close(&mut self) {
|
||||
self.path.close_path();
|
||||
}
|
||||
}
|
||||
|
||||
/// A specific font face.
|
||||
/// The interface uses points as the unit for everything.
|
||||
pub struct FontImpl {
|
||||
pub struct FontFace {
|
||||
name: String,
|
||||
ab_glyph_font: ab_glyph::FontArc,
|
||||
font: FontCell,
|
||||
tweak: FontTweak,
|
||||
glyph_info_cache: ahash::HashMap<char, GlyphInfo>,
|
||||
glyph_alloc_cache: ahash::HashMap<GlyphCacheKey, GlyphAllocation>,
|
||||
}
|
||||
|
||||
trait FontExt {
|
||||
fn px_scale_factor(&self, scale: f32) -> f32;
|
||||
}
|
||||
impl FontFace {
|
||||
pub fn new(
|
||||
options: TextOptions,
|
||||
name: String,
|
||||
font_data: Blob,
|
||||
index: u32,
|
||||
tweak: FontTweak,
|
||||
) -> Result<Self, Box<dyn std::error::Error>> {
|
||||
let font = FontCell::try_new(font_data, |font_data| {
|
||||
let skrifa_font =
|
||||
skrifa::FontRef::from_index(AsRef::<[u8]>::as_ref(font_data.as_ref()), index)?;
|
||||
|
||||
impl<T> FontExt for T
|
||||
where
|
||||
T: ab_glyph::Font,
|
||||
{
|
||||
fn px_scale_factor(&self, scale: f32) -> f32 {
|
||||
let units_per_em = self.units_per_em().unwrap_or_else(|| {
|
||||
panic!("The font unit size exceeds the expected range (16..=16384)")
|
||||
});
|
||||
scale / units_per_em
|
||||
}
|
||||
}
|
||||
let charmap = skrifa_font.charmap();
|
||||
let glyphs = skrifa_font.outline_glyphs();
|
||||
let metrics = skrifa_font.metrics(
|
||||
skrifa::instance::Size::unscaled(),
|
||||
skrifa::instance::LocationRef::default(),
|
||||
);
|
||||
let glyph_metrics = skrifa_font.glyph_metrics(
|
||||
skrifa::instance::Size::unscaled(),
|
||||
skrifa::instance::LocationRef::default(),
|
||||
);
|
||||
|
||||
impl FontImpl {
|
||||
pub fn new(name: String, ab_glyph_font: ab_glyph::FontArc, tweak: FontTweak) -> Self {
|
||||
Self {
|
||||
let hinting_enabled = tweak.hinting_override.unwrap_or(options.font_hinting);
|
||||
let hinting_instance = hinting_enabled
|
||||
.then(|| {
|
||||
// It doesn't really matter what we put here for options. Since the size is `unscaled()`, we will
|
||||
// always reconfigure this hinting instance with the real options when rendering for the first time.
|
||||
skrifa::outline::HintingInstance::new(
|
||||
&glyphs,
|
||||
skrifa::instance::Size::unscaled(),
|
||||
skrifa::instance::LocationRef::default(),
|
||||
skrifa::outline::Target::default(),
|
||||
)
|
||||
.ok()
|
||||
})
|
||||
.flatten();
|
||||
|
||||
Ok::<DependentFontData<'_>, Box<dyn std::error::Error>>(DependentFontData {
|
||||
skrifa: skrifa_font,
|
||||
charmap,
|
||||
outline_glyphs: glyphs,
|
||||
metrics,
|
||||
glyph_metrics,
|
||||
hinting_instance,
|
||||
})
|
||||
})?;
|
||||
Ok(Self {
|
||||
name,
|
||||
ab_glyph_font,
|
||||
font,
|
||||
tweak,
|
||||
glyph_info_cache: Default::default(),
|
||||
glyph_alloc_cache: Default::default(),
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
/// Code points that will always be replaced by the replacement character.
|
||||
@@ -223,10 +418,11 @@ impl FontImpl {
|
||||
|
||||
/// An un-ordered iterator over all supported characters.
|
||||
fn characters(&self) -> impl Iterator<Item = char> + '_ {
|
||||
self.ab_glyph_font
|
||||
.codepoint_ids()
|
||||
.map(|(_, chr)| chr)
|
||||
.filter(|&chr| !self.ignore_character(chr))
|
||||
self.font
|
||||
.borrow_dependent()
|
||||
.charmap
|
||||
.mappings()
|
||||
.filter_map(|(chr, _)| char::from_u32(chr).filter(|c| !self.ignore_character(*c)))
|
||||
}
|
||||
|
||||
/// `\n` will result in `None`
|
||||
@@ -258,7 +454,7 @@ impl FontImpl {
|
||||
// https://en.wikipedia.org/wiki/Thin_space
|
||||
|
||||
if let Some(space) = self.glyph_info(' ') {
|
||||
let em = self.ab_glyph_font.units_per_em().unwrap_or(1.0);
|
||||
let em = self.font.borrow_dependent().metrics.units_per_em as f32;
|
||||
let advance_width = f32::min(em / 6.0, space.advance_width_unscaled.0 * 0.5); // TODO(emilk): make configurable
|
||||
let glyph_info = GlyphInfo {
|
||||
advance_width_unscaled: advance_width.into(),
|
||||
@@ -275,52 +471,68 @@ impl FontImpl {
|
||||
return Some(glyph_info);
|
||||
}
|
||||
|
||||
// Add new character:
|
||||
let glyph_id = self.ab_glyph_font.glyph_id(c);
|
||||
let font_data = self.font.borrow_dependent();
|
||||
|
||||
if glyph_id.0 == 0 {
|
||||
None // unsupported character
|
||||
} else {
|
||||
let glyph_info = GlyphInfo {
|
||||
id: Some(glyph_id),
|
||||
advance_width_unscaled: self.ab_glyph_font.h_advance_unscaled(glyph_id).into(),
|
||||
};
|
||||
self.glyph_info_cache.insert(c, glyph_info);
|
||||
Some(glyph_info)
|
||||
}
|
||||
// Add new character:
|
||||
let glyph_id = font_data
|
||||
.charmap
|
||||
.map(c)
|
||||
.filter(|id| *id != skrifa::GlyphId::NOTDEF)?;
|
||||
|
||||
let glyph_info = GlyphInfo {
|
||||
id: Some(glyph_id),
|
||||
advance_width_unscaled: font_data
|
||||
.glyph_metrics
|
||||
.advance_width(glyph_id)
|
||||
.unwrap_or_default()
|
||||
.into(),
|
||||
};
|
||||
self.glyph_info_cache.insert(c, glyph_info);
|
||||
Some(glyph_info)
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub(super) fn pair_kerning_pixels(
|
||||
&self,
|
||||
metrics: &ScaledMetrics,
|
||||
last_glyph_id: ab_glyph::GlyphId,
|
||||
glyph_id: ab_glyph::GlyphId,
|
||||
last_glyph_id: skrifa::GlyphId,
|
||||
glyph_id: skrifa::GlyphId,
|
||||
) -> f32 {
|
||||
self.ab_glyph_font.kern_unscaled(last_glyph_id, glyph_id) * metrics.px_scale_factor
|
||||
let skrifa_font = &self.font.borrow_dependent().skrifa;
|
||||
let Ok(kern) = skrifa_font.kern() else {
|
||||
return 0.0;
|
||||
};
|
||||
kern.subtables()
|
||||
.find_map(|st| match st.ok()?.kind().ok()? {
|
||||
SubtableKind::Format0(table_ref) => table_ref.kerning(last_glyph_id, glyph_id),
|
||||
SubtableKind::Format1(_) => None,
|
||||
SubtableKind::Format2(subtable2) => subtable2.kerning(last_glyph_id, glyph_id),
|
||||
SubtableKind::Format3(table_ref) => table_ref.kerning(last_glyph_id, glyph_id),
|
||||
})
|
||||
.unwrap_or_default() as f32
|
||||
* metrics.px_scale_factor
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub fn pair_kerning(
|
||||
&self,
|
||||
metrics: &ScaledMetrics,
|
||||
last_glyph_id: ab_glyph::GlyphId,
|
||||
glyph_id: ab_glyph::GlyphId,
|
||||
last_glyph_id: skrifa::GlyphId,
|
||||
glyph_id: skrifa::GlyphId,
|
||||
) -> f32 {
|
||||
self.pair_kerning_pixels(metrics, last_glyph_id, glyph_id) / metrics.pixels_per_point
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
pub fn scaled_metrics(&self, pixels_per_point: f32, font_size: f32) -> ScaledMetrics {
|
||||
let pt_scale_factor = self
|
||||
.ab_glyph_font
|
||||
.px_scale_factor(font_size * self.tweak.scale);
|
||||
let ascent = (self.ab_glyph_font.ascent_unscaled() * pt_scale_factor).round_ui();
|
||||
let descent = (self.ab_glyph_font.descent_unscaled() * pt_scale_factor).round_ui();
|
||||
let line_gap = (self.ab_glyph_font.line_gap_unscaled() * pt_scale_factor).round_ui();
|
||||
let pt_scale_factor = self.font.px_scale_factor(font_size * self.tweak.scale);
|
||||
let font_data = self.font.borrow_dependent();
|
||||
let ascent = (font_data.metrics.ascent * pt_scale_factor).round_ui();
|
||||
let descent = (font_data.metrics.descent * pt_scale_factor).round_ui();
|
||||
let line_gap = (font_data.metrics.leading * pt_scale_factor).round_ui();
|
||||
|
||||
let scale = font_size * self.tweak.scale * pixels_per_point;
|
||||
let px_scale_factor = self.ab_glyph_font.px_scale_factor(scale);
|
||||
let px_scale_factor = self.font.px_scale_factor(scale);
|
||||
|
||||
let y_offset_in_points = ((font_size * self.tweak.scale * self.tweak.y_offset_factor)
|
||||
+ self.tweak.y_offset)
|
||||
@@ -329,6 +541,7 @@ impl FontImpl {
|
||||
ScaledMetrics {
|
||||
pixels_per_point,
|
||||
px_scale_factor,
|
||||
scale,
|
||||
y_offset_in_points,
|
||||
ascent,
|
||||
row_height: ascent - descent + line_gap,
|
||||
@@ -370,77 +583,20 @@ impl FontImpl {
|
||||
std::collections::hash_map::Entry::Vacant(entry) => entry,
|
||||
};
|
||||
|
||||
debug_assert!(glyph_id.0 != 0, "Can't allocate glyph for id 0");
|
||||
let allocation = self
|
||||
.font
|
||||
.allocate_glyph_uncached(atlas, metrics, &glyph_info, bin)
|
||||
.unwrap_or_default();
|
||||
|
||||
let uv_rect = self.ab_glyph_font.outline(glyph_id).map(|outline| {
|
||||
let glyph = ab_glyph::Glyph {
|
||||
id: glyph_id,
|
||||
// We bypass ab-glyph's scaling method because it uses the wrong scale
|
||||
// (https://github.com/alexheretic/ab-glyph/issues/15), and this field is never accessed when
|
||||
// rasterizing. We can just put anything here.
|
||||
scale: PxScale::from(0.0),
|
||||
position: ab_glyph::Point {
|
||||
x: bin.as_float(),
|
||||
y: 0.0,
|
||||
},
|
||||
};
|
||||
let outlined = OutlinedGlyph::new(
|
||||
glyph,
|
||||
outline,
|
||||
ab_glyph::PxScaleFactor {
|
||||
horizontal: metrics.px_scale_factor,
|
||||
vertical: metrics.px_scale_factor,
|
||||
},
|
||||
);
|
||||
let bb = outlined.px_bounds();
|
||||
let glyph_width = bb.width() as usize;
|
||||
let glyph_height = bb.height() as usize;
|
||||
if glyph_width == 0 || glyph_height == 0 {
|
||||
UvRect::default()
|
||||
} else {
|
||||
let glyph_pos = {
|
||||
let text_alpha_from_coverage = atlas.text_alpha_from_coverage;
|
||||
let (glyph_pos, image) = atlas.allocate((glyph_width, glyph_height));
|
||||
outlined.draw(|x, y, v| {
|
||||
if 0.0 < v {
|
||||
let px = glyph_pos.0 + x as usize;
|
||||
let py = glyph_pos.1 + y as usize;
|
||||
image[(px, py)] = text_alpha_from_coverage.color_from_coverage(v);
|
||||
}
|
||||
});
|
||||
glyph_pos
|
||||
};
|
||||
|
||||
let offset_in_pixels = vec2(bb.min.x, bb.min.y);
|
||||
let offset = offset_in_pixels / metrics.pixels_per_point
|
||||
+ metrics.y_offset_in_points * Vec2::Y;
|
||||
UvRect {
|
||||
offset,
|
||||
size: vec2(glyph_width as f32, glyph_height as f32) / metrics.pixels_per_point,
|
||||
min: [glyph_pos.0 as u16, glyph_pos.1 as u16],
|
||||
max: [
|
||||
(glyph_pos.0 + glyph_width) as u16,
|
||||
(glyph_pos.1 + glyph_height) as u16,
|
||||
],
|
||||
}
|
||||
}
|
||||
});
|
||||
let uv_rect = uv_rect.unwrap_or_default();
|
||||
|
||||
let allocation = GlyphAllocation {
|
||||
id: glyph_id,
|
||||
advance_width_px,
|
||||
uv_rect,
|
||||
};
|
||||
entry.insert(allocation);
|
||||
(allocation, h_pos_round)
|
||||
}
|
||||
}
|
||||
|
||||
// TODO(emilk): rename?
|
||||
/// Wrapper over multiple [`FontImpl`] (e.g. a primary + fallbacks for emojis)
|
||||
/// Wrapper over multiple [`FontFace`] (e.g. a primary + fallbacks for emojis)
|
||||
pub struct Font<'a> {
|
||||
pub(super) fonts_by_id: &'a mut nohash_hasher::IntMap<FontFaceKey, FontImpl>,
|
||||
pub(super) fonts_by_id: &'a mut nohash_hasher::IntMap<FontFaceKey, FontFace>,
|
||||
pub(super) cached_family: &'a mut CachedFamily,
|
||||
pub(super) atlas: &'a mut TextureAtlas,
|
||||
}
|
||||
@@ -471,7 +627,7 @@ impl Font<'_> {
|
||||
.fonts
|
||||
.first()
|
||||
.and_then(|key| self.fonts_by_id.get(key))
|
||||
.map(|font_impl| font_impl.scaled_metrics(pixels_per_point, font_size))
|
||||
.map(|font_face| font_face.scaled_metrics(pixels_per_point, font_size))
|
||||
.unwrap_or_default()
|
||||
}
|
||||
|
||||
@@ -479,7 +635,7 @@ impl Font<'_> {
|
||||
pub fn glyph_width(&mut self, c: char, font_size: f32) -> f32 {
|
||||
let (key, glyph_info) = self.glyph_info(c);
|
||||
if let Some(font) = &self.fonts_by_id.get(&key) {
|
||||
glyph_info.advance_width_unscaled.0 * font.ab_glyph_font.px_scale_factor(font_size)
|
||||
glyph_info.advance_width_unscaled.0 * font.font.px_scale_factor(font_size)
|
||||
} else {
|
||||
0.0
|
||||
}
|
||||
@@ -524,7 +680,10 @@ pub struct ScaledMetrics {
|
||||
/// Translates "unscaled" units to physical (screen) pixels.
|
||||
pub px_scale_factor: f32,
|
||||
|
||||
/// Vertical offset, in UI points.
|
||||
/// Absolute scale in screen pixels, for skrifa.
|
||||
pub scale: f32,
|
||||
|
||||
/// Vertical offset, in UI points (not screen-space).
|
||||
pub y_offset_in_points: f32,
|
||||
|
||||
/// This is the distance from the top to the baseline.
|
||||
@@ -540,7 +699,7 @@ pub struct ScaledMetrics {
|
||||
|
||||
/// Code points that will always be invisible (zero width).
|
||||
///
|
||||
/// See also [`FontImpl::ignore_character`].
|
||||
/// See also [`FontFace::ignore_character`].
|
||||
#[inline]
|
||||
fn invisible_char(c: char) -> bool {
|
||||
if c == '\r' {
|
||||
|
||||
Reference in New Issue
Block a user