Changeset 5839

Timestamp:

Sep 30, 2009, 12:42:28 PM (15 years ago)

Author:

scheusso

Message:

Fixed problem with scene and creators
creatorID is now always the objectID of the scene except for the case

• if the object is the scene (then the creatorID is OBJECTID_UNKNOWN)
• if the object is "above" the scene (e.g. level), then the cID is also OBJECTID_UNKNOWN

Location:

code/branches/core5/src

Files:

• libraries/core/BaseObject.cc (modified) (3 diffs)
• libraries/core/BaseObject.h (modified) (2 diffs)
• libraries/network/synchronisable/Synchronisable.cc (modified) (4 diffs)
• orxonox/Scene.cc (modified) (2 diffs)
• orxonox/Scene.h (modified) (1 diff)

code/branches/core5/src/libraries/core/BaseObject.cc

@@ -46 +46 @@
 #include "XMLNameListener.h"
 #include "XMLPort.h"
+#include "network/NetworkPrereqs.h"
 
 namespace orxonox
@@ -74 +75 @@
             this->setFile(this->creator_->getFile());
             this->setNamespace(this->creator_->getNamespace());
-            this->setScene(this->creator_->getScene());
+            this->setScene(this->creator_->getScene(), this->creator_->getSceneID());
             this->setGametype(this->creator_->getGametype());
         }
@@ -82 +83 @@
             this->namespace_ = 0;
             this->scene_ = 0;
+            this->sceneID_ = OBJECTID_UNKNOWN;
             this->gametype_ = 0;
         }

code/branches/core5/src/libraries/core/BaseObject.h

@@ -135 +135 @@
             inline BaseObject* getCreator() const { return this->creator_; }
 
-            inline void setScene(const SmartPtr<Scene>& scene) { this->scene_ = scene; }
+            inline void setScene(const SmartPtr<Scene>& scene, uint32_t sceneID) { this->scene_ = scene; this->sceneID_=sceneID; }
             inline const SmartPtr<Scene>& getScene() const { return this->scene_; }
+            inline virtual uint32_t getSceneID() const { return this->sceneID_; }
 
             inline void setGametype(const SmartPtr<Gametype>& gametype)
@@ -202 +203 @@
             std::list<BaseObject*> events_;
             std::map<std::string, EventContainer*> eventContainers_;
+            uint32_t               sceneID_;
     };
 

code/branches/core5/src/libraries/network/synchronisable/Synchronisable.cc

@@ -72 +72 @@
 
     // get creator id
-    this->creatorID = OBJECTID_UNKNOWN;
-
-    searchcreatorID:
+    if( creator )
+      this->creatorID = creator->getSceneID();
+    else
+      this->creatorID = OBJECTID_UNKNOWN;
+
+    /*searchcreatorID:
     if (creator)
     {
@@ -80 +83 @@
         if (synchronisable_creator && synchronisable_creator->objectMode_)
         {
-            this->creatorID = synchronisable_creator->getObjectID();
+            this->creatorID = synchronisable_creator->getScene()->getObjectID();
         }
         else if (creator != creator->getCreator())
@@ -87 +90 @@
             goto searchcreatorID;
         }
-    }
+    }*/
   }
 
@@ -173 +176 @@
     assert(no);
     no->objectID=header.getObjectID();
-    no->creatorID=header.getCreatorID(); //TODO: remove this
+    //no->creatorID=header.getCreatorID(); //TODO: remove this
     no->classID=header.getClassID();
+    assert(no->creatorID == header.getCreatorID());
+    //assert(no->classID == header.getClassID());
     COUT(4) << "fabricate objectID: " << no->objectID << " classID: " << no->classID << std::endl;
           // update data and create object/entity...

code/branches/core5/src/orxonox/Scene.cc

@@ -55 +55 @@
         RegisterObject(Scene);
 
-        this->setScene(SmartPtr<Scene>(this, false));
+        this->setScene(SmartPtr<Scene>(this, false), OBJECTID_UNKNOWN);
         this->bShadows_ = true;
 
@@ -283 +283 @@
     {
         this->objects_.push_back(object);
-        object->setScene(this);
+        object->setScene(this, this->getObjectID());
     }
 

code/branches/core5/src/orxonox/Scene.h

@@ -73 +73 @@
             inline Radar* getRadar()
                 { return this->radar_; }
+            
+            inline virtual uint32_t getSceneID() const { return this->getObjectID(); }
 
             virtual void tick(float dt);