Changeset 1775 for code/branches/network/src/network/Synchronisable.cc

Timestamp:

Sep 12, 2008, 5:36:57 PM (16 years ago)

Author:

scheusso

Message:

we have a new gamestate concept now: dont transmit synchronisable header of objects, that dont get updated that tick. transmit objectids of deleted objects to delete them on the client too

File:

• code/branches/network/src/network/Synchronisable.cc (modified) (14 diffs)

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

@@ -52 +52 @@
 {
 
+  std::map<unsigned int, Synchronisable *> Synchronisable::objectMap_;
+  std::queue<unsigned int> Synchronisable::deletedObjects_;
 
   int Synchronisable::state_=0x1; // detemines wheter we are server (default) or client
@@ -61 +63 @@
   Synchronisable::Synchronisable(){
     RegisterRootObject(Synchronisable);
-    static int idCounter=0;
+    static unsigned int idCounter=0;
     datasize=0;
     objectFrequency_=1;
@@ -67 +69 @@
     objectID=idCounter++;
     syncList = new std::list<synchronisableVariable *>;
-    //registerAllVariables();
   }
 
   Synchronisable::~Synchronisable(){
     // delete callback function objects
-    if(!orxonox::Identifier::isCreatingHierarchy())
+    if(!orxonox::Identifier::isCreatingHierarchy()){
       for(std::list<synchronisableVariable *>::iterator it = syncList->begin(); it!=syncList->end(); it++)
         delete (*it)->callback;
+      assert(objectMap_[objectID]->objectID==objectID);
+      objectMap_.erase(objectID);
+    }
   }
 
   bool Synchronisable::create(){
+    objectMap_[objectID]=this;
+    assert(objectMap_[objectID]==this);
     this->classID = this->getIdentifier()->getNetworkID();
     COUT(4) << "creating synchronisable: setting classid from " << this->getIdentifier()->getName() << " to: " << classID << std::endl;
@@ -91 +97 @@
   }
   
-  bool Synchronisable::fabricate(unsigned char*& mem, int mode)
+  Synchronisable *Synchronisable::fabricate(unsigned char*& mem, int mode)
   {
     unsigned int size, objectID, classID;
@@ -98 +104 @@
     classID = *(unsigned int*)(mem+2*sizeof(unsigned int));
     
-    if(size==3*sizeof(unsigned int)){ //not our turn, dont do anything
-      mem+=3*sizeof(unsigned int);
-      return true;
-    }
-    
     orxonox::Identifier* id = GetIdentifier(classID);
-    if(!id){
-      COUT(3) << "We could not identify a new object; classid: " << classID << " uint: " << (unsigned int)classID << " objectID: " << objectID << " size: " << size << std::endl;
-      assert(0);
-      return false; // most probably the gamestate is corrupted
-    }
+    assert(id);
     orxonox::BaseObject *bo = id->fabricate();
     Synchronisable *no = dynamic_cast<Synchronisable *>(bo);
@@ -116 +113 @@
     COUT(3) << "fabricate objectID: " << no->objectID << " classID: " << no->classID << std::endl;
           // update data and create object/entity...
-    if( !no->updateData(mem, mode) ){
-      COUT(1) << "We couldn't update the object: " << objectID << std::endl;
-      return false;
-    }
-    if( !no->create() )
-    {
-      COUT(1) << "We couldn't manifest (create() ) the object: " << objectID << std::endl;
-      return false;
-    }
+    assert(no->updateData(mem, mode));
+    assert( no->create() );
+    return no;
+  }
+
+  
+  bool Synchronisable::deleteObject(unsigned int objectID){
+    assert(getSynchronisable(objectID));
+    assert(getSynchronisable(objectID)->objectID==objectID);
+    delete objectMap_[objectID];
     return true;
   }
-
+  
+  Synchronisable* Synchronisable::getSynchronisable(unsigned int objectID){
+    std::map<unsigned int, Synchronisable *>::iterator i = objectMap_.find(objectID);
+    if(i==objectMap_.end())
+      return NULL;
+    assert(i->second->objectID==objectID);
+    return (*i).second;
+  }
+
+  
   /**
   * This function is used to register a variable to be synchronized
@@ -161 +168 @@
    */
   bool Synchronisable::getData(unsigned char*& mem, unsigned int id, int mode){
+    //if this tick is we dont synchronise, then abort now
+    if(!isMyTick(id))
+      return true;
     //std::cout << "inside getData" << std::endl;
     unsigned int tempsize = 0;
@@ -170 +180 @@
     std::list<synchronisableVariable *>::iterator i;
     unsigned int size;
-    size=getSize2(id, mode);
+    size=getSize(id, mode);
     
     // start copy header
@@ -182 +192 @@
     // end copy header
     
-    //if this tick is we dont synchronise, then abort now
-    if(!isMyTick(id))
-      return true;
     
     COUT(5) << "Synchronisable getting data from objectID: " << objectID << " classID: " << classID << " length: " << size << std::endl;
@@ -222 +229 @@
    */
   bool Synchronisable::updateData(unsigned char*& mem, int mode){
-    unsigned char *data = mem;
     if(mode==0x0)
       mode=state_;
@@ -230 +236 @@
       return false;
     }
-    
+    unsigned char *data=mem;
     // start extract header
+    if(!isMyData(mem))
+      return true;
     unsigned int objectID, classID, size;
     size = *(int *)mem;
@@ -242 +250 @@
     assert(this->objectID==objectID);
     assert(this->classID==classID);
-    if(size==3*sizeof(unsigned int)) //if true, only the header is available
-      return true;
-      //assert(0);
     
     COUT(5) << "Synchronisable: objectID " << objectID << ", classID " << classID << " size: " << size << " synchronising data" << std::endl;
@@ -288 +293 @@
     if(!isMyTick(id))
       return 0;
-    int tsize=0;
+    int tsize=sizeof(synchronisableHeader);
     if(mode==0x0)
       mode=state_;
@@ -311 +316 @@
 
   /**
-   * This function returns the total amount of bytes needed by getData to save the whole content of the variables
-   * @return amount of bytes
-   */
-  int Synchronisable::getSize2(unsigned int id, int mode){
-    return sizeof(synchronisableHeader) + getSize( id, mode );
-  }
-  
-  /**
    * 
    * @param id