PolytreeDE
/
alacritty
mirror of https://github.com/alacritty/alacritty.git
1
0
Fork 0
Code Releases Activity

Font no longer hardcoded in get_glyph

This commit is contained in:
Joe Wilm 2016-02-27 14:45:38 -08:00
parent 7a1ed7b46f
commit 1bf7bb8e12
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.rs
View File

@ -11,6 +11,7 @@ mod text;
mod renderer;
use renderer::{Glyph, QuadRenderer};
use text::FontDesc;
fn main() {
@ -25,12 +26,13 @@ fn main() {
gl::Viewport(0, 0, width as i32, height as i32);
}
let desc = FontDesc::new("Ubuntu Mono", "Regular");
let mut rasterizer = text::Rasterizer::new();
let glyph_r = Glyph::new(&rasterizer.get_glyph(180., 'R'));
let glyph_u = Glyph::new(&rasterizer.get_glyph(180., 'u'));
let glyph_s = Glyph::new(&rasterizer.get_glyph(180., 's'));
let glyph_t = Glyph::new(&rasterizer.get_glyph(180., 't'));
let glyph_r = Glyph::new(&rasterizer.get_glyph(&desc, 180., 'R'));
let glyph_u = Glyph::new(&rasterizer.get_glyph(&desc, 180., 'u'));
let glyph_s = Glyph::new(&rasterizer.get_glyph(&desc, 180., 's'));
let glyph_t = Glyph::new(&rasterizer.get_glyph(&desc, 180., 't'));
unsafe {
gl::Enable(gl::BLEND);

17
src/text.rs
View File

@ -18,7 +18,7 @@ fn to_freetype_26_6(f: f32) -> isize {
}
#[derive(Clone, PartialEq, Eq, Hash)]
struct FontDesc {
pub struct FontDesc {
name: String,
style: String,
}
@ -46,7 +46,6 @@ impl Rasterizer {
}
pub fn get_face(&mut self, desc: &FontDesc) -> Option<Face<'static>> {
if let Some(face) = self.faces.get(desc) {
return Some(face.clone());
}
@ -64,9 +63,8 @@ impl Rasterizer {
None
}
pub fn get_glyph(&mut self, size: f32, c: char) -> RasterizedGlyph {
let face = self.get_face(&FontDesc::new("Ubuntu Mono", "Regular"))
.expect("TODO handle get_face error");
pub fn get_glyph(&mut self, desc: &FontDesc, size: f32, c: char) -> RasterizedGlyph {
let face = self.get_face(desc).expect("TODO handle get_face error");
// TODO DPI
face.set_char_size(to_freetype_26_6(size), 0, 96, 0).unwrap();
face.load_char(c as usize, freetype::face::RENDER).unwrap();
@ -94,12 +92,17 @@ pub struct RasterizedGlyph {
#[cfg(test)]
mod tests {
use super::Rasterizer;
use super::{Rasterizer, FontDesc};
#[cfg(target_os = "linux")]
fn font_desc() -> FontDesc {
FontDesc::new("Ubuntu Mono", "Regular")
}
#[test]
fn create_rasterizer_and_render_glyph() {
let mut rasterizer = Rasterizer::new();
let glyph = rasterizer.get_glyph(24., 'U');
let glyph = rasterizer.get_glyph(&font_desc(), 24., 'U');
println!("glyph: {:?}", glyph);