xevion/Pac-Man
1
0
Fork 0
mirror of https://github.com/Xevion/Pac-Man.git synced 2025-12-07 16:07:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactor: switch NodeId to u16, use I8Vec2 for grid coordinates

Browse Source
This commit is contained in:
Ryan Walters
2025-09-01 12:37:44 -05:00
parent 1206cf9ad1
commit 0cbd6f1aac
11 changed files with 94 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/map/parser.rs
View File

@@ -2,7 +2,7 @@
use crate::constants::{MapTile, BOARD_CELL_SIZE};
use crate::error::ParseError;
use glam::IVec2;
use glam::I8Vec2;
/// Structured representation of parsed ASCII board layout with extracted special positions.
///
@@ -15,11 +15,11 @@ pub struct ParsedMap {
/// 2D array of tiles converted from ASCII characters
pub tiles: [[MapTile; BOARD_CELL_SIZE.y as usize]; BOARD_CELL_SIZE.x as usize],
/// Two positions marking the ghost house entrance (represented by '=' characters)
pub house_door: [Option<IVec2>; 2],
pub house_door: [Option<I8Vec2>; 2],
/// Two positions marking tunnel portals for wraparound teleportation ('T' characters)
pub tunnel_ends: [Option<IVec2>; 2],
pub tunnel_ends: [Option<I8Vec2>; 2],
/// Starting position for Pac-Man (marked by 'X' character in the layout)
pub pacman_start: Option<IVec2>,
pub pacman_start: Option<I8Vec2>,
}
/// Parser for converting raw board layouts into structured map data.
@@ -88,7 +88,7 @@ impl MapTileParser {
let mut tiles = [[MapTile::Empty; BOARD_CELL_SIZE.y as usize]; BOARD_CELL_SIZE.x as usize];
let mut house_door = [None; 2];
let mut tunnel_ends = [None; 2];
let mut pacman_start: Option<IVec2> = None;
let mut pacman_start: Option<I8Vec2> = None;
for (y, line) in raw_board.iter().enumerate().take(BOARD_CELL_SIZE.y as usize) {
for (x, character) in line.chars().enumerate().take(BOARD_CELL_SIZE.x as usize) {
@@ -98,16 +98,16 @@ impl MapTileParser {
match tile {
MapTile::Tunnel => {
if tunnel_ends[0].is_none() {
tunnel_ends[0] = Some(IVec2::new(x as i32, y as i32));
tunnel_ends[0] = Some(I8Vec2::new(x as i8, y as i8));
} else {
tunnel_ends[1] = Some(IVec2::new(x as i32, y as i32));
tunnel_ends[1] = Some(I8Vec2::new(x as i8, y as i8));
}
}
MapTile::Wall if character == '=' => {
if house_door[0].is_none() {
house_door[0] = Some(IVec2::new(x as i32, y as i32));
house_door[0] = Some(I8Vec2::new(x as i8, y as i8));
} else {
house_door[1] = Some(IVec2::new(x as i32, y as i32));
house_door[1] = Some(I8Vec2::new(x as i8, y as i8));
}
}
_ => {}
@@ -115,7 +115,7 @@ impl MapTileParser {
// Track Pac-Man's starting position
if character == 'X' {
pacman_start = Some(IVec2::new(x as i32, y as i32));
pacman_start = Some(I8Vec2::new(x as i8, y as i8));
}
tiles[x][y] = tile;