Changeset 1730

Timestamp:

Sep 7, 2008, 3:30:52 PM (16 years ago)

Author:

scheusso

Message:

more progress (still not ok)

Location:

code/branches/network/src

Files:

• network/Client.cc (modified) (4 diffs)
• network/GamestateManager.cc (modified) (1 diff)
• network/Server.cc (modified) (1 diff)
• network/Synchronisable.cc (modified) (1 diff)
• network/packet/Gamestate.cc (modified) (3 diffs)
• network/packet/Packet.cc (modified) (2 diffs)
• orxonox/objects/SpaceShip.cc (modified) (2 diffs)

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

@@ -151 +151 @@
     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 +157 @@
           COUT(3) << "Problem adding partial gamestate to queue" << std::endl;
         // gs gets automatically deleted by enet callback
-      }
+      }*/
     }
     ENetEvent *event;
@@ -168 +168 @@
     }
     int gameStateID = gamestate.processGamestates();
-    if(gameStateID==GAMESTATEID_INITIAL)
+    /*if(gameStateID==GAMESTATEID_INITIAL)
       if(gameStateFailure_){
         packet::Acknowledgement ack(GAMESTATEID_INITIAL, 0);
@@ -186 +186 @@
       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/GamestateManager.cc

@@ -62 +62 @@
   bool GamestateManager::update(){
     cleanup();
-    getSnapshot();
-    return true;
+    return getSnapshot();
   }
   

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

@@ -259 +259 @@
       //std::cout << "adding gamestate" << std::endl;
       gs->setClientID(cid);
+      assert(gs->compressData());
       if ( !gs->send() ){
         COUT(3) << "Server: packet with client id (cid): " << cid << " not sended: " << temp->getFailures() << std::endl; 

code/branches/network/src/network/Synchronisable.cc

@@ -90 +90 @@
   bool Synchronisable::fabricate(unsigned char*& mem, int mode)
   {
-    int size, objectID, classID;
-    size = *(int *)mem;
-    objectID = *(int*)(mem+sizeof(int));
-    classID = *(int*)(mem+2*sizeof(int));
-    
-    orxonox::Identifier* id = ID((unsigned int)classID);
+    unsigned int size, objectID, classID;
+    size = *(unsigned int *)mem;
+    objectID = *(unsigned int*)(mem+sizeof(unsigned int));
+    classID = *(unsigned int*)(mem+2*sizeof(unsigned int));
+    
+    orxonox::Identifier* id = ID(classID);
     if(!id){
       COUT(3) << "We could not identify a new object; classid: " << classID << " uint: " << (unsigned int)classID << " objectID: " << objectID << " size: " << size << std::endl;
       return false; // most probably the gamestate is corrupted
     }
-    Synchronisable *no = dynamic_cast<Synchronisable *>(id->fabricate());
-    if(!no){
-      COUT(2) << "coudl not frabricate classid: " << classID << " objectID: " << objectID << " identifier: " << id << std::endl;
-      return false;
-    }
+    orxonox::BaseObject *bo = id->fabricate();
+    Synchronisable *no = dynamic_cast<Synchronisable *>(bo);
+    assert(no);
     no->objectID=objectID;
     no->classID=classID;
+    COUT(3) << "fabricate objectID: " << no->objectID << " classID: " << no->classID << std::endl;
           // update data and create object/entity...
     if( !no->updateData(mem, mode) ){

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

@@ -128 +128 @@
   while(mem < data_+sizeof(GamestateHeader)+HEADER->normsize){
       // extract synchronisable header
-    size = *(int *)mem;
-    objectID = *(int*)(mem+sizeof(int));
-    classID = *(int*)(mem+2*sizeof(int));
-
-    if(!it || it->objectID!=objectID){
+    size = *(unsigned int *)mem;
+    objectID = *(unsigned int*)(mem+sizeof(unsigned int));
+    classID = *(unsigned int*)(mem+2*sizeof(unsigned int));
+
+    if(!it || it->objectID!=objectID || it->classID!=classID){
         // bad luck ;)
         // delete the synchronisable (obviously seems to be deleted on the server)
@@ -141 +141 @@
         //fabricate the new synchronisable
         if(!Synchronisable::fabricate(mem, mode))
-          return false;
+          /*return false*/;
         it=orxonox::ObjectList<Synchronisable>::end();
       }
@@ -208 +208 @@
   //save new data
   data_ = ndata;
+  assert(HEADER->compressed);
+  COUT(3) << "gamestate compress normsize: " << HEADER->normsize << " compsize: " << HEADER->compsize << std::endl;
   return true;
 }

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

@@ -82 +82 @@
   enetPacket_=p.enetPacket_;
   flags_=p.flags_;
+  packetDirection_ = p.packetDirection_;
+  clientID_ = p.clientID_;
   if(p.data_){
     data_ = new unsigned char[p.getSize()];
@@ -97 +99 @@
 
 bool Packet::send(){
-  /*if(packetDirection_ != ENUM::Outgoing && packetDirection_ != ENUM::Bidirectional ){
+  if(packetDirection_ != ENUM::Outgoing && packetDirection_ != ENUM::Bidirectional ){
     assert(0);
     return false;
-  }*/
+  }
   if(!enetPacket_){
     if(!data_){

code/branches/network/src/orxonox/objects/SpaceShip.cc

@@ -244 +244 @@
             this->chFarNode_->setScale(0.4, 0.4, 0.4);
         }
+        // END of testing crosshair
 
         createCamera();
-        // END of testing crosshair
     }
 
@@ -322 +322 @@
         this->setBacksync(true);
         //CameraHandler::getInstance()->requestFocus(cam_);
-        if(this->isExactlyA(Class(SpaceShip)))
+        if(this->isExactlyA(Class(SpaceShip))){
           getFocus();
-      }
+          COUT(3) << "getting focus for obj id: " << objectID << std::endl;
+        }else
+          COUT(3) << "not getting focus (not exactly spaceship) for obj id: " << objectID << std::endl;
+      }else
+        COUT(3) << "not getting focus (not my ship) for obj id: " << objectID << std::endl;
 
     }