Changeset 10334

Timestamp:

Mar 26, 2015, 1:38:24 PM (9 years ago)

Author:

frovelli

Message:

Added serverlist ping display in LAN

Location:

code/branches/multiplayerFS15

Files:

• data/gui/scripts/MultiplayerMenu.lua (modified) (5 diffs)
• src/libraries/network/LANDiscovery.cc (modified) (1 diff)
• src/libraries/network/LANDiscovery.h (modified) (2 diffs)
• src/libraries/network/ServerList.cc (modified) (6 diffs)
• src/libraries/network/packet/ServerInformation.cc (modified) (4 diffs)
• src/libraries/network/packet/ServerInformation.h (modified) (2 diffs)

code/branches/multiplayerFS15/data/gui/scripts/MultiplayerMenu.lua

@@ -93 +93 @@
         local servername = ""
         local serverip = ""
+        local serverrtt = ""
         while true do
             servername = discovery:getServerListItemName(index)
@@ -102 +103 @@
                 break
             end
-            table.insert(P.serverList, {servername, serverip})
+            serverrtt = discovery:getServerListItemRTT(index)
+
+            table.insert(P.serverList, {servername, serverip, serverrtt})
             index = index + 1
         end
         index = 1
         for k,v in pairs(P.serverList) do
-            local item = CEGUI.createListboxTextItem( v[1] .. ": " .. v[2] )
+            local item = CEGUI.createListboxTextItem( v[1] .. ": " .. v[2] .. " Ping: " .. v[3] .."ms" )
             item:setID(index)
             index = index + 1
@@ -125 +128 @@
         local servername = ""
         local serverip = ""
+        local serverrtt = ""
         while true do
             servername = discovery:getServerListItemName(index)
@@ -134 +138 @@
                 break
             end
-            table.insert(P.serverList, {servername, serverip})
+            serverrtt = discovery:getServerListItemRTT(index)
+
+            table.insert(P.serverList, {servername, serverip, serverrtt})
             index = index + 1
         end
         index = 1
         for k,v in pairs(P.serverList) do
-            local item = CEGUI.createListboxTextItem( v[1] .. ": " .. v[2] )
+            local item = CEGUI.createListboxTextItem( v[1] .. ": " .. v[2] .. " Ping: " .. v[3] .."ms" )
             item:setID(index)
             index = index + 1
@@ -150 +156 @@
 
 return P
-

code/branches/multiplayerFS15/src/libraries/network/LANDiscovery.cc

@@ -124 +124 @@
   }
 
+  std::string LANDiscovery::getServerListItemRTT(unsigned int index)
+  {
+    if( index >= this->servers_.size() )
+      return BLANKSTRING;
+    else{
+      uint32_t serverrtt = this->servers_[index].getServerRTT();
+      return Ogre::StringConverter::toString(serverrtt);
+    }
+
+  }
+
 
 } // namespace orxonox

code/branches/multiplayerFS15/src/libraries/network/LANDiscovery.h

@@ -33 +33 @@
 #include "packet/ServerInformation.h"
 #include "util/Singleton.h"
+#include <OgreStringConverter.h>
 
 #include <vector>
@@ -51 +52 @@
       std::string getServerListItemName( unsigned int index ); // tolua_export
       std::string getServerListItemIP( unsigned int index ); // tolua_export
+      std::string getServerListItemRTT( unsigned int index ); // tolua_export
       static LANDiscovery& getInstance(){ return Singleton<LANDiscovery>::getInstance(); } // tolua_export
-      
+
     private:
       static LANDiscovery* singletonPtr_s;

code/branches/multiplayerFS15/src/libraries/network/ServerList.cc

@@ -30 +30 @@
 
 namespace orxonox
-{ 
+{
   ServerList::ServerList()
   { /* create a new list */ }
@@ -39 +39 @@
   }
 
-  int 
+  int
   ServerList::addServer( packet::ServerInformation toadd,
     ENetPeer *peer )
-  { 
+  {
     ServerListElem toAdd;
     toAdd.ServerInfo = toadd;
     toAdd.peer = peer;
 
-    this->serverlist.push_back( toAdd ); 
+    this->serverlist.push_back( toAdd );
     return 0;
   }
 
-  bool 
+  bool
   ServerList::delServerByName( std::string name )
-  { 
+  {
     /* get an iterator */
     std::list<ServerListElem>::iterator i;
 
     /* loop through list elements */
-    for( i = serverlist.begin(); i != serverlist.end(); ++i ) 
+    for( i = serverlist.begin(); i != serverlist.end(); ++i )
       if( (*i).ServerInfo.getServerName() == name )
       { /* found this name, remove and quit */
@@ -68 +68 @@
 
   bool ServerList::delServerByAddress( std::string address )
-  { 
+  {
     /* get an iterator */
     std::list<ServerListElem>::iterator i;
 
     /* loop through list elements */
-    for( i = serverlist.begin(); i != serverlist.end(); ++i ) 
+    for( i = serverlist.begin(); i != serverlist.end(); ++i )
       if( (*i).ServerInfo.getServerIP() == address )
       { /* found this name, remove and quit */
@@ -90 +90 @@
 
     /* loop through list elements */
-    for( i = serverlist.begin(); i != serverlist.end(); ++i ) 
+    for( i = serverlist.begin(); i != serverlist.end(); ++i )
       if( (*i).ServerInfo.getServerIP() == address )
       { /* found the target, return it */
@@ -110 +110 @@
     /* iterate, return when name found */
     /* loop through list elements */
-    for( i = serverlist.begin(); i != serverlist.end(); ++i ) 
+    for( i = serverlist.begin(); i != serverlist.end(); ++i )
       if( (*i).ServerInfo.getServerName() == name )
-      { 
+      {
         ServerListSearchResult res = { (*i), true };
         return res;
@@ -124 +124 @@
   /* SORTING */
   /* sort by name */
-  bool sub_compare_names( ServerListElem no1, 
+  bool sub_compare_names( ServerListElem no1,
     ServerListElem no2 )
   { return no1.ServerInfo.getServerName() > no2.ServerInfo.getServerName(); }
 
   void ServerList::sortByName()
-  { 
-    this->serverlist.sort( sub_compare_names ); 
+  {
+    this->serverlist.sort( sub_compare_names );
   }
-  
+
   /* sort by ping */
-  bool sub_compare_pings( ServerListElem no1, 
+  bool sub_compare_pings( ServerListElem no1,
     ServerListElem no2 )
-  { 
-    return no1.ServerInfo.getServerName() > no2.ServerInfo.getServerName();
+  {
+    return no1.ServerInfo.getServerRTT() > no2.ServerInfo.getServerRTT();
   }
 
   void ServerList::sortByPing()
   {
-    this->serverlist.sort( sub_compare_pings ); 
+    this->serverlist.sort( sub_compare_pings );
   }
 

code/branches/multiplayerFS15/src/libraries/network/packet/ServerInformation.cc

@@ -39 +39 @@
   namespace packet
   {
-    
+
     ServerInformation::ServerInformation()
     {
-      
+
     }
-    
+
     ServerInformation::ServerInformation(ENetEvent* event)
     {
@@ -69 +69 @@
     ServerInformation::~ServerInformation()
     {
-      
+
     }
 
@@ -81 +81 @@
       ENetPacket* packet = enet_packet_create( temp, size, 0 );
       enet_peer_send(peer, 0, packet);
-      
+
       delete[] temp;
     }
-  
+
   } // namespace packet
 
@@ -95 +95 @@
   }
 } // namespace orxonox
-

code/branches/multiplayerFS15/src/libraries/network/packet/ServerInformation.h

@@ -45 +45 @@
         ServerInformation(ENetEvent* event);
         ~ServerInformation();
-        
+
         void          send( ENetPeer* peer );
         std::string   getServerIP() { return this->serverIP_; }
@@ -52 +52 @@
         void          setServerIP( std::string IP ) { this->serverIP_ = IP; }
         uint32_t      getServerRTT() { return this->serverRTT_; }
-        
+
       private:
         std::string   serverName_;