djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move replacement glyph info into Font

Browse source
This commit is contained in:
Emil Ernerfeldt 2020-12-11 23:46:02 +01:00
parent c82186e196
commit a9df510a01
1 changed files with 21 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
egui/src/paint/font.rs
View file

@ -50,7 +50,6 @@ pub struct FontImpl {
/// Maximum character height /// Maximum character height
scale_in_pixels: f32, scale_in_pixels: f32,
pixels_per_point: f32, pixels_per_point: f32,
replacement_glyph_info: GlyphInfo,
glyph_infos: RwLock<AHashMap<char, GlyphInfo>>, glyph_infos: RwLock<AHashMap<char, GlyphInfo>>,
atlas: Arc<Mutex<TextureAtlas>>, atlas: Arc<Mutex<TextureAtlas>>,
} }
@ -68,33 +67,14 @@ impl FontImpl {
let font = rusttype::Font::try_from_bytes(font_data).expect("Error constructing Font"); let font = rusttype::Font::try_from_bytes(font_data).expect("Error constructing Font");
let scale_in_pixels = pixels_per_point * scale_in_points; let scale_in_pixels = pixels_per_point * scale_in_points;
let replacement_glyph_info = allocate_glyph(
&mut atlas.lock(),
REPLACEMENT_CHAR,
&font,
scale_in_pixels,
pixels_per_point,
)
.unwrap_or_else(|| {
panic!(
"Failed to find replacement character {:?}",
REPLACEMENT_CHAR
)
});
let font = Self { let font = Self {
font, font,
scale_in_pixels, scale_in_pixels,
pixels_per_point, pixels_per_point,
replacement_glyph_info,
glyph_infos: Default::default(), glyph_infos: Default::default(),
atlas, atlas,
}; };
font.glyph_infos
.write()
.insert(REPLACEMENT_CHAR, font.replacement_glyph_info);
// Preload the printable ASCII characters [32, 126] (which excludes control codes): // Preload the printable ASCII characters [32, 126] (which excludes control codes):
const FIRST_ASCII: usize = 32; // 32 == space const FIRST_ASCII: usize = 32; // 32 == space
const LAST_ASCII: usize = 126; const LAST_ASCII: usize = 126;
@ -106,11 +86,11 @@ impl FontImpl {
font font
} }
/// `\n` will (intentionally) show up as '?' (`REPLACEMENT_CHAR`) /// `\n` will result in `None`
fn glyph_info(&self, c: char) -> GlyphInfo { fn glyph_info(&self, c: char) -> Option<GlyphInfo> {
{ {
if let Some(glyph_info) = self.glyph_infos.read().get(&c) { if let Some(glyph_info) = self.glyph_infos.read().get(&c) {
return *glyph_info; return Some(*glyph_info);
} }
} }
@ -122,10 +102,9 @@ impl FontImpl {
self.scale_in_pixels, self.scale_in_pixels,
self.pixels_per_point, self.pixels_per_point,
); );
// debug_assert!(glyph_info.is_some(), "Failed to find {:?}", c); let glyph_info = glyph_info?;
let glyph_info = glyph_info.unwrap_or(self.replacement_glyph_info);
self.glyph_infos.write().insert(c, glyph_info); self.glyph_infos.write().insert(c, glyph_info);
glyph_info Some(glyph_info)
} }
pub fn pair_kerning( pub fn pair_kerning(
@ -151,25 +130,27 @@ impl FontImpl {
pub fn uv_rect(&self, c: char) -> Option<UvRect> { pub fn uv_rect(&self, c: char) -> Option<UvRect> {
self.glyph_infos.read().get(&c).and_then(|gi| gi.uv_rect) self.glyph_infos.read().get(&c).and_then(|gi| gi.uv_rect)
} }
pub fn glyph_width(&self, c: char) -> f32 {
self.glyph_info(c).advance_width
}
pub fn pixels_per_point(&self) -> f32 {
self.pixels_per_point
}
} }
// TODO: rename Layouter ? // TODO: rename Layouter ?
/// Wrapper over multiple `FontImpl` (commonly two: primary + emoji fallback) /// Wrapper over multiple `FontImpl` (commonly two: primary + emoji fallback)
pub struct Font { pub struct Font {
font_impl: Arc<FontImpl>, font_impl: Arc<FontImpl>,
replacement_glyph_info: GlyphInfo,
} }
impl Font { impl Font {
pub fn new(font_impl: Arc<FontImpl>) -> Self { pub fn new(font_impl: Arc<FontImpl>) -> Self {
Self { font_impl } let replacement_glyph_info = font_impl.glyph_info(REPLACEMENT_CHAR).unwrap_or_else(|| {
panic!(
"Failed to find replacement character {:?}",
REPLACEMENT_CHAR
)
});
Self {
font_impl,
replacement_glyph_info,
}
} }
pub fn round_to_pixel(&self, point: f32) -> f32 { pub fn round_to_pixel(&self, point: f32) -> f32 {
@ -186,11 +167,14 @@ impl Font {
} }
pub fn glyph_width(&self, c: char) -> f32 { pub fn glyph_width(&self, c: char) -> f32 {
self.font_impl.glyph_width(c) self.glyph_info(c).advance_width
} }
/// `\n` will (intentionally) show up as '?' (`REPLACEMENT_CHAR`)
fn glyph_info(&self, c: char) -> GlyphInfo { fn glyph_info(&self, c: char) -> GlyphInfo {
self.font_impl.glyph_info(c) self.font_impl
.glyph_info(c)
.unwrap_or_else(|| self.replacement_glyph_info)
} }
/// Typeset the given text onto one row. /// Typeset the given text onto one row.