Revert "Giving tiles its own two-axis iterator implementation based on the Grid struct in the maze example"

This reverts commit 5bbbc0c.

Author: sunjay

examples/reversi/board.rs

@@ -2,7 +2,10 @@ use std::ops::Deref;
 
 use turtle::Color;
 
-use tiles::{Tiles, Position};
+/// (Row, Column)
+pub type Position = (usize, usize);
+
+type Tiles = [[Option<Piece>; 8]; 8];
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum Piece {
@@ -33,11 +36,11 @@ impl Piece {
     }
 }
 
-fn valid_moves_for(tiles: &Tiles, piece: Piece) -> Vec<Position> {
+fn valid_moves_for(tiles: Tiles, piece: Piece) -> Vec<Position> {
     Default::default() //TODO
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Board {
     current: Piece,
     /// None - empty tile
@@ -65,7 +68,7 @@ impl Board {
         tiles[4][3] = Some(Piece::B);
         tiles[4][4] = Some(Piece::A);
         let current = Piece::A;
-        let valid_moves = valid_moves_for(&tiles, current);
+        let valid_moves = valid_moves_for(tiles, current);
 
         Self {
             current,

examples/reversi/main.rs

@@ -5,7 +5,6 @@
 extern crate turtle;
 
 mod board;
-mod tiles;
 
 use std::f64::consts::PI;
 
@@ -34,8 +33,8 @@ fn main() {
     let width = 580.0;
     let height = 580.0;
     let board = Board::new();
-    let rows = board.col_size();
-    let cols = board.row_size();
+    let rows = board.len();
+    let cols = board[0].len();
 
     // These values are used quite often, so it makes sense to compute them in advance so that
     // we don't need to keep repeating ourselves
@@ -48,7 +47,6 @@ fn main() {
         tile_height: height / rows as f64,
     };
 
-    turtle.set_speed("instant"); //TODO: Remove this line
     turtle.pen_up();
     turtle.forward(height / 2.0);
     turtle.right(90.0);
@@ -89,8 +87,8 @@ fn draw_board(turtle: &mut Turtle, dim: &Dimensions) {
 
 fn draw_board_pieces(turtle: &mut Turtle, board: &Board, dim: &Dimensions) {
     // Draw starting pieces
-    for (row, row_pieces) in board.rows().enumerate() {
-        for (col, piece) in row_pieces.enumerate() {
+    for (row, row_pieces) in board.iter().enumerate() {
+        for (col, piece) in row_pieces.iter().enumerate() {
             if let &Some(piece) = piece {
                 move_to_tile(turtle, (row, col), &dim);
                 draw_piece(turtle, piece, &dim);
@@ -119,6 +117,7 @@ fn play_game(turtle: &mut Turtle, mut board: Board, dim: &Dimensions) {
             let row = ((1.0 - (mouse[1] + dim.height/2.0) / dim.height) * dim.rows as f64).floor() as isize;
             let col = ((mouse[0] + dim.width/2.0) / dim.width * dim.cols as f64).floor() as isize;
 
+            println!("Play {:?}", (row, col));
             if row >= 0 && row < dim.rows as isize
                 && col >= 0 && col < dim.cols as isize
                 && board.is_valid_move(&(row as usize, col as usize)) {