feat: change starting position of PacMan, draw current PacMan on grid

This commit is contained in:
2023-09-09 21:12:36 -05:00
parent 422535c00d
commit 786fbb5002

View File

@@ -1,13 +1,13 @@
use sdl2::image::LoadTexture; use sdl2::image::LoadTexture;
use sdl2::keyboard::Keycode; use sdl2::keyboard::Keycode;
use sdl2::render::{TextureCreator, Texture}; use sdl2::render::{Texture, TextureCreator};
use sdl2::video::WindowContext; use sdl2::video::WindowContext;
use sdl2::{pixels::Color, render::Canvas, video::Window}; use sdl2::{pixels::Color, render::Canvas, video::Window};
use crate::constants::{MapTile, BOARD, BOARD_HEIGHT, BOARD_WIDTH}; use crate::constants::{MapTile, BOARD, BOARD_HEIGHT, BOARD_WIDTH};
use crate::direction::Direction; use crate::direction::Direction;
use crate::entity::Entity; use crate::entity::Entity;
use crate::pacman::{Pacman}; use crate::pacman::Pacman;
pub struct Game<'a> { pub struct Game<'a> {
canvas: &'a mut Canvas<Window>, canvas: &'a mut Canvas<Window>,
@@ -24,7 +24,7 @@ impl Game<'_> {
let pacman_atlas = texture_creator let pacman_atlas = texture_creator
.load_texture("assets/32/pacman.png") .load_texture("assets/32/pacman.png")
.expect("Could not load pacman texture"); .expect("Could not load pacman texture");
let pacman = Pacman::new(None, pacman_atlas); let pacman = Pacman::new(Some(Game::cell_to_pixel((1, 4))), pacman_atlas);
Game { Game {
canvas, canvas,
@@ -36,6 +36,10 @@ impl Game<'_> {
} }
} }
pub fn cell_to_pixel(cell: (u32, u32)) -> (i32, i32) {
((cell.0 as i32 * 24), ((cell.1) as i32 * 24))
}
pub fn keyboard_event(&mut self, keycode: Keycode) { pub fn keyboard_event(&mut self, keycode: Keycode) {
match keycode { match keycode {
Keycode::D => { Keycode::D => {
@@ -65,7 +69,7 @@ impl Game<'_> {
// Clear the screen (black) // Clear the screen (black)
self.canvas.set_draw_color(Color::RGB(0, 0, 0)); self.canvas.set_draw_color(Color::RGB(0, 0, 0));
self.canvas.clear(); self.canvas.clear();
self.canvas self.canvas
.copy(&self.map_texture, None, None) .copy(&self.map_texture, None, None)
.expect("Could not render texture on canvas"); .expect("Could not render texture on canvas");
@@ -75,25 +79,42 @@ impl Game<'_> {
// Draw a grid // Draw a grid
if self.debug { if self.debug {
for x in 0..BOARD_WIDTH { for x in 0..BOARD_WIDTH {
for y in 0..BOARD_HEIGHT { for y in 0..BOARD_HEIGHT {
let tile = BOARD[x as usize][y as usize]; let tile = BOARD[x as usize][y as usize];
let color = match tile { let mut color = None;
MapTile::Empty => None,
MapTile::Wall => Some(Color::BLUE),
MapTile::Pellet => Some(Color::RED),
MapTile::PowerPellet => Some(Color::MAGENTA),
MapTile::StartingPosition(_) => Some(Color::GREEN),
};
if let Some(color) = color { if (x, y) == self.pacman.cell_position() {
self.canvas.set_draw_color(color); self.draw_cell((x, y), Color::CYAN);
self.canvas } else {
.draw_rect(sdl2::rect::Rect::new(x as i32 * 24, y as i32 * 24, 24, 24)) color = match tile {
.expect("Could not draw rectangle"); MapTile::Empty => None,
MapTile::Wall => Some(Color::BLUE),
MapTile::Pellet => Some(Color::RED),
MapTile::PowerPellet => Some(Color::MAGENTA),
MapTile::StartingPosition(_) => Some(Color::GREEN),
};
}
if let Some(color) = color {
self.draw_cell((x, y), color);
}
} }
} }
} }
}
self.canvas.present();
}
fn draw_cell(&mut self, cell: (u32, u32), color: Color) {
self.canvas.set_draw_color(color);
self.canvas
.draw_rect(sdl2::rect::Rect::new(
cell.0 as i32 * 24,
cell.1 as i32 * 24,
24,
24,
))
.expect("Could not draw rectangle");
} }
} }