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

Timestamp:

Oct 12, 2008, 12:15:30 PM (16 years ago)

Author:

scheusso

Message:

Lots of changes:
Some fixes/hacks in objects
Changes in Gamestates and bugfixes
Removed some asserts

File:

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

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

@@ -64 +64 @@
   Synchronisable::Synchronisable(){
     RegisterRootObject(Synchronisable);
-    static unsigned int idCounter=0;
+    static uint32_t idCounter=0;
     objectFrequency_=1;
     objectMode_=0x1; // by default do not send data to server
     objectID=idCounter++;
-//     COUT(3) << " bump +++" << objectID << " | " << &objectMap_ << std::endl;
     syncList = new std::list<synchronisableVariable *>;
   }
@@ -81 +80 @@
       for(std::list<synchronisableVariable *>::iterator it = syncList->begin(); it!=syncList->end(); it++)
         delete (*it)->callback;
+      deletedObjects_.push(objectID);
+//       COUT(3) << "destruct synchronisable +++" << objectID << " | " << classID << std::endl;
 //       COUT(3) << " bump ---" << objectID << " | " << &objectMap_ << std::endl;
 //       assert(objectMap_[objectID]->objectID==objectID);
@@ -94 +95 @@
   bool Synchronisable::create(){
     this->classID = this->getIdentifier()->getNetworkID();
-    COUT(4) << "creating synchronisable: setting classid from " << this->getIdentifier()->getName() << " to: " << classID << std::endl;
-    
+//     COUT(4) << "creating synchronisable: setting classid from " << this->getIdentifier()->getName() << " to: " << classID << std::endl;
+    
+//     COUT(3) << "construct synchronisable +++" << objectID << " | " << classID << std::endl;
 //     objectMap_[objectID]=this;
 //     assert(objectMap_[objectID]==this);
@@ -121 +123 @@
    * @return pointer to the newly created synchronisable
    */
-  Synchronisable *Synchronisable::fabricate(unsigned char*& mem, int mode)
+  Synchronisable *Synchronisable::fabricate(uint8_t*& mem, int mode)
   {
     synchronisableHeader *header = (synchronisableHeader *)mem;
+    
+    COUT(3) << "fabricating object with id: " << header->objectID << std::endl;
     
     orxonox::Identifier* id = GetIdentifier(header->classID);
@@ -134 +138 @@
     COUT(3) << "fabricate objectID: " << no->objectID << " classID: " << no->classID << std::endl;
           // update data and create object/entity...
-    assert(no->updateData(mem, mode));
-    assert( no->create() );
+    bool b = no->updateData(mem, mode);
+    assert(b);
+    b = no->create();
+    assert(b);
     return no;
   }
@@ -146 +152 @@
    */
   bool Synchronisable::deleteObject(unsigned int objectID){
-    assert(getSynchronisable(objectID));
+//     assert(getSynchronisable(objectID));
+    if(!getSynchronisable(objectID))
+      return false;
     assert(getSynchronisable(objectID)->objectID==objectID);
 //     delete objectMap_[objectID];
@@ -222 +230 @@
    * @return true: if !isMyTick or if everything was successfully saved
    */
-  bool Synchronisable::getData(unsigned char*& mem, unsigned int id, int mode){
+  bool Synchronisable::getData(uint8_t*& mem, unsigned int id, int mode){
     //if this tick is we dont synchronise, then abort now
     if(!isMyTick(id))
@@ -232 +240 @@
     if(classID==0)
       COUT(3) << "classid 0 " << this->getIdentifier()->getName() << std::endl;
-    this->classID=this->getIdentifier()->getNetworkID(); // TODO: correct this
+    assert(this->classID==this->getIdentifier()->getNetworkID());
+//     this->classID=this->getIdentifier()->getNetworkID(); // TODO: correct this
     std::list<synchronisableVariable *>::iterator i;
     unsigned int size;
@@ -283 +292 @@
    * @return true/false
    */
-  bool Synchronisable::updateData(unsigned char*& mem, int mode){
+  bool Synchronisable::updateData(uint8_t*& mem, int mode){
     if(mode==0x0)
       mode=state_;
@@ -291 +300 @@
       return false;
     }
-    unsigned char *data=mem;
+    uint8_t *data=mem;
     // start extract header
     synchronisableHeader *syncHeader = (synchronisableHeader *)mem;
@@ -322 +331 @@
           break;
         case STRING:
-          (*i)->size = *(int *)mem;
+          (*i)->size = *(uint32_t *)mem;
           COUT(5) << "string size: " << (*i)->size << std::endl;
           mem+=sizeof(int);
@@ -346 +355 @@
   * @return amount of bytes
   */
-  int Synchronisable::getSize(unsigned int id, int mode){
+  uint32_t Synchronisable::getSize(unsigned int id, int mode){
     if(!isMyTick(id))
       return 0;
@@ -388 +397 @@
    * @param mem pointer to the bytestream
    */
-  bool Synchronisable::isMyData(unsigned char* mem)
+  bool Synchronisable::isMyData(uint8_t* mem)
   {
     synchronisableHeader *header = (synchronisableHeader *)mem;