Changeset 7680 in orxonox.OLD for branches

Timestamp:

May 18, 2006, 2:10:11 PM (19 years ago)

Author:

patrick

Message:

network: network manager now runs with its own frequency

Location:

branches/network/src

Files:

• lib/network/netdefs.h (modified) (1 diff)
• lib/network/network_manager.cc (modified) (2 diffs)
• lib/network/network_manager.h (modified) (2 diffs)
• story_entities/multi_player_world.cc (modified) (1 diff)

branches/network/src/lib/network/netdefs.h

@@ -18 +18 @@
 
 #define MAX_CONNECTIONS 1000
+
+#define NETWORK_FREQUENCY 33
 
 

branches/network/src/lib/network/network_manager.cc

@@ -52 +52 @@
   this->defaultSyncStream = NULL;
   this->sharedNetworkData = SharedNetworkData::getInstance();
+  this->elapsedTime = 0.0f;
 
   PRINTF(0)("NetworkManager created\n");
@@ -123 +124 @@
 /**
  *  sync the network
+ *  @param dtS: the seceonds elapsed since the last synchronize call
  */
-void NetworkManager::synchronize()
+void NetworkManager::synchronize( float dtS)
 {
+  this->elapsedTime += dtS;
+  if( likely(this->elapsedTime < 1.0f / NETWORK_FREQUENCY))
+    return;
+  this->elapsedTime = 0.0f;
+
   if (this->netStreamList != NULL || (this->netStreamList = ClassList::getList(CL_NETWORK_STREAM)) != NULL)
   {

branches/network/src/lib/network/network_manager.h

@@ -45 +45 @@
 
     void connectSynchronizeable(Synchronizeable& sync);
-    void synchronize();
+    void synchronize(float dtS);
 
     void debug();
@@ -61 +61 @@
 
     SharedNetworkData*               sharedNetworkData;       //!< reference to the shared data
+    float                            elapsedTime;             //!< elapsed time since the last network update
 };
 

branches/network/src/story_entities/multi_player_world.cc

@@ -81 +81 @@
 void MultiPlayerWorld::synchronize()
 {
-  NetworkManager::getInstance()->synchronize();
+  NetworkManager::getInstance()->synchronize(this->dtS);
 }