Changeset 2034

Timestamp:

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

Author:

landauf

Message:

Synchronisable translates creator ↔ creatorID

Location:

code/branches/objecthierarchy/src

Files:

• core/CoreIncludes.h (modified) (1 diff)
• network/GamestateManager.cc (modified) (1 diff)
• network/Synchronisable.cc (modified) (3 diffs)
• network/Synchronisable.h (modified) (1 diff)
• network/packet/Gamestate.cc (modified) (1 diff)
• orxonox/gamestates/GSLevel.cc (modified) (1 diff)
• orxonox/objects/Scene.cc (modified) (2 diffs)
• orxonox/objects/Test.cc (modified) (1 diff)
• orxonox/objects/infos/Info.cc (modified) (1 diff)
• orxonox/objects/worldentities/SpawnPoint.h (modified) (1 diff)
• orxonox/objects/worldentities/WorldEntity.cc (modified) (1 diff)
• util/Debug.h (modified) (1 diff)

code/branches/objecthierarchy/src/core/CoreIncludes.h

@@ -112 +112 @@
 */
 #define Class(ClassName) \
-    ClassIdentifier<ClassName>::getIdentifier()
+    orxonox::ClassIdentifier<ClassName>::getIdentifier()
 
 /**

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;

code/branches/objecthierarchy/src/orxonox/gamestates/GSLevel.cc

@@ -197 +197 @@
     void GSLevel::unloadLevel()
     {
-        Loader::unload(startFile_);
+        //////////////////////////////////////////////////////////////////////////////////////////
+        // TODO // TODO // TODO // TODO // TODO // TODO // TODO // TODO // TODO // TODO // TODO //
+        //////////////////////////////////////////////////////////////////////////////////////////
+        // Loader::unload(startFile_); // TODO: REACTIVATE THIS IF LOADER::UNLOAD WORKS PROPERLY /
+        //////////////////////////////////////////////////////////////////////////////////////////
+
         delete this->startFile_;
     }

code/branches/objecthierarchy/src/orxonox/objects/Scene.cc

@@ -43 +43 @@
     CreateFactory(Scene);
 
-    Scene::Scene(BaseObject* creator) : BaseObject(creator)
+    Scene::Scene(BaseObject* creator) : BaseObject(creator), network::Synchronisable(creator)
     {
         RegisterObject(Scene);
@@ -81 +81 @@
         }
         // test test test
-        
+
         this->registerVariables();
     }

code/branches/objecthierarchy/src/orxonox/objects/Test.cc

@@ -36 +36 @@
         CreateFactory ( Test );
 
-        Test::Test(BaseObject* creator) : BaseObject(creator)
+        Test::Test(BaseObject* creator) : BaseObject(creator), network::Synchronisable(creator)
         {
                 RegisterObject ( Test );

code/branches/objecthierarchy/src/orxonox/objects/infos/Info.cc

@@ -34 +34 @@
 namespace orxonox
 {
-    Info::Info(BaseObject* creator) : BaseObject(creator)
+    Info::Info(BaseObject* creator) : BaseObject(creator), network::Synchronisable(creator)
     {
         RegisterObject(Info);

code/branches/objecthierarchy/src/orxonox/objects/worldentities/SpawnPoint.h

@@ -60 +60 @@
             void spawn(ControllableEntity* entity);
 
-        public:
+        private:
             void setSpawnClassName(const std::string& name);
             inline const std::string& getSpawnClassName() const

code/branches/objecthierarchy/src/orxonox/objects/worldentities/WorldEntity.cc

@@ -48 +48 @@
     const Vector3 WorldEntity::UP    = Vector3::UNIT_Y;
 
-    WorldEntity::WorldEntity(BaseObject* creator) : BaseObject(creator)
+    WorldEntity::WorldEntity(BaseObject* creator) : BaseObject(creator), network::Synchronisable(creator)
     {
         RegisterObject(WorldEntity);

code/branches/objecthierarchy/src/util/Debug.h

@@ -77 +77 @@
 }
 
+namespace orxonox
+{
+    using std::endl;
+}
 
 // DEFINE ERROR MODES