Changeset 1856 for code/trunk/src/network

Timestamp:

Sep 29, 2008, 4:15:03 AM (16 years ago)

Author:

landauf

Message:

• some small adjustments in identifier and co.
• renamed GetIdentifier to ClassByName and ClassByID

Location:

code/trunk/src/network

Files:

• ConnectionManager.cc (modified) (1 diff)
• Server.cc (modified) (1 diff)
• Synchronisable.cc (modified) (12 diffs)
• packet/ClassID.cc (modified) (2 diffs)

code/trunk/src/network/ConnectionManager.cc

@@ -345 +345 @@
     std::string classname;
     orxonox::Identifier *id;
-    std::map<std::string, orxonox::Identifier*>::const_iterator it = orxonox::Factory::getFactoryBegin();
-    while(it != orxonox::Factory::getFactoryEnd()){
+    std::map<std::string, orxonox::Identifier*>::const_iterator it = orxonox::Factory::getFactoryMapBegin();
+    while(it != orxonox::Factory::getFactoryMapEnd()){
       id = (*it).second;
       if(id == NULL)

code/trunk/src/network/Server.cc

@@ -340 +340 @@
     if(!client)
       return false;
-    orxonox::Identifier* id = GetIdentifier("SpaceShip");
+    orxonox::Identifier* id = ClassByName("SpaceShip");
     if(!id){
       COUT(4) << "We could not create the SpaceShip for client: " << client->getID() << std::endl;

code/trunk/src/network/Synchronisable.cc

@@ -83 +83 @@
   }
 
-  
+
   void Synchronisable::setClient(bool b){
     if(b) // client
@@ -90 +90 @@
       state_=0x1;
   }
-  
+
   bool Synchronisable::fabricate(unsigned char*& mem, int mode)
   {
@@ -97 +97 @@
     objectID = *(unsigned int*)(mem+sizeof(unsigned int));
     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);
+
+    orxonox::Identifier* id = ClassByID(classID);
     if(!id){
       COUT(3) << "We could not identify a new object; classid: " << classID << " uint: " << (unsigned int)classID << " objectID: " << objectID << " size: " << size << std::endl;
@@ -149 +149 @@
     syncList->push_back(temp);
   }
-  
+
   /**
    * This function takes all SynchronisableVariables out of the Synchronisable and saves it into a syncData struct
@@ -171 +171 @@
     unsigned int size;
     size=getSize2(id, mode);
-    
+
     // start copy header
     memcpy(mem, &size, sizeof(unsigned int));
@@ -181 +181 @@
     tempsize+=12;
     // 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;
     // copy to location
@@ -215 +215 @@
   }
 
-  
+
   /**
    * This function takes a syncData struct and takes it to update the variables
@@ -230 +230 @@
       return false;
     }
-    
+
     // start extract header
     unsigned int objectID, classID, size;
@@ -245 +245 @@
       return true;
       //assert(0);
-    
+
     COUT(5) << "Synchronisable: objectID " << objectID << ", classID " << classID << " size: " << size << " synchronising data" << std::endl;
     for(i=syncList->begin(); i!=syncList->end() && mem <= data+size; i++){
@@ -317 +317 @@
     return sizeof(synchronisableHeader) + getSize( id, mode );
   }
-  
-  /**
-   * 
-   * @param id 
-   * @return 
+
+  /**
+   *
+   * @param id
+   * @return
    */
   bool Synchronisable::isMyTick(unsigned int id){
@@ -327 +327 @@
     return ( id==0 || id%objectFrequency_==objectID%objectFrequency_ ) && ((objectMode_&state_)!=0);
   }
-  
+
   bool Synchronisable::isMyData(unsigned char* mem)
   {
@@ -337 +337 @@
     classID = *(int *)mem;
     mem+=sizeof(classID);
-    
+
     assert(classID == this->classID);
     return (objectID == this->objectID);
   }
-  
+
   void Synchronisable::setObjectMode(int mode){
     assert(mode==0x1 || mode==0x2 || mode==0x3);

code/trunk/src/network/packet/ClassID.cc

@@ -42 +42 @@
 #define _CLASSNAMELENGTH      _CLASSID + sizeof(unsigned int)
 #define _CLASSNAME            _CLASSNAMELENGTH + sizeof(classNameLength_)
-  
+
   ClassID::ClassID( unsigned int classID, std::string className )
  : Packet()
@@ -73 +73 @@
 bool ClassID::process(){
   COUT(3) << "processing classid: " << getClassID() << " name: " << (const char*)(data_+_CLASSNAME) << std::endl;
-  orxonox::Identifier *id=GetIdentifier( std::string((const char*)(data_+_CLASSNAME) ));
+  orxonox::Identifier *id=ClassByID( std::string((const char*)(data_+_CLASSNAME) ));
   if(id==NULL)
     return false;