Changeset 2028 for code/branches/objecthierarchy/src

Timestamp:

Oct 28, 2008, 8:02:32 PM (16 years ago)

Author:

scheusso

Message:

updated updateMedia script
updated TODO file
we are able to synchronise the creatorID of an object now

Location:

code/branches/objecthierarchy/src/network

Files:

• Synchronisable.cc (modified) (3 diffs)
• Synchronisable.h (modified) (2 diffs)

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

@@ -134 +134 @@
     orxonox::Identifier* id = ClassByID(header->classID);
     assert(id);
-    orxonox::BaseObject *bo = id->fabricate(0); // TODO: get creator
+    orxonox::BaseObject *bo = id->fabricate(0); //TODO: get BaseObject* from header->creatorID here
     Synchronisable *no = dynamic_cast<Synchronisable *>(bo);
     assert(no);
@@ -264 +264 @@
     header->size = size;
     header->objectID = this->objectID;
+    header->creatorID = this->creatorID;
     header->classID = this->classID;
     header->dataAvailable = true;
@@ -325 +326 @@
     synchronisableHeader *syncHeader = (synchronisableHeader *)mem;
     assert(syncHeader->objectID==this->objectID);
+    assert(syncHeader->creatorID==this->creatorID);
     if(syncHeader->dataAvailable==false){
       mem+=syncHeader->size;

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

@@ -76 +76 @@
     bool dataAvailable:1;
     uint32_t objectID;
+    uint32_t creatorID;
     uint32_t classID;
   };
@@ -129 +130 @@
 
     unsigned int objectID;
+    unsigned int creatorID;
     unsigned int classID;