1 files changed, 49 insertions, 8 deletions

diff --git a/src/main.rs b/src/main.rs
index 31e3586a..1845bb94 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,13 +6,21 @@ extern crate gl;
 extern crate cgmath;
 extern crate euclid;
 
+use std::collections::HashMap;
+
 mod list_fonts;
 mod text;
 mod renderer;
+mod grid;
 
 use renderer::{Glyph, QuadRenderer};
 use text::FontDesc;
+use grid::Grid;
 
+static INIT_LIST: &'static str = "abcdefghijklmnopqrstuvwxyz\
+                                  ABCDEFGHIJKLMNOPQRSTUVWXYZ\
+                                  01234567890\
+                                  ~`!@#$%^&*()[]{}-_=+\\|\"/?.,<>";
 
 fn main() {
     let window = glutin::Window::new().unwrap();
@@ -29,13 +37,34 @@ fn main() {
     let (dpi_x, dpi_y) = window.get_dpi().unwrap();
     let dpr = window.hidpi_factor();
 
+    let font_size = 12.0;
+
+    let sep_x = 2;
+    let sep_y = 2;
+
     let desc = FontDesc::new("Ubuntu Mono", "Regular");
     let mut rasterizer = text::Rasterizer::new(dpi_x, dpi_y, dpr);
 
-    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'));
+    let (cell_width, cell_height) = rasterizer.box_size_for_font(&desc, font_size);
+
+    let num_cols = grid::num_cells_axis(cell_width, sep_x, width);
+    let num_rows = grid::num_cells_axis(cell_height, sep_y, height);
+
+    println!("num_cols, num_rows = {}, {}", num_cols, num_rows);
+
+    let mut grid = Grid::new(num_rows as usize, num_cols as usize);
+
+    grid[0][0] = grid::Cell::new(Some(String::from("R")));
+    grid[0][1] = grid::Cell::new(Some(String::from("u")));
+    grid[0][2] = grid::Cell::new(Some(String::from("s")));
+    grid[0][3] = grid::Cell::new(Some(String::from("t")));
+
+    let mut glyph_cache = HashMap::new();
+    for c in INIT_LIST.chars() {
+        let glyph = Glyph::new(&rasterizer.get_glyph(&desc, font_size, c));
+        let string: String = c.escape_default().collect();
+        glyph_cache.insert(string, glyph);
+    }
 
     unsafe {
         gl::Enable(gl::BLEND);
@@ -51,10 +80,22 @@ fn main() {
             gl::Clear(gl::COLOR_BUFFER_BIT);
         }
 
-        renderer.render(&glyph_r, 10.0, 10.0);
-        renderer.render(&glyph_u, 130.0, 10.0);
-        renderer.render(&glyph_s, 250.0, 10.0);
-        renderer.render(&glyph_t, 370.0, 10.0);
+        for i in 0..grid.rows() {
+            let row = &grid[i];
+            for j in 0..row.cols() {
+                let cell = &row[j];
+                if let Some(ref c) = cell.character {
+                    if let Some(glyph) = glyph_cache.get(&c[..]) {
+                        let y = (cell_height as f32 + sep_y as f32) * (i as f32);
+                        let x = (cell_width as f32 + sep_x as f32) * (j as f32);
+
+                        let y_inverted = (height as f32) - y - (cell_height as f32);
+
+                        renderer.render(glyph, x, y_inverted);
+                    }
+                }
+            }
+        }
 
         window.swap_buffers().unwrap();