Beginning of sudoku chapter 7 with SDM loading

piston-tutorials/sudoku/assets/LICENSE

@@ -0,0 +1,99 @@
+Copyright (c) 2014, Mozilla Foundation https://mozilla.org/
+with Reserved Font Name Fira Sans.
+
+Copyright (c) 2014, Mozilla Foundation https://mozilla.org/
+with Reserved Font Name Fira Mono.
+
+Copyright (c) 2014, Telefonica S.A.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

piston-tutorials/sudoku/src/gameboard.rs

@@ -2,6 +2,7 @@
 
 const SIZE: usize = 9;
 
+#[derive(Debug, PartialEq)]
 pub struct Gameboard {
     pub cells: [[u8; SIZE]; SIZE],
 }
@@ -12,4 +13,68 @@ impl Gameboard {
             cells: [[0; SIZE]; SIZE],
         }
     }
+
+    pub fn char(&self, ind: [usize; 2]) -> Option<char> {
+        Some(match self.cells[ind[1]][ind[0]] {
+            1 => '1',
+            2 => '2',
+            3 => '3',
+            4 => '4',
+            5 => '5',
+            6 => '6',
+            7 => '7',
+            8 => '8',
+            9 => '9',
+            _ => return None,
+        })
+    }
+
+    pub fn set(&mut self, ind: [usize; 2], val: u8) {
+        self.cells[ind[1]][ind[0]] = val;
+    }
+
+    pub fn load_sdm(filename: &str) -> Self {
+        use std::fs::read_to_string;
+
+        let data = read_to_string(filename).expect("failed to read SDM file");
+        let mut cells = [[0; SIZE]; SIZE];
+        let mut row = 0;
+        let mut col = 0;
+        for c in data.chars() {
+            if col == SIZE {
+                col = 0;
+                row += 1;
+            }
+            if let Some(d) = c.to_digit(10) {
+                cells[row][col] = d as u8;
+                col += 1;
+            }
+        }
+
+        Self { cells }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn load_sdm() {
+        let got = Gameboard::load_sdm("static/puzzle.sdm");
+        let want = Gameboard {
+            cells: [
+                [0, 1, 6, 4, 0, 0, 0, 0, 0],
+                [2, 0, 0, 0, 0, 9, 0, 0, 0],
+                [4, 0, 0, 0, 0, 0, 0, 6, 2],
+                [0, 7, 0, 2, 3, 0, 1, 0, 0],
+                [1, 0, 0, 0, 0, 0, 0, 0, 3],
+                [0, 0, 3, 0, 8, 7, 0, 4, 0],
+                [9, 6, 0, 0, 0, 0, 0, 0, 5],
+                [0, 0, 0, 8, 0, 0, 0, 0, 7],
+                [0, 0, 0, 0, 0, 6, 8, 2, 0],
+            ],
+        };
+        assert_eq!(got, want);
+    }
 }

piston-tutorials/sudoku/src/gameboard_controller.rs

@@ -20,7 +20,7 @@ impl GameboardController {
     }
 
     pub fn event<E: GenericEvent>(&mut self, pos: [f64; 2], size: f64, e: &E) {
-        use piston::input::{Button, MouseButton};
+        use piston::input::{Button, Key, MouseButton};
 
         if let Some(pos) = e.mouse_cursor_args() {
             self.cursor_pos = pos;
@@ -36,5 +36,22 @@ impl GameboardController {
                 self.selected_cell = Some([cell_x, cell_y]);
             }
         }
+
+        if let Some(Button::Keyboard(key)) = e.press_args() {
+            if let Some(ind) = self.selected_cell {
+                match key {
+                    Key::D1 => self.gameboard.set(ind, 1),
+                    Key::D2 => self.gameboard.set(ind, 2),
+                    Key::D3 => self.gameboard.set(ind, 3),
+                    Key::D4 => self.gameboard.set(ind, 4),
+                    Key::D5 => self.gameboard.set(ind, 5),
+                    Key::D6 => self.gameboard.set(ind, 6),
+                    Key::D7 => self.gameboard.set(ind, 7),
+                    Key::D8 => self.gameboard.set(ind, 8),
+                    Key::D9 => self.gameboard.set(ind, 9),
+                    _ => {}
+                }
+            }
+        }
     }
 }

piston-tutorials/sudoku/src/gameboard_view.rs

@@ -1,5 +1,6 @@
 //! Gameboard view.
 
+use graphics::character::CharacterCache;
 use graphics::types::Color;
 use graphics::{Context, Graphics};
 
@@ -17,6 +18,7 @@ pub struct GameboardViewSettings {
     pub section_edge_radius: f64,
     pub cell_edge_radius: f64,
     pub selected_cell_background_color: Color,
+    pub text_color: Color,
 }
 
 impl GameboardViewSettings {
@@ -33,6 +35,7 @@ impl GameboardViewSettings {
             section_edge_radius: 2.0,
             cell_edge_radius: 1.0,
             selected_cell_background_color: [0.9, 0.9, 1.0, 1.0],
+            text_color: [0.0, 0.0, 0.1, 1.0],
         }
     }
 }
@@ -46,8 +49,16 @@ impl GameboardView {
         GameboardView { settings: settings }
     }
 
-    pub fn draw<G: Graphics>(&self, controller: &GameboardController, c: &Context, g: &mut G) {
+    pub fn draw<G: Graphics, C>(
-        use graphics::{Line, Rectangle};
+        &self,
+        controller: &GameboardController,
+        glyphs: &mut C,
+        c: &Context,
+        g: &mut G,
+    ) where
+        C: CharacterCache<Texture = G::Texture>,
+    {
+        use graphics::{Image, Line, Rectangle, Transformed};
 
         let ref settings = self.settings;
         let board_rect = [
@@ -76,6 +87,37 @@ impl GameboardView {
             );
         }
 
+        let text_image = Image::new_color(settings.text_color);
+        let cell_size = settings.size / 9.0;
+
+        for j in 0..9 {
+            for i in 0..9 {
+                if let Some(ch) = controller.gameboard.char([i, j]) {
+                    let pos = [
+                        settings.position[0] + i as f64 * cell_size + 15.0,
+                        settings.position[1] + j as f64 * cell_size + 34.0,
+                    ];
+
+                    if let Ok(character) = glyphs.character(34, ch) {
+                        let ch_x = pos[0] + character.left();
+                        let ch_y = pos[1] - character.top();
+                        let text_image = text_image.src_rect([
+                            character.atlas_offset[0],
+                            character.atlas_offset[1],
+                            character.atlas_size[0],
+                            character.atlas_size[1],
+                        ]);
+                        text_image.draw(
+                            character.texture,
+                            &c.draw_state,
+                            c.transform.trans(ch_x, ch_y),
+                            g,
+                        );
+                    }
+                }
+            }
+        }
+
         let cell_edge = Line::new(settings.cell_edge_color, settings.cell_edge_radius);
         let section_edge = Line::new(settings.section_edge_color, settings.section_edge_radius);
 

piston-tutorials/sudoku/src/main.rs

@@ -5,7 +5,7 @@
 extern crate glutin_window;
 
 use glutin_window::GlutinWindow;
-use opengl_graphics::{GlGraphics, OpenGL};
+use opengl_graphics::{Filter, GlGraphics, GlyphCache, OpenGL, TextureSettings};
 use piston::event_loop::{EventSettings, Events};
 use piston::{EventLoop, RenderEvent, WindowSettings};
 
@@ -32,6 +32,10 @@ fn main() {
     let gameboard_view_settings = GameboardViewSettings::new();
     let gameboard_view = GameboardView::new(gameboard_view_settings);
 
+    let texture_settings = TextureSettings::new().filter(Filter::Nearest);
+    let ref mut glyphs = GlyphCache::new("assets/FiraSans-Regular.ttf", (), texture_settings)
+        .expect("Could not load font");
+
     while let Some(e) = events.next(&mut window) {
         gameboard_controller.event(
             gameboard_view.settings.position,
@@ -43,7 +47,7 @@ fn main() {
                 use graphics::clear;
 
                 clear([1.0; 4], g);
-                gameboard_view.draw(&gameboard_controller, &c, g);
+                gameboard_view.draw(&gameboard_controller, glyphs, &c, g);
             })
         }
     }

piston-tutorials/sudoku/static/puzzle.sdm

@@ -0,0 +1 @@
+016400000200009000400000062070230100100000003003087040960000005000800007000006820