fish-cannard/border-wars
fish-cannard/border-wars
5
3
Fork 0
generated from tipragot/rust
Code Issues 10 Pull requests 3 Actions Packages Projects Releases Wiki Activity

add let else
Some checks failed
Rust Checks / checks (push) Failing after 4s
Details
Rust Checks / checks (pull_request) Failing after 4s
Details

Browse source
This commit is contained in:
CoCo_Sol 2024-02-21 11:35:11 +01:00
parent 915d5ba5a4
commit 74d81721c7
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
crates/border-wars/src/map/generation.rs
View file

@ -41,25 +41,25 @@ fn generate_map(
mut event: EventReader<StartMapGeneration>, mut event: EventReader<StartMapGeneration>,
mut end_map_event: EventWriter<EndMapGeneration>, mut end_map_event: EventWriter<EndMapGeneration>,
mut commands: Commands, mut commands: Commands,
mut noise: Local<Option<Perlin>>, mut local_noise: Local<Option<Perlin>>,
mut spiral: Local<Option<HexSpiral<i32>>>, mut local_spiral: Local<Option<HexSpiral<i32>>>,
) { ) {
// Handle map generation events. // Handle map generation events.
for event in event.read() { for event in event.read() {
*noise = Some(Perlin::new(event.seed)); *local_noise = Some(Perlin::new(event.seed));
*spiral = Some(TilePosition::new(0,0).spiral(event.radius as usize)); *local_spiral = Some(TilePosition::new(0,0).spiral(event.radius as usize));
} }
if let (None, None) = (noise.as_ref(), spiral.as_mut()) { let (Some(noise), Some(spiral)) = (local_noise.as_ref(), local_spiral.as_mut()) else {
return; return;
} };
if let Some(position) = spiral.as_mut().unwrap().next() { if let Some(position) = spiral.next() {
let pixel_position = position.to_pixel_coordinates((0.2, 0.2)); let pixel_position = position.to_pixel_coordinates((0.2, 0.2));
commands.spawn((get_type(pixel_position, &noise.unwrap()), position as TilePosition)); commands.spawn((get_type(pixel_position, &noise), position as TilePosition));
} else { } else {
end_map_event.send(EndMapGeneration); end_map_event.send(EndMapGeneration);
*noise = None; *local_noise = None;
*spiral = None; *local_spiral = None;
} }
} }