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

Adding a map creation plugin #57

Merged
CoCo_Sol merged 39 commits from map-generation into main 2024-02-21 20:10:03 +00:00
Conversation 0 Commits 39 Files changed 5 +8 -6
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit c11a797d38 - Show all commits

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

@ -9,13 +9,15 @@ use super::{Tile, TilePosition};
/// A plugin to handle the map generation. /// A plugin to handle the map generation.
pub struct MapGenerationPlugin; pub struct MapGenerationPlugin;
const MAP_GENERATION_ZOOM: f32 = 0.2;
impl Plugin for MapGenerationPlugin { impl Plugin for MapGenerationPlugin {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
app.add_event::<StartMapGeneration>() app.add_event::<StartMapGeneration>()
.add_event::<EndMapGeneration>() .add_event::<EndMapGeneration>()
.add_systems( .add_systems(
Update, Update,
(generate_map.after(delete_map), delete_map) (delete_map, generate_map.after(delete_map))
.run_if(in_state(crate::CurrentScene::Game)), .run_if(in_state(crate::CurrentScene::Game)),
); );
} }
@ -62,8 +64,7 @@ fn generate_map(
// If the map is generated, we send [EndMapGeneration] and set the local // If the map is generated, we send [EndMapGeneration] and set the local
// variables to None. // variables to None.
CoCo_Sol marked this conversation as resolved Outdated
tipragot commented 2024-02-20 01:26:47 +00:00
Outdated
Review
Copy link

Why don't you use HexPosition here?

Why don't you use HexPosition here?
CoCo_Sol commented 2024-02-20 10:29:48 +00:00
Outdated
Review
Copy link

because is not a hex position in a hex grid but a position in orthogonal grid

because is not a hex position in a hex grid but a position in orthogonal grid
tipragot commented 2024-02-20 11:01:26 +00:00
Outdated
Review
Copy link

You need to change the name of the function or take an HexPosition and convert it in the function, because it can be confusing that you use "tile" to describe the orthogonal position of an HexPosition

You need to change the name of the function or take an HexPosition and convert it in the function, because it can be confusing that you use "tile" to describe the orthogonal position of an HexPosition
CoCo_Sol commented 2024-02-20 11:08:42 +00:00
Outdated
Review
Copy link

you are right

you are right
CoCo_Sol marked this conversation as resolved
tipragot commented 2024-02-21 17:10:20 +00:00
Review
Copy link

This should be in the get_type function and the value shouldn't be hard coded

This should be in the get_type function and the value shouldn't be hard coded
if let Some(position) = spiral.next() { if let Some(position) = spiral.next() {
let pixel_position = position.to_pixel_coordinates() * 0.2; commands.spawn((get_type_tile(position, noise), position as TilePosition));
commands.spawn((get_type(pixel_position, noise), position as TilePosition));
} else { } else {
end_generation_writer.send(EndMapGeneration); end_generation_writer.send(EndMapGeneration);
*local_noise = None; *local_noise = None;
@ -72,8 +73,9 @@ fn generate_map(
} }
CoCo_Sol marked this conversation as resolved Outdated
tipragot commented 2024-02-20 01:29:16 +00:00
Outdated
Review
Copy link

This comment is wrong.

This comment is wrong.
/// Returns the type of the position with the given noise. /// Returns the type of the position with the given noise.
CoCo_Sol marked this conversation as resolved Outdated
tipragot commented 2024-02-21 17:11:09 +00:00
Outdated
Review
Copy link

I still think you should take an HexPosition, this will be simpler and will make this function simpler to use.

I still think you should take an HexPosition, this will be simpler and will make this function simpler to use.
fn get_type(position: Vec2, noise: &Perlin) -> Tile { fn get_type_tile(position: HexPosition<i32>, noise: &Perlin) -> Tile {
let value = noise.get([position.x as f64, position.y as f64]); let pixel_position = position.to_pixel_coordinates() * MAP_GENERATION_ZOOM;
CoCo_Sol marked this conversation as resolved Outdated
tipragot commented 2024-02-21 17:47:05 +00:00
Outdated
Review
Copy link

get_tile_type

get_tile_type
let value = noise.get([pixel_position.x as f64, pixel_position.y as f64]);
CoCo_Sol marked this conversation as resolved Outdated
tipragot commented 2024-02-21 17:57:49 +00:00
Outdated
Review
Copy link

This is not a Zoom, it is a Scale

This is not a Zoom, it is a Scale
match value { match value {
v if v <= -0.4 => Tile::Hill, v if v <= -0.4 => Tile::Hill,
v if v >= 0.4 => Tile::Forest, v if v >= 0.4 => Tile::Forest,
@ -81,7 +83,7 @@ fn get_type(position: Vec2, noise: &Perlin) -> Tile {
} }
} }
CoCo_Sol marked this conversation as resolved Outdated
tipragot commented 2024-02-21 17:12:05 +00:00
Outdated
Review
Copy link

What this ":" doing here ?

What this ":" doing here ?
/// Despawns the tiles if the event : [StartMapGeneration] is received. /// Despawns the tiles if the event [StartMapGeneration] is received.
fn delete_map( fn delete_map(
mut commands: Commands, mut commands: Commands,
query: Query<Entity, With<Tile>>, query: Query<Entity, With<Tile>>,