Changeset 1361

Timestamp:

May 22, 2008, 2:09:33 PM (17 years ago)

Author:

scheusso

Message:

reverted some changes from previous version

Location:

code/branches/merge/src

Files:

• network/ClientInformation.cc (modified) (4 diffs)
• network/ClientInformation.h (modified) (3 diffs)
• network/ConnectionManager.cc (modified) (2 diffs)
• network/GameStateClient.cc (modified) (4 diffs)
• network/GameStateClient.h (modified) (1 diff)
• network/GameStateManager.cc (modified) (3 diffs)
• network/PacketManager.h (modified) (1 diff)
• network/Synchronisable.cc (modified) (1 diff)
• orxonox/objects/WorldEntity.cc (modified) (1 diff)

code/branches/merge/src/network/ClientInformation.cc

@@ -51 +51 @@
     preve=0;
     nexte=0;
-    partialGamestateID_=GAMESTATEID_INITIAL-1;
     this->head_=false;
     synched_=false;
@@ -60 +59 @@
     preve=0;
     nexte=0;
-    partialGamestateID_=GAMESTATEID_INITIAL-1;
     this->head_=head;
     synched_=false;
@@ -161 +159 @@
     return true;
   }
-  
-  bool ClientInformation::setPartialGamestateID(int id){
-    boost::recursive_mutex::scoped_lock lock(mutex_);
-    if(!this)
-      return false;
-    partialGamestateID_=id;
-    return true;
-  }
 
   int ClientInformation::getID() {
@@ -213 +203 @@
     if(this)
       return gamestateID_;
-    else
-      return -1;
-  }
-  
-  int ClientInformation::getPartialGamestateID() {
-    boost::recursive_mutex::scoped_lock lock(mutex_);
-    if(this)
-      return partialGamestateID_;
     else
       return -1;

code/branches/merge/src/network/ClientInformation.h

@@ -70 +70 @@
     bool setPeer(ENetPeer *peer);
     bool setGamestateID(int id);
-    bool setPartialGamestateID(int id);
     inline void setShipID(int id){ShipID_=id;}
     
@@ -77 +76 @@
     int getID();
     int getGamestateID();
-    int getPartialGamestateID();
     ENetPeer *getPeer();
     bool getHead();
@@ -109 +107 @@
     int clientID_;
     int gamestateID_;
-    int partialGamestateID_;
     int ShipID_;   // this is the unique objectID
     bool synched_;

code/branches/merge/src/network/ConnectionManager.cc

@@ -193 +193 @@
           addClient(event);
           //this is a workaround to ensure thread safety
+          /*if(!addFakeConnectRequest(&event))
+            COUT(3) << "Problem pushing fakeconnectRequest to queue" << std::endl;*/
           COUT(5) << "Con.Man: connection event has occured" << std::endl;
           break;
@@ -208 +210 @@
           break;
         case ENET_EVENT_TYPE_NONE:
-          receiverThread_->yield();
           break;
       }

code/branches/merge/src/network/GameStateClient.cc

@@ -47 +47 @@
     COUT(5) << "this: " << this << std::endl;
     last_diff_=0;
-    last_gamestate_=GAMESTATEID_INITIAL-1;
   }
 
@@ -57 +56 @@
     printGameStateMap();
     GameState *gs, *reference;
-    /*if(compstate->id<last_gamestate_){
-      // network packets got messed up
-      COUT(3) << "received an obsolete gamestate" << std::endl;
-      return false;
-    }*/
     if(compstate->diffed && compstate->base_id!=GAMESTATEID_INITIAL){
       std::map<int, GameState*>::iterator it = gameStateMap.find(compstate->base_id);
@@ -83 +77 @@
         COUT(4) << "adding decoded gs with id: " << gs->id << " diffed from: " << gs->base_id << std::endl;
         last_diff_=gs->base_id;
-        //last_gamestate_=gs->id;
         return true;
       }else{
@@ -156 +149 @@
           Synchronisable *no = dynamic_cast<Synchronisable *>(id->fabricate());
           COUT(4) << "loadsnapshot: classid: " << sync.classID << " objectID: " << sync.objectID << " length: " << sync.length << std::endl;
-          if(!no){
-            COUT(2) << "coudl not frabricate classid: " << sync.classID << " objectID: " << sync.objectID << " identifier: " << id << std::endl;
-            break;
-          }
           no->objectID=sync.objectID;
           no->classID=sync.classID;

code/branches/merge/src/network/GameStateClient.h

@@ -71 +71 @@
 
     int           last_diff_;
-    int           last_gamestate_;
     std::map<int, GameState *> gameStateMap;
     

code/branches/merge/src/network/GameStateManager.cc

@@ -221 +221 @@
     orxonox::Iterator<Synchronisable> it=orxonox::ObjectList<Synchronisable>::start();
     syncData sync;
-    /*ClientInformation *client = head_->findClient(clientID);
-    if(client)
-      if(client->getPartialGamestateID()>state->id){
-        COUT(3) << "we received an obsolete partial gamestate" << std::endl;
-        return false;
-      }
-    else;*/
-        //what should we do now ??
     // loop as long as we have some data ;)
     while(data < state->data+state->size){
@@ -276 +268 @@
       ++it;
     }
-    //client->setPartialGamestateID(state->id);
+    
     return true;
   }
@@ -436 +428 @@
       return;
     int curid = temp->getGamestateID();
-    if(curid > gamestateID)
-      // the network packets got messed up 
-      return;
     COUT(4) << "acking gamestate " << gamestateID << " for clientid: " << clientID << " curid: " << curid << std::endl;
     // decrease usage of gamestate and save it

code/branches/merge/src/network/PacketManager.h

@@ -58 +58 @@
     PacketGenerator();
     //call one of this functions out of an instance of PacketGenerator to create a packet
-    ENetPacket* acknowledgement( int state, int reliable = 0 ); // we do not want reliability
+//    ENetPacket* acknowledgement( int state, int reliable = 0 );
+    ENetPacket* acknowledgement( int state, int reliable = ENET_PACKET_FLAG_RELIABLE );
     ENetPacket* command( int dataLength, void *data, int reliable = ENET_PACKET_FLAG_RELIABLE );
     ENetPacket* mousem( double x, double y, int reliable = ENET_PACKET_FLAG_RELIABLE );
     ENetPacket* keystrike( char press, int reliable = ENET_PACKET_FLAG_RELIABLE );
     ENetPacket* chatMessage( const char* message, int reliable = ENET_PACKET_FLAG_RELIABLE );
-    ENetPacket* gstate( GameStateCompressed *states, int reliable = 0 ); // we do not want reliability of gamestates
+    ENetPacket* gstate( GameStateCompressed *states, int reliable = ENET_PACKET_FLAG_RELIABLE );
+//    ENetPacket* gstate( GameStateCompressed *states, int reliable = 0 );
     ENetPacket* clid( int classid, std::string classname, int reliable = ENET_PACKET_FLAG_RELIABLE );
     ENetPacket* generateWelcome( int clientID,int shipID, bool allowed, int reliable = ENET_PACKET_FLAG_RELIABLE );

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

@@ -156 +156 @@
     if(classID==0)
       COUT(3) << "classid 0 " << this->getIdentifier()->getName() << std::endl;
-    this->classID=this->getIdentifier()->getNetworkID();
+    classID=this->getIdentifier()->getNetworkID();
     std::list<synchronisableVariable *>::iterator i;
     syncData retVal;

code/branches/merge/src/orxonox/objects/WorldEntity.cc

@@ -156 +156 @@
       registerVar( (void*) &(this->getAcceleration().y), sizeof(this->getAcceleration().y), network::DATA, 0x3);
       registerVar( (void*) &(this->getAcceleration().z), sizeof(this->getAcceleration().z), network::DATA, 0x3);
-      registerVar( (void*) &(this->getMomentum()), sizeof(this->getMomentum()), network::DATA);
+      registerVar( (void*) &(this->getMomentum()), sizeof(this->getMomentum()), network::DATA, 0x3);
     }