generated from tipragot/rust
add let else
This commit is contained in:
parent
915d5ba5a4
commit
74d81721c7
|
@ -41,25 +41,25 @@ fn generate_map(
|
|||
mut event: EventReader<StartMapGeneration>,
|
||||
mut end_map_event: EventWriter<EndMapGeneration>,
|
||||
mut commands: Commands,
|
||||
mut noise: Local<Option<Perlin>>,
|
||||
mut spiral: Local<Option<HexSpiral<i32>>>,
|
||||
mut local_noise: Local<Option<Perlin>>,
|
||||
mut local_spiral: Local<Option<HexSpiral<i32>>>,
|
||||
) {
|
||||
// Handle map generation events.
|
||||
for event in event.read() {
|
||||
*noise = Some(Perlin::new(event.seed));
|
||||
*spiral = Some(TilePosition::new(0,0).spiral(event.radius as usize));
|
||||
*local_noise = Some(Perlin::new(event.seed));
|
||||
*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;
|
||||
}
|
||||
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));
|
||||
commands.spawn((get_type(pixel_position, &noise.unwrap()), position as TilePosition));
|
||||
commands.spawn((get_type(pixel_position, &noise), position as TilePosition));
|
||||
} else {
|
||||
end_map_event.send(EndMapGeneration);
|
||||
*noise = None;
|
||||
*spiral = None;
|
||||
*local_noise = None;
|
||||
*local_spiral = None;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue