x/box-o-sand
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Beginning of sudoku chapter 7 with SDM loading

Browse Source
This commit is contained in:
Dan Buch
2022-11-25 15:37:57 -05:00
parent 8f38a3b271
commit 7d2ac20ce1
7 changed files with 233 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
piston-tutorials/sudoku/src/gameboard.rs
View File

@@ -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);
}
}

19
piston-tutorials/sudoku/src/gameboard_controller.rs
View File

@@ -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),
_ => {}
}
}
}
}
}

46
piston-tutorials/sudoku/src/gameboard_view.rs
View File

@@ -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) {
use graphics::{Line, Rectangle};
pub fn draw<G: Graphics, C>(
&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);

8
piston-tutorials/sudoku/src/main.rs
View File

@@ -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);
})
}
}