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 +12 -11
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit fcd0bdf9ed - Show all commits

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

@ -11,8 +11,8 @@ pub struct MapGenerationPlugin;
impl Plugin for MapGenerationPlugin {
fn build(&self, app: &mut App) {
app.add_event::<MapGenerationEvent>()
.add_event::<EndMapGenerationEvent>()
app.add_event::<MapGeneration>()
.add_event::<EndMapGeneration>()
.add_systems(
Update,
(generate_map.after(delete_map), delete_map)
@ -23,7 +23,7 @@ impl Plugin for MapGenerationPlugin {
/// An event to trigger the generation of the map.
#[derive(Event)]
pub struct MapGenerationEvent {
pub struct MapGeneration {
CoCo_Sol marked this conversation as resolved Outdated
tipragot commented 2024-02-20 01:22:48 +00:00
Outdated
Review
Copy link

If the End event start with "End" why this don't start with "Start" ?

If the End event start with "End" why this don't start with "Start" ?
/// The seed used to generate the map.
pub seed: u32,
@ -33,12 +33,12 @@ pub struct MapGenerationEvent {
/// An event send when the map is generated.
#[derive(Event)]
pub struct EndMapGenerationEvent;
pub struct EndMapGeneration;
CoCo_Sol marked this conversation as resolved Outdated
tipragot commented 2024-02-18 18:06:48 +00:00
Outdated
Review
Copy link

You should follow the bevy convention. Events in bevy doen't finish with "Event".

You should follow the bevy convention. Events in bevy doen't finish with "Event".
/// Spawns the tiles if the event is received.
fn generate_map(
mut event: EventReader<MapGenerationEvent>,
mut end_map_event: EventWriter<EndMapGenerationEvent>,
mut event: EventReader<MapGeneration>,
mut end_map_event: EventWriter<EndMapGeneration>,
mut commands: Commands,
mut noise: Local<Option<Perlin>>,
CoCo_Sol marked this conversation as resolved Outdated
tipragot commented 2024-02-21 17:47:19 +00:00
Outdated
Review
Copy link

Perlin isn't a function

Perlin isn't a function
mut map_iterator: Local<Option<HexSpiral<isize>>>,
CoCo_Sol marked this conversation as resolved Outdated
tipragot commented 2024-02-20 01:31:50 +00:00
Outdated
Review
Copy link

Isize will not be great to use for networking because it's length depend on the system that runs the program.
Also you should use type to alias a specific type for the HexPosition used for the map.

Isize will not be great to use for networking because it's length depend on the system that runs the program. Also you should use `type` to alias a specific type for the HexPosition used for the map.
CoCo_Sol commented 2024-02-20 10:33:51 +00:00
Outdated
Review
Copy link

I use only one time the hex position, is it really better to create a new type ?

I use only one time the hex position, is it really better to create a new type ?
tipragot commented 2024-02-20 10:59:12 +00:00
Outdated
Review
Copy link

You will use it every time you want to make a Query on the HexPosition

You will use it every time you want to make a Query on the HexPosition
CoCo_Sol commented 2024-02-20 11:07:36 +00:00
Outdated
Review
Copy link

ok, you've convinced me

ok, you've convinced me
@ -51,10 +51,10 @@ fn generate_map(
if let (Some(perlin), Some(spiral)) = (noise.as_ref(), map_iterator.as_mut()) {
CoCo_Sol marked this conversation as resolved Outdated
tipragot commented 2024-02-20 01:25:17 +00:00
Outdated
Review
Copy link

You can use the let else syntax to remove one level of nesting.

You can use the let else syntax to remove one level of nesting.
CoCo_Sol commented 2024-02-20 10:38:52 +00:00
Outdated
Review
Copy link

if I use the "else let" keyword, the nesting level is the same

if I use the "else let" keyword, the nesting level is the same
tipragot commented 2024-02-20 12:40:58 +00:00
Outdated
Review
Copy link

No because you do an early return

No because you do an early return
CoCo_Sol commented 2024-02-20 20:15:57 +00:00
Outdated
Review
Copy link

I have to write an unwrap so ?

I have to write an unwrap so ?
tipragot commented 2024-02-21 06:51:23 +00:00
Outdated
Review
Copy link

No, an let else

No, an let else
if let Some(position) = spiral.next() {
let pixel_position = position.to_pixel_coordinates((0.1, 0.1));
let pixel_position = position.to_pixel_coordinates((0.2, 0.2)); // Réduire la taille de la tuile
commands.spawn((get_type_tile(pixel_position, perlin), position));
} else {
end_map_event.send(EndMapGenerationEvent);
end_map_event.send(EndMapGeneration);
*noise = None;
*map_iterator = None;
}
@ -65,17 +65,18 @@ fn generate_map(
fn get_type_tile(position: (f32, f32), noise: &Perlin) -> Tile {
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
let value = noise.get([position.0 as f64, position.1 as f64]);
match value {
v if v <= -0.4 => Tile::Hill,
v if v >= 0.4 => Tile::Forest,
v if v <= -0.5 => Tile::Hill, // Réduire le seuil pour les collines
v if v >= 0.5 => Tile::Forest, // Réduire le seuil pour les forêts
_ => Tile::Grass,
}
}
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.
/// Despawns the tiles if the event : [EndMapGenerationEvent] is received.
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 delete_map(
mut commands: Commands,
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
query: Query<Entity, With<Tile>>,
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
mut event: EventReader<MapGenerationEvent>,
mut event: EventReader<MapGeneration>,
) {
for _ in event.read() {
for entity in query.iter() {