Changeset 2034 for code/branches/objecthierarchy/src/network

Timestamp:

Oct 28, 2008, 10:34:45 PM (16 years ago)

Author:

landauf

Message:

Synchronisable translates creator ↔ creatorID

Location:

code/branches/objecthierarchy/src/network

Files:

• GamestateManager.cc (modified) (1 diff)
• Synchronisable.cc (modified) (3 diffs)
• Synchronisable.h (modified) (1 diff)
• packet/Gamestate.cc (modified) (1 diff)

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

@@ -80 +80 @@
     // now push only the most recent gamestates we received (ignore obsolete ones)
     for(it = gamestateQueue.begin(); it!=gamestateQueue.end(); it++){
-      assert(processGamestate(it->second));
+      bool b = processGamestate(it->second);
+//      assert(b);
       delete it->second;
     }

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

@@ -63 +63 @@
   * Initializes all Variables and sets the right objectID
   */
-  Synchronisable::Synchronisable(){
+  Synchronisable::Synchronisable(orxonox::BaseObject* creator){
     RegisterRootObject(Synchronisable);
     static uint32_t idCounter=0;
@@ -71 +71 @@
     classID = (unsigned int)-1;
     syncList = new std::list<synchronisableVariable *>;
+
+    this->creatorID = OBJECTID_UNKNOWN;
+
+    searchcreatorID:
+    if (creator)
+    {
+        if (creator->isA(Class(Synchronisable)))
+        {
+            Synchronisable* synchronisable_creator = dynamic_cast<Synchronisable*>(creator);
+            this->creatorID = synchronisable_creator->getObjectID();
+        }
+        else if (creator != creator->getCreator())
+        {
+            creator = creator->getCreator();
+            goto searchcreatorID;
+        }
+    }
   }
 
@@ -134 +151 @@
     orxonox::Identifier* id = ClassByID(header->classID);
     assert(id);
-    orxonox::BaseObject *bo = id->fabricate(0); //TODO: get BaseObject* from header->creatorID here
+    orxonox::BaseObject* creator = 0;
+    if (header->creatorID != OBJECTID_UNKNOWN)
+    {
+        Synchronisable* synchronisable_creator = Synchronisable::getSynchronisable(header->creatorID);
+        if (!synchronisable_creator)
+            return 0;
+        else
+            creator = dynamic_cast<orxonox::BaseObject*>(synchronisable_creator);
+    }
+    orxonox::BaseObject *bo = id->fabricate(creator);
+    assert(bo);
     Synchronisable *no = dynamic_cast<Synchronisable *>(bo);
     assert(no);

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

@@ -115 +115 @@
     inline unsigned int getClassID(){return classID;}
   protected:
-    Synchronisable();
+    Synchronisable(orxonox::BaseObject* creator);
     void registerVar(void *var, int size, variableType t, int mode=1, NetworkCallbackBase *cb=0);
     void setObjectMode(int mode);

code/branches/objecthierarchy/src/network/packet/Gamestate.cc

@@ -158 +158 @@
     {
       s = Synchronisable::fabricate(mem, mode);
-      assert(s);
+      return false;
 //       if(!s)
 //         return false;