diff options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/breakout/client.rs | 10 | ||||
| -rw-r--r-- | examples/breakout/server.rs | 45 | ||||
| -rw-r--r-- | examples/chat/client.rs | 8 | ||||
| -rw-r--r-- | examples/chat/server.rs | 16 |
4 files changed, 37 insertions, 42 deletions
diff --git a/examples/breakout/client.rs b/examples/breakout/client.rs index 234a0bd..5d07e7f 100644 --- a/examples/breakout/client.rs +++ b/examples/breakout/client.rs @@ -197,7 +197,10 @@ pub(crate) fn handle_server_messages( mut scoreboard: ResMut<Scoreboard>, mut collision_events: EventWriter<CollisionEvent>, ) { - while let Ok(Some(message)) = client.connection_mut().receive_message::<ServerMessage>() { + while let Some(message) = client + .connection_mut() + .try_receive_message::<ServerMessage>() + { match message { ServerMessage::InitClient { client_id } => { client_data.self_id = client_id; @@ -300,10 +303,9 @@ pub(crate) fn move_paddle( if local.current_input != paddle_input { client .connection() - .send_message(ClientMessage::PaddleInput { + .try_send_message(ClientMessage::PaddleInput { input: paddle_input.clone(), - }) - .unwrap(); + }); local.current_input = paddle_input; } } diff --git a/examples/breakout/server.rs b/examples/breakout/server.rs index a06bb86..662e12e 100644 --- a/examples/breakout/server.rs +++ b/examples/breakout/server.rs @@ -92,8 +92,8 @@ pub(crate) fn start_listening(mut server: ResMut<Server>) { } pub(crate) fn handle_client_messages(mut server: ResMut<Server>, mut players: ResMut<Players>) { - while let Ok(Some((message, client_id))) = - server.endpoint_mut().receive_message::<ClientMessage>() + while let Some((message, client_id)) = + server.endpoint_mut().try_receive_message::<ClientMessage>() { match message { ClientMessage::PaddleInput { input } => { @@ -157,16 +157,13 @@ pub(crate) fn update_paddles( paddle_transform.translation.x = new_paddle_position.clamp(left_bound, right_bound); - server - .endpoint() - .send_group_message( - players.map.keys().into_iter(), - ServerMessage::PaddleMoved { - entity: paddle_entity, - position: paddle_transform.translation, - }, - ) - .unwrap(); + server.endpoint().try_send_group_message( + players.map.keys().into_iter(), + ServerMessage::PaddleMoved { + entity: paddle_entity, + position: paddle_transform.translation, + }, + ); } } } @@ -200,12 +197,10 @@ pub(crate) fn check_for_collisions( if let Some(brick) = maybe_brick { commands.entity(collider_entity).despawn(); - endpoint - .broadcast_message(ServerMessage::BrickDestroyed { - by_client_id: ball.last_hit_by, - brick_id: brick.0, - }) - .unwrap(); + endpoint.try_broadcast_message(ServerMessage::BrickDestroyed { + by_client_id: ball.last_hit_by, + brick_id: brick.0, + }); } // reflect the ball when it collides @@ -232,14 +227,12 @@ pub(crate) fn check_for_collisions( ball_velocity.y = -ball_velocity.y; } - endpoint - .broadcast_message(ServerMessage::BallCollided { - owner_client_id: ball.last_hit_by, - entity: ball_entity, - position: ball_transform.translation, - velocity: ball_velocity.0, - }) - .unwrap(); + endpoint.try_broadcast_message(ServerMessage::BallCollided { + owner_client_id: ball.last_hit_by, + entity: ball_entity, + position: ball_transform.translation, + velocity: ball_velocity.0, + }); } } } diff --git a/examples/chat/client.rs b/examples/chat/client.rs index ce71226..d9908ae 100644 --- a/examples/chat/client.rs +++ b/examples/chat/client.rs @@ -47,7 +47,10 @@ pub fn on_app_exit(app_exit_events: EventReader<AppExit>, client: Res<Client>) { } fn handle_server_messages(mut users: ResMut<Users>, mut client: ResMut<Client>) { - while let Ok(Some(message)) = client.connection_mut().receive_message::<ServerMessage>() { + while let Some(message) = client + .connection_mut() + .try_receive_message::<ServerMessage>() + { match message { ServerMessage::ClientConnected { client_id, @@ -94,8 +97,7 @@ fn handle_terminal_messages( } else { client .connection() - .send_message(ClientMessage::ChatMessage { message: message }) - .expect("Failed to send chat message"); + .try_send_message(ClientMessage::ChatMessage { message: message }); } } } diff --git a/examples/chat/server.rs b/examples/chat/server.rs index 4a3481a..007e038 100644 --- a/examples/chat/server.rs +++ b/examples/chat/server.rs @@ -64,15 +64,13 @@ fn handle_client_messages(mut server: ResMut<Server>, mut users: ResMut<Users>) users.names.get(&client_id), message ); - endpoint - .send_group_message( - users.names.keys().into_iter(), - ServerMessage::ChatMessage { - client_id: client_id, - message: message, - }, - ) - .unwrap(); + endpoint.try_send_group_message( + users.names.keys().into_iter(), + ServerMessage::ChatMessage { + client_id: client_id, + message: message, + }, + ); } } } |