Changeset 1739

Timestamp:

Sep 8, 2008, 1:36:32 AM (16 years ago)

Author:

scheusso

Message:

further fixes (diff/undiff not working yet)

Location:

code/branches/network/src/network

Files:

• Client.cc (modified) (7 diffs)
• GamestateClient.cc (modified) (2 diffs)
• GamestateClient.h (modified) (1 diff)
• GamestateManager.cc (modified) (1 diff)
• Host.cc (modified) (1 diff)
• Host.h (modified) (2 diffs)
• Server.cc (modified) (7 diffs)
• packet/Acknowledgement.cc (modified) (1 diff)
• packet/Gamestate.cc (modified) (5 diffs)
• packet/Gamestate.h (modified) (1 diff)
• packet/Packet.cc (modified) (2 diffs)
• packet/Packet.h (modified) (1 diff)

code/branches/network/src/network/Client.cc

@@ -61 +61 @@
     isSynched_=false;
     gameStateFailure_=false;
+    isServer_ = false;
   }
 
@@ -72 +73 @@
     isSynched_=false;
     gameStateFailure_=false;
+    isServer_ = false;
   }
 
@@ -83 +85 @@
     isSynched_=false;
     gameStateFailure_=false;
+    isServer_ = false;
   }
 
@@ -151 +154 @@
     if(client_connection.isConnected() && isSynched_){
       COUT(4) << "popping partial gamestate: " << std::endl;
-      /*packet::Gamestate *gs = gamestate.getGamestate();
+      packet::Gamestate *gs = gamestate.getGamestate();
       if(gs){
         COUT(4) << "client tick: sending gs " << gs << std::endl;
@@ -157 +160 @@
           COUT(3) << "Problem adding partial gamestate to queue" << std::endl;
         // gs gets automatically deleted by enet callback
-      }*/
+      }
     }
     ENetEvent *event;
@@ -168 +171 @@
     }
     int gameStateID = gamestate.processGamestates();
-    /*if(gameStateID==GAMESTATEID_INITIAL)
+    if(gameStateID==GAMESTATEID_INITIAL)
       if(gameStateFailure_){
-        packet::Acknowledgement ack(GAMESTATEID_INITIAL, 0);
-        if(!ack.send())
+        packet::Acknowledgement *ack = new packet::Acknowledgement(GAMESTATEID_INITIAL, 0);
+        if(!ack->send())
           COUT(3) << "could not (negatively) ack gamestate" << std::endl;
         else 
@@ -183 +186 @@
         isSynched_=true;
       gameStateFailure_=false;
-      packet::Acknowledgement ack(gameStateID, 0);
-      if(!ack.send())
+      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
+    }// otherwise we had no gamestate to load
     gamestate.cleanup();
     return;

code/branches/network/src/network/GamestateClient.cc

@@ -73 +73 @@
       return 0;
     int id = GAMESTATEID_INITIAL;
-    bool b = saveShipCache();
-    if(processGamestate(tempGamestate_)){
-      if(b)
-        loadShipCache();
-      id = tempGamestate_->getID();
-    }
+    //bool b = saveShipCache();
+    packet::Gamestate *processed = processGamestate(tempGamestate_);
+    assert(processed);
+    //successfully loaded data from gamestate. now save gamestate for diff and delete the old gs
+    tempGamestate_=0;
+    gamestateMap_[processed->getID()]=processed;
+    last_diff_ = processed->getBaseID();
+    last_gamestate_ = processed->getID();
+    //if(b)
+      //loadShipCache();
+    id = processed->getID();
     cleanup();
     return id;
@@ -151 +156 @@
   }
 
-  bool GamestateClient::processGamestate(packet::Gamestate *gs){
-    assert(gs->decompressData());
-    if(gs->isDiffed())
-      assert(gs->undiff(gamestateMap_[gs->getBaseID()]));
-    return gs->spreadData();
+  packet::Gamestate *GamestateClient::processGamestate(packet::Gamestate *gs){
+    if(gs->isCompressed())
+      assert(gs->decompressData());
+    if(gs->isDiffed()){
+      packet::Gamestate *base = gamestateMap_[gs->getBaseID()];
+      assert(base);
+      packet::Gamestate *undiffed = gs->undiff(base);
+      delete gs;
+      gs=undiffed;
+      COUT(3) << "successfully undiffed gamestate id: " << undiffed->getID() << std::endl;
+    }
+    if(gs->spreadData())
+      return gs;
+    else
+      return NULL;
   }
 

code/branches/network/src/network/GamestateClient.h

@@ -66 +66 @@
     void cleanup();
   private:
-    bool processGamestate(packet::Gamestate *gs);
+    packet::Gamestate *processGamestate(packet::Gamestate *gs);
     void removeObject(orxonox::Iterator<Synchronisable> &it);
     void printGamestateMap();

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

@@ -194 +194 @@
     if(client->getGamestateID()>=0)
       gamestateUsed[client->getGamestateID()]--;
-    ClientInformation::removeClient(client->getID());
   }
   
   bool GamestateManager::processGamestate(packet::Gamestate *gs){
-    assert(gs->decompressData());
+    if(gs->isCompressed())
+       assert(gs->decompressData());
     assert(!gs->isDiffed());
     return gs->spreadData();

code/branches/network/src/network/Host.cc

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *                    > www.orxonox.net <
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Oliver Scheuss <scheusso [at] ee.ethz.ch>, (C) 2008
+ *   Co-authors:
+ *      ...
+ *
+ */
+
 #include <assert.h>
 

code/branches/network/src/network/Host.h

@@ -54 +54 @@
     ~Host();
     static Host *instance_;
+    bool isServer_;     
     
   public:
@@ -64 +65 @@
     static void setClientID(unsigned int id){ instance_->clientID_ = id; }
     static void setShipID(unsigned int id){ instance_->shipID_ = id; }
+    static bool isServer(){ return instance_->isServer_; }              
   private:
     unsigned int clientID_;

code/branches/network/src/network/Server.cc

@@ -53 +53 @@
 #include "packet/Packet.h"
 #include "packet/Welcome.h"
+#include <util/Convert.h>
 
 namespace network
@@ -67 +68 @@
     connection = new ConnectionManager();
     gamestates_ = new GamestateManager();
+    isServer_ = true;
   }
   
@@ -73 +75 @@
     connection = new ConnectionManager(port);
     gamestates_ = new GamestateManager();
+    isServer_ = true;
   }
 
@@ -84 +87 @@
     connection = new ConnectionManager(port, bindAddress);
     gamestates_ = new GamestateManager();
+    isServer_ = true;
   }
 
@@ -95 +99 @@
     connection = new ConnectionManager(port, bindAddress);
     gamestates_ = new GamestateManager();
+    isServer_ = true;
   }
 
@@ -348 +353 @@
     no->setTransDamp(75);
     no->setRotDamp(1.0);
-    no->setCamera("cam_"+client->getID());
+    no->setCamera(std::string("cam_") + convertToString(client->getID()));
     no->create();
     no->setBacksync(true);
@@ -364 +369 @@
     if(!client)
       return false;
+    gamestates_->removeClient(client);
     while(it){
       if(it->objectID!=client->getShipID()){

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

@@ -45 +45 @@
   data_=new unsigned char[ getSize() ];
   *(ENUM::Type *)(data_ + _PACKETID ) = ENUM::Acknowledgement;
-  *(unsigned int *)&data_[ _ACKID ] = id;
+  *(unsigned int *)(data_ + _ACKID ) = id;
   clientID_=clientID;
 }

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

@@ -120 +120 @@
 bool Gamestate::spreadData(int mode)
 {
-  assert(data_ && !HEADER->compressed && !HEADER->diffed);
+  assert(data_);
+  assert(!HEADER->compressed);
+  assert(!HEADER->diffed);
   unsigned int size, objectID, classID;
   unsigned char *mem=data_+sizeof(GamestateHeader);
@@ -141 +143 @@
         //fabricate the new synchronisable
         if(!Synchronisable::fabricate(mem, mode))
-          /*return false*/;
+          return false;
         it=orxonox::ObjectList<Synchronisable>::end();
       }
@@ -276 +278 @@
   *GAMESTATE_HEADER(ndata) = *HEADER;
   GAMESTATE_HEADER(ndata)->diffed = true;
+  GAMESTATE_HEADER(ndata)->base_id = base->getID();
   Gamestate *g = new Gamestate(ndata, 0);
+  g->flags_=flags_;
+  g->packetDirection_ = packetDirection_;
+  g->clientID_ = clientID_;
   return g;
 }
@@ -310 +316 @@
   GAMESTATE_HEADER(ndata)->diffed = false;
   Gamestate *g = new Gamestate(ndata, 0);
+  g->flags_=flags_;
+  g->packetDirection_ = packetDirection_;
+  g->clientID_ = clientID_;
+  assert(!g->isDiffed());
+  assert(!g->isCompressed());
   return g;
 }
@@ -341 +352 @@
   }
   
+  bool Gamestate::isCompressed(){
+    return HEADER->compressed;
+  }
+  
   int Gamestate::getBaseID(){
     return HEADER->base_id;

code/branches/network/src/network/packet/Gamestate.h

@@ -64 +64 @@
     int getID();
     bool isDiffed();
+    bool isCompressed();
     int getBaseID();
     Gamestate *diff(Gamestate *base);

code/branches/network/src/network/packet/Packet.cc

@@ -113 +113 @@
     packetMap_[enetPacket_] = this;
   }
-  /*switch( *(ENUM::Type *)(data_ + _PACKETID) )
+#ifndef NDEBUG
+  switch( *(ENUM::Type *)(data_ + _PACKETID) )
   {
     case ENUM::Acknowledgement:
@@ -120 +121 @@
     case ENUM::Gamestate:
     case ENUM::Welcome:
-      COUT(3) << "welcome" << std::endl;
-      p = new Welcome( data, clientID );
+      break;
     default:
       assert(0); //TODO: repair this
       break;
-  }*/
+  }
+#endif
   network::Host::addPacket( enetPacket_, clientID_);
   enetPacket_ = 0; // otherwise we have a double free because enet already handles the deallocation of the packet

code/branches/network/src/network/packet/Packet.h

@@ -78 +78 @@
     enet_uint32 flags_;
     int clientID_;
+    ENUM::Direction packetDirection_;
     unsigned char *data_;
   private:
     static std::map<ENetPacket *, Packet *> packetMap_;
     ENetPacket *enetPacket_;
-    ENUM::Direction packetDirection_;
 };