CrispyPin/marble-machinations
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
Crispy 2024-12-09 20:44:35 +01:00
parent e223a75c0e
commit e9e763332f
4 changed files with 14 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/marble_engine/board.rs
View file

@ -26,7 +26,7 @@ impl Board {
rows.push(tiles);
}
for line in &mut rows {
line.resize(width, Tile::default());
line.resize(width, Tile::BLANK);
}
Board::new(rows)
@ -44,7 +44,7 @@ impl Board {
}
pub fn new_empty(width: usize, height: usize) -> Self {
let rows = vec![vec![Tile::default(); width]; height];
let rows = vec![vec![Tile::BLANK; width]; height];
Self {
rows,
width,
@ -89,7 +89,7 @@ impl Board {
if self.in_bounds(p) {
self.rows[p.y as usize][p.x as usize]
} else {
Tile::default()
Tile::BLANK
}
}
@ -137,7 +137,7 @@ impl Board {
if p.x < 0 {
let len = p.x.unsigned_abs() as usize;
for row in &mut self.rows {
let mut new_row = vec![Tile::default(); len];
let mut new_row = vec![Tile::BLANK; len];
new_row.append(row);
*row = new_row;
}
@ -146,21 +146,21 @@ impl Board {
} else if p.x as usize >= self.width {
let new_width = p.x as usize + 1;
for row in &mut self.rows {
row.resize(new_width, Tile::default());
row.resize(new_width, Tile::BLANK);
}
self.width = new_width;
}
if p.y < 0 {
let len = p.y.unsigned_abs() as usize;
let mut new_rows = vec![vec![Tile::default(); self.width]; len];
let mut new_rows = vec![vec![Tile::BLANK; self.width]; len];
new_rows.append(&mut self.rows);
self.rows = new_rows;
offset_y = len;
self.height += len;
} else if p.y as usize >= self.height {
let new_height = p.y as usize + 1;
self.rows.resize(new_height, vec![Tile::default(); self.width]);
self.rows.resize(new_height, vec![Tile::BLANK; self.width]);
self.height = new_height;
}
(offset_x as PosInt, offset_y as PosInt)