Changeset 2153

Timestamp:

Nov 7, 2008, 10:50:51 PM (16 years ago)

Author:

scheusso

Message:

Synchronisable::getSynchronisable function uses now a map to efficently work

File:

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

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

@@ -70 +70 @@
     objectMode_=0x1; // by default do not send data to server
     if(Host::running() && Host::isServer())
-      objectID=idCounter++; //this is only needed when running a server
+    {
+      this->objectID = idCounter++; //this is only needed when running a server
+    //add synchronisable to the objectMap
+      objectMap_[this->objectID] = this;
+    }
     else
       objectID=OBJECTID_UNKNOWN;
     classID = (unsigned int)-1;
     syncList = new std::list<synchronisableVariable *>;
+    
     
 #ifndef NDEBUG
@@ -118 +123 @@
 //       objectMap_.erase(objectID);
     }
+    std::map<unsigned int, Synchronisable*>::iterator it;
+    it = objectMap_.find(objectID);
+    if (it != objectMap_.end())
+      objectMap_.erase(it);
   }
 
@@ -227 +236 @@
    */
   Synchronisable* Synchronisable::getSynchronisable(unsigned int objectID){
+    std::map<unsigned int, Synchronisable*>::iterator it1;
+    it1 = objectMap_.find(objectID);
+    if (it1 != objectMap_.end())
+      return it1->second;
+    
     ObjectList<Synchronisable>::iterator it;
     for(it = ObjectList<Synchronisable>::begin(); it; ++it){
-      if( it->getObjectID()==objectID )
-           return *it;
+      if( it->getObjectID()==objectID ){
+        objectMap_[objectID] = *it;
+        return *it;
+      }
     }
     return NULL;
-
-//     std::map<unsigned int, Synchronisable *>::iterator i = objectMap_.find(objectID);
-//     if(i==objectMap_.end())
-//       return NULL;
-//     assert(i->second->objectID==objectID);
-//     return (*i).second;
   }