Jayrude
/
harenae-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Chunk get_cell function

This commit is contained in:
Jarrod Doyle 2024-01-29 15:31:14 +00:00
parent 41b629ea23
commit 9e3dc5b3d4
Signed by: Jayrude
GPG Key ID: 38B57B16E7C0ADF7
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/falling_sand/mod.rs
View File

@ -96,6 +96,14 @@ impl Chunk {
self.dirty_rect.add_point(x0, y0); self.dirty_rect.add_point(x0, y0);
self.dirty_rect.add_point(x1, y1); self.dirty_rect.add_point(x1, y1);
} }
pub fn get_cell(&self, x: usize, y: usize) -> Option<&Element> {
if x >= self.width || y >= self.height {
return None;
}
Some(&self.cells[x + y * self.width])
}
} }
pub fn place_sand_system(mut chunk: Query<&mut Chunk>) { pub fn place_sand_system(mut chunk: Query<&mut Chunk>) {
@ -124,22 +132,19 @@ pub fn simulate_chunk_system(mut chunk: Query<&mut Chunk>) {
// Simulate sand // Simulate sand
for y in 0..chunk.height { for y in 0..chunk.height {
for x in 0..chunk.width { for x in 0..chunk.width {
let index = x + y * chunk.width; let element = chunk.get_cell(x, y).unwrap();
let element = chunk.cells.get(index).unwrap();
match element { match element {
Element::Air => {} Element::Air => {}
Element::Sand => { Element::Sand => {
if y != 0 { if y != 0 {
let b_index = index - chunk.width; let bottom = chunk.get_cell(x, y - 1).unwrap();
let bottom = chunk.cells.get(b_index).unwrap();
if *bottom == Element::Air { if *bottom == Element::Air {
chunk.swap_cells(x, y, x, y - 1); chunk.swap_cells(x, y, x, y - 1);
continue; continue;
} }
if x != 0 { if x != 0 {
let bl_index = b_index - 1; let bottom_left = chunk.get_cell(x - 1, y - 1).unwrap();
let bottom_left = chunk.cells.get(bl_index).unwrap();
if *bottom_left == Element::Air { if *bottom_left == Element::Air {
chunk.swap_cells(x, y, x - 1, y - 1); chunk.swap_cells(x, y, x - 1, y - 1);
continue; continue;
@ -147,8 +152,7 @@ pub fn simulate_chunk_system(mut chunk: Query<&mut Chunk>) {
} }
if x != chunk.width - 1 { if x != chunk.width - 1 {
let br_index = b_index + 1; let bottom_right = chunk.get_cell(x + 1, y - 1).unwrap();
let bottom_right = chunk.cells.get(br_index).unwrap();
if *bottom_right == Element::Air { if *bottom_right == Element::Air {
chunk.swap_cells(x, y, x + 1, y - 1); chunk.swap_cells(x, y, x + 1, y - 1);
continue; continue;