Changeset 7825

Timestamp:

Dec 29, 2010, 11:41:51 PM (14 years ago)

Author:

scheusso

Message:

-enabling client-side gamestate diffing
-added some optimisations

Location:

code/branches/network6/src/libraries/network

Files:

• ClientConnection.cc (modified) (1 diff)
• Connection.cc (modified) (1 diff)
• Connection.h (modified) (1 diff)
• GamestateManager.cc (modified) (3 diffs)
• packet/Gamestate.cc (modified) (1 diff)
• synchronisable/Synchronisable.cc (modified) (2 diffs)

code/branches/network6/src/libraries/network/ClientConnection.cc

@@ -42 +42 @@
 
   ClientConnection::ClientConnection():
+    Connection(NETWORK_PEER_ID_SERVER),
     established_(false),
     server_(NULL)

code/branches/network6/src/libraries/network/Connection.cc

@@ -43 +43 @@
   const boost::posix_time::millisec NETWORK_COMMUNICATION_THREAD_WAIT_TIME(20);
 
-  Connection::Connection():
-    host_(0), bCommunicationThreadRunning_(false), nextPeerID_(NETWORK_PEER_ID_SERVER+1)
+  Connection::Connection(uint32_t firstPeerID):
+    host_(0), bCommunicationThreadRunning_(false), nextPeerID_(firstPeerID)
   {
     enet_initialize();

code/branches/network6/src/libraries/network/Connection.h

@@ -105 +105 @@
 
   protected:
-    Connection();
+    Connection(uint32_t firstPeerID = NETWORK_PEER_ID_SERVER+1);
     
     void startCommunicationThread();

code/branches/network6/src/libraries/network/GamestateManager.cc

@@ -149 +149 @@
       newID = ++id_;
     else
+    {
+      assert(peerMap_.size()!=0);
       newID = peerMap_[NETWORK_PEER_ID_SERVER].lastProcessedGamestateID;
+    }
     
     if(!currentGamestate_->collectData(newID, gsMode)){ //we have no data to send
@@ -172 +175 @@
         continue;
       }
-      COUT(4) << "client id: " << peerIt->first << std::endl;
+      COUT(5) << "client id: " << peerIt->first << std::endl;
       COUT(5) << "Server: doing gamestate gamestate preparation" << std::endl;
       int peerID = peerIt->first; //get client id
@@ -244 +247 @@
 //     assert(b);
     clock.capture();
-    COUT(4) << "diff and compress time: " << clock.getDeltaTime() << endl;
+    COUT(5) << "diff and compress time: " << clock.getDeltaTime() << endl;
 //     COUT(5) << "sending gamestate with id " << gs->getID();
 //     if(gamestate->isDiffed())

code/branches/network6/src/libraries/network/packet/Gamestate.cc

@@ -107 +107 @@
   uint32_t size = calcGamestateSize(id, mode);
 
-  COUT(4) << "G.ST.Man: producing gamestate with id: " << id << std::endl;
+  COUT(5) << "G.ST.Man: producing gamestate with id: " << id << std::endl;
   if(size==0)
     return false;

code/branches/network6/src/libraries/network/synchronisable/Synchronisable.cc

@@ -295 +295 @@
    * @param mem pointer to the bytestream
    * @param mode same as in getData
-   * @param forceCallback FIXME - add doc!
+   * @param forceCallback this makes updateData call each callback
    * @return true/false
    */
@@ -372 +372 @@
    * This function determines, wheter the object should be saved to the bytestream (according to its syncmode/direction)
    * @param id gamestate id
-   * @param mode FIXME - add doc!
+   * @param mode Synchronisation mode (toclient, toserver or bidirectional)
    * @return true/false
    */
   bool Synchronisable::doSync(int32_t id, uint8_t mode)
   {
-    if(mode==0x0)
-      mode=state_;
+//     if(mode==0x0)
+//       mode=state_;
+    assert(mode!=0x0);
     return ( (this->objectMode_ & mode)!=0 && (!syncList_.empty() ) );
   }