Changeset 1769 for code/trunk

Timestamp:

Sep 11, 2008, 5:06:24 PM (16 years ago)

Author:

scheusso

Message:

sync frequencies do work now

Location:

code/trunk/src

Files:

• network/Client.cc (modified) (2 diffs)
• network/GamestateClient.cc (modified) (5 diffs)
• network/GamestateClient.h (modified) (2 diffs)
• network/GamestateManager.cc (modified) (2 diffs)
• network/packet/Acknowledgement.cc (modified) (3 diffs)
• orxonox/objects/Model.cc (modified) (2 diffs)

code/trunk/src/network/Client.cc

@@ -45 +45 @@
 #include "core/ConsoleCommand.h"
 #include "packet/Packet.h"
-#include "packet/Acknowledgement.h"
+// #include "packet/Acknowledgement.h"
 
 namespace network
@@ -166 +166 @@
       assert(packet->process());
     }
-    int gameStateID = gamestate.processGamestates();
-    if(gameStateID==GAMESTATEID_INITIAL)
-      if(gameStateFailure_){
-        packet::Acknowledgement *ack = new packet::Acknowledgement((unsigned int)GAMESTATEID_INITIAL, 0);
-        if(!ack->send())
-          COUT(3) << "could not (negatively) ack gamestate" << std::endl;
-        else
-          COUT(4) << "negatively acked a gamestate" << std::endl;
-        }
-      else
-        gameStateFailure_=true;
-    else if(gameStateID!=0){
-      // ack gamestate and set synched
+    if(gamestate.processGamestates())
+    {
       if(!isSynched_)
         isSynched_=true;
-      gameStateFailure_=false;
-      packet::Acknowledgement *ack = new packet::Acknowledgement(gameStateID, 0);
-      if(!ack->send())
-        COUT(3) << "could not ack gamestate" << std::endl;
-    }// otherwise we had no gamestate to load
+    }else
+      COUT(3) << "gamestate has not been processed sucessfully" << std::endl;
     gamestate.cleanup();
     return;

code/trunk/src/network/GamestateClient.cc

@@ -35 +35 @@
 #include "core/Iterator.h"
 #include "Synchronisable.h"
+#include "packet/Acknowledgement.h"
 
 
@@ -70 +71 @@
   }
 
-  int GamestateClient::processGamestates(){
+  bool GamestateClient::processGamestates(){
     if(tempGamestate_==NULL)
-      return 0;
+      return false;
     int id = GAMESTATEID_INITIAL;
     bool b = saveShipCache();
     packet::Gamestate *processed = processGamestate(tempGamestate_);
-    if(!processed)
-      return GAMESTATEID_INITIAL;
+    if(!processed){
+      if(b)
+        loadShipCache();
+      return false;
+    }
 //    assert(processed);
     //successfully loaded data from gamestate. now save gamestate for diff and delete the old gs
-    tempGamestate_=0;
+    tempGamestate_=NULL;
     gamestateMap_[processed->getID()]=processed;
     last_diff_ = processed->getID();
@@ -86 +90 @@
       loadShipCache();
     id = processed->getID();
-    cleanup();
-    return id;
+    sendAck(id);
+    return true;
   }
 
@@ -129 +133 @@
     COUT(4) << std::endl;
 
+  }
+  
+  bool GamestateClient::sendAck(unsigned int gamestateID){
+    packet::Acknowledgement *ack = new packet::Acknowledgement(gamestateID, 0);
+    if(!ack->send()){
+      COUT(3) << "could not ack gamestate: " << gamestateID << std::endl;
+      return false;
+    }
+    else{
+      COUT(3) << "acked a gamestate: " << gamestateID << std::endl;
+      return true;
+    }
   }
 
@@ -169 +185 @@
     if(gs->isDiffed()){
       packet::Gamestate *base = gamestateMap_[gs->getBaseID()];
-      if(!base)
+      if(!base){
+        delete gs;
         return 0;
+      }
 //      assert(base); //TODO: fix this
       packet::Gamestate *undiffed = gs->undiff(base);

code/trunk/src/network/GamestateClient.h

@@ -62 +62 @@
     bool ack(int gamestateID, int clientID);
 
-    int processGamestates();
+    bool processGamestates();
     packet::Gamestate *getGamestate();
     void cleanup();
@@ -69 +69 @@
     void removeObject(orxonox::ObjectListIterator<Synchronisable> &it);
     void printGamestateMap();
+    bool sendAck(unsigned int gamestateID);
     bool saveShipCache();
     bool loadShipCache();

code/trunk/src/network/GamestateManager.cc

@@ -157 +157 @@
     int curid = temp->getGamestateID();
     
-    if(gamestateID == GAMESTATEID_INITIAL){
+    if(gamestateID == 0){
       temp->setGamestateID(GAMESTATEID_INITIAL);
       if(curid!=GAMESTATEID_INITIAL){
@@ -163 +163 @@
         --(gamestateUsed.find(curid)->second);
       }
-      return false;
-    }
-    if(curid > gamestateID)
+      return true;
+    }
+    //if(curid > gamestateID)
+    assert(curid<gamestateID);
       // the network packets got messed up 
-      return true;
+      //return true;
     COUT(4) << "acking gamestate " << gamestateID << " for clientid: " << clientID << " curid: " << curid << std::endl;
     // decrease usage of gamestate and save it

code/trunk/src/network/packet/Acknowledgement.cc

@@ -31 +31 @@
 #include "network/Host.h"
 #include "network/GamestateHandler.h"
+#include "core/CoreIncludes.h"
 
 namespace network {
@@ -63 +64 @@
 
 bool Acknowledgement::process(){
-  bool b = GamestateHandler::ackGamestate(data_[_ACKID], clientID_);
+  bool b = GamestateHandler::ackGamestate(getAckID(), clientID_);
   delete this;
   return b;
@@ -69 +70 @@
 
 unsigned int Acknowledgement::getAckID(){
-  return *(unsigned int *)&data_[ _ACKID ];
+  return *(unsigned int *)(data_ + _ACKID);
 }
 

code/trunk/src/orxonox/objects/Model.cc

@@ -52 +52 @@
         RegisterObject(Model);
         registerAllVariables();
-        if(this->isExactlyA(Class(Model)))
-           setObjectFrequency(1);
     }
 
@@ -87 +85 @@
         COUT(4) << "Loader (Model.cc): Created model" << std::endl;
       }
+      if(this->isExactlyA(Class(Model)))
+        setObjectFrequency(300); //sync all 10 seconds (this only applies to asteroids and other isExactlyA(Model)
       return true;
     }