diff --git a/src/main.rs b/src/main.rs index 24b1d94..7f6d901 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,8 +3,8 @@ use ggez::graphics::{self, Color, DrawMode, Mesh, MeshBuilder}; use ggez::{Context, ContextBuilder, GameResult}; struct Apr { - rows: i32, - cols: i32, + row: i32, + col: i32, board: Vec>, grid: Mesh, // Your state here... @@ -61,8 +61,8 @@ impl Apr { // Load/create resources such as images here. let board = make_board(r, c); Apr { - rows: r, - cols: c, + row: r, + col: c, grid: make_grid(_ctx, r, c, board.as_slice()).unwrap(), board: board, __TEST_state : 0, @@ -71,7 +71,7 @@ impl Apr { fn set_colour(&mut self, ctx : &mut Context, r : usize, c : usize, col : u8) -> GameResult<()> { self.board[r][c] = col; - self.grid = make_grid(ctx, self.rows, self.cols, self.board.as_slice())?; + self.grid = make_grid(ctx, self.row, self.col, self.board.as_slice())?; Ok(()) } } @@ -80,10 +80,12 @@ impl EventHandler for Apr { fn update(&mut self, _ctx: &mut Context) -> GameResult<()> { // Err(ggez::GameError::CustomError("You done messed up trying to play this game!".to_string())) // Update code here... - let c = self.__TEST_state % 8; - let r = (self.__TEST_state / 8) % 8; - self.set_colour(_ctx, r, c, (self.board[r][c] + 1) % 8)?; - self.__TEST_state += 1; + for x in 0..self.row*self.col/5 { + let c = self.__TEST_state % self.col as usize; + let r = (self.__TEST_state / self.row as usize) % self.row as usize; + self.set_colour(_ctx, r, c, (self.board[r][c] + 1) % 8)?; + self.__TEST_state += 1; + } Ok(()) } @@ -106,7 +108,7 @@ fn main() { // Create an instance of your event handler. // Usually, you should provide it with the Context object to // use when setting your game up. - let apr = Apr::new(&mut ctx, 8, 8); + let apr = Apr::new(&mut ctx, 16, 16); // Run! event::run(ctx, event_loop, apr);