Hello, World!(文字列)の表示処理を追加。

Author: kotetuco

src/font.rs

@@ -4,11 +4,29 @@
 
 use font_def::FONT_DATAS;
 
-pub struct Font;
+pub struct Font {
+    size_width: u16,
+    size_height: u16,
+}
 
 impl Font {
-    pub fn get_charactor(ch: char) -> [u8; 16] {
+    pub fn new() -> Self {
+        Font {
+            size_width: 8,
+            size_height: 16,
+        }
+    }
+
+    pub fn get_character(&self, ch: char) -> [u8; 16] {
         let index = ch as usize;
         return FONT_DATAS[index];
     }
+
+    pub fn font_width(&self) -> u16 {
+        return self.size_width;
+    }
+
+    pub fn font_height(&self) -> u16 {
+        return self.size_height;
+    }
 }

src/font_def.rs

@@ -3,6 +3,7 @@
 // 本フォントデータは「30日でできる! OS自作入門」に付属するCD-ROM内のフォントデータファイルを元に作成したものです。
 //
 
+// 8 x 16のフォントデータ
 #[allow(unused_imports)]
 pub static FONT_DATAS: [[u8; 16]; 256] = [
 [0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0],

src/graphics.rs

@@ -10,6 +10,7 @@ pub struct Graphics {
     vram_address: u32,
     screen_x: u16,
     screen_y: u16,
+    font: Font,
 }
 
 impl Graphics {
@@ -18,6 +19,7 @@ impl Graphics {
             vram_address: 0x06000000,
             screen_x: 240,
             screen_y: 160,
+            font: Font::new(),
         }
     }
 
@@ -71,7 +73,7 @@ impl Graphics {
     }
 
     pub fn draw_char(&self, ch:char, x:u16, y:u16, color:&RGB) {
-        let char_data:[u8; 16] = Font::get_charactor(ch);
+        let char_data:[u8; 16] = self.font.get_character(ch);
         for index in 0..15 {
             let byte_data:u8 = char_data[index];
             let offset_y = index as u16;
@@ -86,6 +88,14 @@ impl Graphics {
         }
     }
 
+    pub fn draw_string(&self, string:&str, x:u16, y:u16, color:&RGB) {
+        let mut offset_x: u16 = 0;
+        for character in string.chars() {
+            self.draw_char(character, (x + offset_x), y, color);
+            offset_x += self.font.font_width();
+        }
+    }
+
     pub fn width(&self) -> u16 {
         return self.screen_x;
     }

src/lib.rs

@@ -36,11 +36,7 @@ pub extern "C" fn entry() {
     graphics.draw_circle(graphics.width() - (radius + 1), (radius + 1), radius, &RGB::light_yellow());
 
     // character
-    let start_x:u16 = 0;
-    let start_y:u16 = 0;
-    graphics.draw_char('a', start_x, start_y, &RGB::white());
-    graphics.draw_char('b', start_x + (8 * 1), start_y, &RGB::white());
-    graphics.draw_char('c', start_x + (8 * 2), start_y, &RGB::white());
+    graphics.draw_string("Hello, World!", 0, 0, &RGB::white());
 
     loop {}
 }