Skip to content

Commit

Permalink
BevyRenet: remove renet system sets
Browse files Browse the repository at this point in the history
  • Loading branch information
@lucaspoffo
lucaspoffo committed Jul 14, 2023
1 parent e763da5 commit 5f61be5
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 125 deletions.
113 changes: 2 additions & 111 deletions bevy_renet/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,14 @@ use renet::{RenetClient, RenetServer, ServerEvent};

#[cfg(feature = "transport")]
pub mod transport;

/// Set for networking systems.
#[derive(SystemSet, Debug, Hash, PartialEq, Eq, Clone, Copy)]
pub enum RenetSet {
/// Runs when server resource available.
Server,
/// Runs when client resource available.
Client,
}

pub struct RenetServerPlugin;

pub struct RenetClientPlugin;

impl Plugin for RenetServerPlugin {
fn build(&self, app: &mut App) {
app.init_resource::<Events<ServerEvent>>();

app.configure_set(Update, RenetSet::Server.run_if(resource_exists::<RenetServer>()));

app.add_systems(PreUpdate, Self::update_system.in_set(RenetSet::Server));
app.add_systems(PreUpdate, Self::update_system.run_if(resource_exists::<RenetServer>()));
}
}

Expand All @@ -42,9 +29,7 @@ impl RenetServerPlugin {

impl Plugin for RenetClientPlugin {
fn build(&self, app: &mut App) {
app.configure_set(Update, RenetSet::Client.run_if(resource_exists::<RenetClient>()));

app.add_systems(PreUpdate, Self::update_system.in_set(RenetSet::Client));
app.add_systems(PreUpdate, Self::update_system.run_if(resource_exists::<RenetClient>()));
}
}

Expand All @@ -53,97 +38,3 @@ impl RenetClientPlugin {
client.update(time.delta());
}
}

// #[cfg(test)]
// mod tests {
// use crate::renet::{ClientAuthentication, RenetConnectionConfig, ServerAuthentication, ServerConfig};
// use std::{
// error::Error,
// net::{IpAddr, Ipv4Addr, SocketAddr, UdpSocket},
// time::SystemTime,
// };

// use super::*;

// #[test]
// fn sending_and_receiving_messages() {
// env_logger::init();
// let server = create_server().unwrap();
// let client = create_client().unwrap();

// let mut app = App::new();
// app.add_plugins(MinimalPlugins)
// .add_plugin(RenetServerPlugin::default())
// .add_plugin(RenetClientPlugin::default())
// .insert_resource(server)
// .insert_resource(client);

// // Connect client
// loop {
// app.update();
// if app.world.resource::<RenetClient>().is_connected() {
// break;
// }
// }

// let client_id = app.world.resource::<RenetClient>().client_id();
// for index in 0..10 {
// // Send message from server to client
// let server_message = format!("Hello from server {}", index).as_bytes().to_vec();
// let mut server = app.world.resource_mut::<RenetServer>();
// server.send_message(client_id, 0, server_message.clone());

// app.update();
// app.update();

// let mut client = app.world.resource_mut::<RenetClient>();
// let message = client.receive_message(0).expect("Unable to receive message from server");
// assert_eq!(message, server_message);

// // Send message from client to server
// let client_message = format!("Hello from client {}", index).as_bytes().to_vec();
// client.send_message(0, client_message.clone());

// app.update();
// app.update();

// let mut server = app.world.resource_mut::<RenetServer>();
// let message = server.receive_message(client_id, 0).expect("Unable to receive message from client");
// assert_eq!(message, client_message);
// }
// }

// const SERVER_PORT: u16 = 4444;
// const SERVER_IP: IpAddr = IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1));
// const PROTOCOL_ID: u64 = 7;

// fn create_server() -> Result<RenetServer, Box<dyn Error>> {
// let server_addr = SocketAddr::new(SERVER_IP, SERVER_PORT);
// RenetServer::new(
// SystemTime::now().duration_since(SystemTime::UNIX_EPOCH)?,
// ServerConfig::new(64, PROTOCOL_ID, server_addr, ServerAuthentication::Unsecure),
// RenetConnectionConfig::default(),
// UdpSocket::bind(server_addr)?,
// )
// .map_err(From::from)
// }

// fn create_client() -> Result<RenetClient, Box<dyn Error>> {
// let current_time = SystemTime::now().duration_since(SystemTime::UNIX_EPOCH)?;
// let client_id = current_time.as_millis() as u64;
// let ip = SERVER_IP;
// let authentication = ClientAuthentication::Unsecure {
// client_id,
// server_addr: SocketAddr::new(ip, SERVER_PORT),
// protocol_id: PROTOCOL_ID,
// user_data: None,
// };
// RenetClient::new(
// current_time,
// UdpSocket::bind((ip, 0))?,
// RenetConnectionConfig::default(),
// authentication,
// )
// .map_err(From::from)
// }
// }
20 changes: 6 additions & 14 deletions bevy_renet/src/transport.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,7 @@ use renet::{

use bevy::{app::AppExit, prelude::*};

use crate::RenetSet;

/// Set for networking systems.
#[derive(SystemSet, Debug, Hash, PartialEq, Eq, Clone, Copy)]
pub enum TransportSet {
Client,
Server,
}
use crate::{RenetClientPlugin, RenetServerPlugin};

pub struct NetcodeServerPlugin;

Expand All @@ -27,14 +20,14 @@ impl Plugin for NetcodeServerPlugin {
Self::update_system
.run_if(resource_exists::<NetcodeServerTransport>())
.run_if(resource_exists::<RenetServer>())
.after(RenetSet::Server),
.after(RenetServerPlugin::update_system),
);

app.add_systems(
PostUpdate,
(Self::send_packets, Self::disconnect_on_exit)
.run_if(resource_exists::<NetcodeServerTransport>())
.run_if(resource_exists::<RenetServer>())
.after(RenetSet::Server),
.run_if(resource_exists::<RenetServer>()),
);
}
}
Expand Down Expand Up @@ -71,14 +64,13 @@ impl Plugin for NetcodeClientPlugin {
Self::update_system
.run_if(resource_exists::<NetcodeClientTransport>())
.run_if(resource_exists::<RenetClient>())
.after(RenetSet::Client),
.after(RenetClientPlugin::update_system),
);
app.add_systems(
PostUpdate,
(Self::send_packets, Self::disconnect_on_exit)
.run_if(resource_exists::<NetcodeClientTransport>())
.run_if(resource_exists::<RenetClient>())
.after(RenetSet::Client),
.run_if(resource_exists::<RenetClient>()),
);
}
}
Expand Down

0 comments on commit 5f61be5

Please sign in to comment.