leyoda/cosmic-text
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make swash optional, add swash cache abstraction

Browse source
This commit is contained in:
Jeremy Soller 2022-10-25 10:55:24 -06:00
parent efc5108a2d
commit 1c341f3126
No known key found for this signature in database
GPG key ID: 87F211AF2BE4C2FE
7 changed files with 148 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/font/cache.rs
View file

@ -32,8 +32,6 @@ impl CacheKey {
}
}
pub type CacheItem = Option<swash::scale::image::Image>;
#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
pub enum SubpixelBin {
Zero,

10
src/font/font.rs
View file

@ -1,17 +1,12 @@
// SPDX-License-Identifier: MIT OR Apache-2.0
use std::{collections::HashMap, sync::Mutex};
use super::{CacheKey, CacheItem};
pub struct Font<'a> {
pub info: &'a fontdb::FaceInfo,
pub data: &'a [u8],
pub index: u32,
pub rustybuzz: rustybuzz::Face<'a>,
#[cfg(feature = "swash")]
pub swash: swash::FontRef<'a>,
pub scale_context: Mutex<swash::scale::ScaleContext>,
pub cache: Mutex<HashMap<CacheKey, CacheItem>>,
}
impl<'a> Font<'a> {
@ -21,9 +16,8 @@ impl<'a> Font<'a> {
data,
index,
rustybuzz: rustybuzz::Face::from_slice(data, index)?,
#[cfg(feature = "swash")]
swash: swash::FontRef::from_index(data, index as usize)?,
scale_context: Mutex::new(swash::scale::ScaleContext::new()),
cache: Mutex::new(HashMap::new()),
})
}
}

91
src/font/layout.rs
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT OR Apache-2.0
use super::{CacheKey, FontMatches};
use super::CacheKey;
pub struct FontLayoutGlyph {
pub start: usize,
@ -17,92 +17,3 @@ pub struct FontLayoutLine {
pub rtl: bool,
pub glyphs: Vec<FontLayoutGlyph>,
}
impl FontLayoutLine {
pub fn draw<F: FnMut(i32, i32, u32)>(&self, matches: &FontMatches<'_>, base: u32, mut f: F) {
for glyph in self.glyphs.iter() {
use swash::scale::{Render, Source, StrikeWith};
use swash::zeno::{Format, Vector};
let font = match matches.get_font(&glyph.cache_key.font_id) {
Some(some) => some,
None => {
log::warn!("did not find font {:?}", glyph.cache_key.font_id);
continue;
},
};
let mut cache = font.cache.lock().unwrap();
let (cache_key, x_int, y_int) = (glyph.cache_key, glyph.x_int, glyph.y_int);
let image_opt = cache.entry(cache_key).or_insert_with(|| {
let mut scale_context = font.scale_context.lock().unwrap();
// Build the scaler
let mut scaler = scale_context
.builder(font.swash)
.size(cache_key.font_size as f32)
.hint(true)
.build();
// Compute the fractional offset-- you'll likely want to quantize this
// in a real renderer
let offset =
Vector::new(cache_key.x_bin.as_float(), cache_key.y_bin.as_float());
// Select our source order
Render::new(&[
// Color outline with the first palette
Source::ColorOutline(0),
// Color bitmap with best fit selection mode
Source::ColorBitmap(StrikeWith::BestFit),
// Standard scalable outline
Source::Outline,
])
// Select a subpixel format
.format(Format::Alpha)
// Apply the fractional offset
.offset(offset)
// Render the image
.render(&mut scaler, cache_key.glyph_id)
});
if let Some(ref image) = image_opt {
use swash::scale::image::Content;
let x = x_int + image.placement.left;
let y = y_int - image.placement.top;
match image.content {
Content::Mask => {
let mut i = 0;
for off_y in 0..image.placement.height as i32 {
for off_x in 0..image.placement.width as i32 {
let color = (image.data[i] as u32) << 24 | base & 0xFFFFFF;
f(x + off_x, y + off_y, color);
i += 1;
}
}
}
Content::Color => {
let mut i = 0;
for off_y in 0..image.placement.height as i32 {
for off_x in 0..image.placement.width as i32 {
let color = (image.data[i + 3] as u32) << 24
| (image.data[i] as u32) << 16
| (image.data[i + 1] as u32) << 8
| (image.data[i + 2] as u32);
f(x + off_x, y + off_y, color);
i += 4;
}
}
}
Content::SubpixelMask => {
log::warn!("TODO: SubpixelMask");
}
}
}
}
}
}