From 0d048b3a576b30618d2b62d46dd05ea129abbd4e Mon Sep 17 00:00:00 2001 From: CoCo_Sol007 Date: Thu, 21 Mar 2024 10:07:46 +0100 Subject: [PATCH] save --- crates/border-wars/src/lib.rs | 4 +-- crates/border-wars/src/main.rs | 2 +- .../{networkinig => networking}/connection.rs | 27 ++++++++++--------- .../src/{networkinig => networking}/mod.rs | 4 +-- crates/border-wars/src/scenes/lobby.rs | 4 +-- crates/border-wars/src/scenes/menu.rs | 4 +-- 6 files changed, 23 insertions(+), 22 deletions(-) rename crates/border-wars/src/{networkinig => networking}/connection.rs (72%) rename crates/border-wars/src/{networkinig => networking}/mod.rs (93%) diff --git a/crates/border-wars/src/lib.rs b/crates/border-wars/src/lib.rs index 2d48358..0b72f15 100644 --- a/crates/border-wars/src/lib.rs +++ b/crates/border-wars/src/lib.rs @@ -3,12 +3,12 @@ use bevnet::Uuid; use bevy::prelude::*; use bevy::utils::HashMap; -use networkinig::GameRank; +use networking::GameRank; use serde::{Deserialize, Serialize}; pub mod camera; pub mod map; -pub mod networkinig; +pub mod networking; pub mod responsive_scale; pub mod scenes; diff --git a/crates/border-wars/src/main.rs b/crates/border-wars/src/main.rs index 98de956..205a9d6 100644 --- a/crates/border-wars/src/main.rs +++ b/crates/border-wars/src/main.rs @@ -4,7 +4,7 @@ use bevy::prelude::*; use border_wars::camera::CameraPlugin; use border_wars::map::renderer::RendererPlugin; use border_wars::map::selected_tile::SelectTilePlugin; -use border_wars::networkinig::NetworkingPlugin; +use border_wars::networking::NetworkingPlugin; use border_wars::scenes::ScenesPlugin; fn main() { diff --git a/crates/border-wars/src/networkinig/connection.rs b/crates/border-wars/src/networking/connection.rs similarity index 72% rename from crates/border-wars/src/networkinig/connection.rs rename to crates/border-wars/src/networking/connection.rs index 1db57cd..a73df1c 100644 --- a/crates/border-wars/src/networkinig/connection.rs +++ b/crates/border-wars/src/networking/connection.rs @@ -8,9 +8,9 @@ use super::GameRank; use crate::{AllPlayers, CurrentScene, Player}; /// A plugin that manage connections (add, remove). -pub struct ConnectionPuglin; +pub struct ConnectionPlugin; -impl Plugin for ConnectionPuglin { +impl Plugin for ConnectionPlugin { fn build(&self, app: &mut App) { app.add_network_event::() .add_network_event::() @@ -19,23 +19,24 @@ impl Plugin for ConnectionPuglin { } } -/// An event that is trigger whene a new player request to join a game. +/// An event that is trigger when a new player request to join a game. #[derive(Event, Serialize, Deserialize)] pub struct RequestJoin(pub Player); -/// An event that is trigger whene a new player is added. +/// An event that is trigger when a new player is added. #[derive(Event, Serialize, Deserialize)] pub struct AddPlayer(Uuid, Player); -/// An event that is trigger whene a player is removed. +/// An event that is trigger when a player is removed. #[derive(Event, Serialize, Deserialize)] pub struct RemovePlayer(pub Uuid); -/// A fonction that handle join request and add it. +/// A fonction that accept new connection. +/// It add the player to the list of all players. pub fn accept_connection( all_players: Res, - mut requests_join: EventReader>, - mut add_players: EventWriter>, + mut requests_join_event: EventReader>, + mut add_players_event: EventWriter>, connection: Res, state: Res>, ) { @@ -48,7 +49,7 @@ pub fn accept_connection( return; } - for request_join in requests_join.read() { + for request_join in requests_join_event.read() { let new_uuid = request_join.0; let mut new_player = request_join.1.0.clone(); @@ -60,17 +61,17 @@ pub fn accept_connection( new_player.rank = GameRank::Spectator; } - add_players.send(SendTo(new_uuid, AddPlayer(new_uuid, new_player.clone()))); + add_players_event.send(SendTo(new_uuid, AddPlayer(new_uuid, new_player.clone()))); for (uuid, player) in all_players.0.iter() { // Link all players - add_players.send(SendTo(*uuid, AddPlayer(new_uuid, new_player.clone()))); - add_players.send(SendTo(new_uuid, AddPlayer(*uuid, player.clone()))); + add_players_event.send(SendTo(*uuid, AddPlayer(new_uuid, new_player.clone()))); + add_players_event.send(SendTo(new_uuid, AddPlayer(*uuid, player.clone()))); } } } -/// A fonction that handle new / remove players events. +/// A fonction that handle new / remove players when a events. pub fn handle_change_player( mut add_players: EventReader>, mut remove_players: EventReader>, diff --git a/crates/border-wars/src/networkinig/mod.rs b/crates/border-wars/src/networking/mod.rs similarity index 93% rename from crates/border-wars/src/networkinig/mod.rs rename to crates/border-wars/src/networking/mod.rs index 30dd552..bfc607f 100644 --- a/crates/border-wars/src/networkinig/mod.rs +++ b/crates/border-wars/src/networking/mod.rs @@ -4,7 +4,7 @@ use bevnet::{Connection, NetworkPlugin}; use bevy::prelude::*; use serde::{Deserialize, Serialize}; -use self::connection::ConnectionPuglin; +use self::connection::ConnectionPlugin; use crate::{AllPlayers, Player}; pub mod connection; @@ -15,7 +15,7 @@ pub struct NetworkingPlugin; impl Plugin for NetworkingPlugin { fn build(&self, app: &mut App) { app.add_plugins(NetworkPlugin::new("relay.cocosol.fr".to_string())) - .add_plugins(ConnectionPuglin) + .add_plugins(ConnectionPlugin) .init_resource::(); } } diff --git a/crates/border-wars/src/scenes/lobby.rs b/crates/border-wars/src/scenes/lobby.rs index 5eadd41..88ca4f2 100644 --- a/crates/border-wars/src/scenes/lobby.rs +++ b/crates/border-wars/src/scenes/lobby.rs @@ -4,8 +4,8 @@ use bevnet::{Connection, SendTo}; use bevy::prelude::*; use bevy_egui::{egui, EguiContexts}; -use crate::networkinig::connection::RemovePlayer; -use crate::networkinig::GameRank; +use crate::networking::connection::RemovePlayer; +use crate::networking::GameRank; use crate::{AllPlayers, CurrentScene}; /// The plugin for the lobby. diff --git a/crates/border-wars/src/scenes/menu.rs b/crates/border-wars/src/scenes/menu.rs index 7a2bf0b..fe16511 100644 --- a/crates/border-wars/src/scenes/menu.rs +++ b/crates/border-wars/src/scenes/menu.rs @@ -4,8 +4,8 @@ use bevnet::{Connection, SendTo, Uuid}; use bevy::prelude::*; use bevy_egui::{egui, EguiContexts}; -use crate::networkinig::connection::RequestJoin; -use crate::networkinig::GameRank; +use crate::networking::connection::RequestJoin; +use crate::networking::GameRank; use crate::{AllPlayers, CurrentScene, Player}; /// The plugin for the menu.