Add ping to client props

ddnet · Jan 18, 2025 · 7dae5b7 · 7dae5b7
1 parent 39514b1
commit 7dae5b7
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 10 deletions.
diff --git a/game/editor/src/client.rs b/game/editor/src/client.rs
@@ -262,6 +262,7 @@ impl EditorClient {
                     color: self.color,
                     cursor_world: cursor_world_pos,
                     server_id: self.server_id,
+                    stats: None,
                 },
             )));
     }

diff --git a/game/editor/src/editor.rs b/game/editor/src/editor.rs
@@ -2452,9 +2452,6 @@ impl Editor {
                 color: None,
             },
         );
-        self.tabs
-            .values_mut()
-            .for_each(|tab| tab.client.update_info(vec2::new(-10000.0, -10000.0)));
 
         Ok(hash)
     }

diff --git a/game/editor/src/event.rs b/game/editor/src/event.rs
@@ -8,7 +8,8 @@ use async_trait::async_trait;
 use base::hash::Hash;
 use math::math::vector::vec2;
 use network::network::{
-    connection::NetworkConnectionId, event::NetworkEvent,
+    connection::{ConnectionStats, NetworkConnectionId},
+    event::NetworkEvent,
     event_generator::NetworkEventToGameEventGenerator,
 };
 use serde::{Deserialize, Serialize};
@@ -46,6 +47,8 @@ pub struct ClientProps {
 
     /// unique id on the server
     pub server_id: u64,
+
+    pub stats: Option<ConnectionStats>,
 }
 
 /// editor events are a collection of either actions or commands

diff --git a/game/editor/src/server.rs b/game/editor/src/server.rs
@@ -15,6 +15,7 @@ use graphics::{
     },
 };
 use map::map::Map;
+use math::math::vector::vec2;
 use network::network::{
     connection::NetworkConnectionId,
     event::NetworkEvent,
@@ -128,12 +129,14 @@ impl EditorServer {
                         mapper_name: mapper_name.clone(),
                         color: *color,
 
-                        cursor_world: Default::default(),
+                        cursor_world: vec2::new(-10000.0, -10000.0),
                         server_id: {
                             let id = self.client_ids;
                             self.client_ids += 1;
                             id
                         },
+
+                        stats: client.props.stats,
                     };
 
                     if !*is_local_client {
@@ -356,6 +359,7 @@ impl EditorServer {
                     EditorEventClientToServer::Info(mut info) => {
                         // make sure the id stays unique
                         info.server_id = client.props.server_id;
+                        info.stats = client.props.stats;
                         client.props = info;
 
                         self.broadcast_client_infos();
@@ -417,6 +421,11 @@ impl EditorServer {
 
                                 self.broadcast_client_infos();
                             }
+                            NetworkEvent::NetworkStats(stats) => {
+                                if let Some(client) = self.clients.get_mut(&id) {
+                                    client.props.stats = Some(*stats);
+                                }
+                            }
                             _ => {
                                 // ignore
                             }

diff --git a/game/editor/src/ui/top_tabs/main_frame.rs b/game/editor/src/ui/top_tabs/main_frame.rs
@@ -1,4 +1,4 @@
-use egui::Button;
+use egui::{Button, Grid};
 use ui_base::types::UiRenderPipe;
 
 use crate::ui::user_data::UserData;
@@ -27,9 +27,20 @@ pub fn render(ui: &mut egui::Ui, pipe: &mut UiRenderPipe<UserData>) {
                     if tab.client.clients.len() > 1 {
                         btn = btn.on_hover_ui(|ui| {
                             ui.vertical(|ui| {
-                                for client in tab.client.clients.iter() {
-                                    ui.label(&client.mapper_name);
-                                }
+                                Grid::new("overview-mappers-network-tooltip")
+                                    .num_columns(2)
+                                    .show(ui, |ui| {
+                                        for client in tab.client.clients.iter() {
+                                            ui.label(&client.mapper_name);
+                                            if let Some(stats) = &client.stats {
+                                                ui.label(format!(
+                                                    "Ping: {}ms",
+                                                    stats.ping.as_millis()
+                                                ));
+                                            }
+                                            ui.end_row();
+                                        }
+                                    });
                             });
                         })
                     }

diff --git a/lib/network/src/network/connection.rs b/lib/network/src/network/connection.rs
@@ -24,7 +24,7 @@ impl NetworkConnectionId {
     }
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 pub struct ConnectionStats {
     pub ping: Duration,
     pub packets_lost: u64,