Changeset 9629 for code/branches/core6/src/libraries/core/BaseObject.cc

Timestamp:

Aug 9, 2013, 9:26:46 PM (11 years ago)

Author:

landauf

Message:

BaseObject now requires a Context instead of a creator (BaseObject*) in its constructor.
Namespace, Level, and Scene inherit from Context

File:

• code/branches/core6/src/libraries/core/BaseObject.cc (modified) (3 diffs)

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

@@ -55 +55 @@
         @brief Constructor: Registers the object in the BaseObject-list.
     */
-    BaseObject::BaseObject(BaseObject* creator) : bInitialized_(false)
+    BaseObject::BaseObject(Context* context) : bInitialized_(false)
     {
         RegisterRootObject(BaseObject);
@@ -70 +70 @@
         this->mainStateFunctor_ = 0;
 
+        if (context)
+            this->setContext(context);
+
+        BaseObject* creator = orxonox_cast<BaseObject*>(context);
         this->setCreator(creator);
         if (this->creator_)
@@ -201 +205 @@
         {
             this->networkTemplateNames_.insert(temp->getLink());
-            
+
             Template* link;
             assert(!(link = Template::getTemplate(temp->getLink())) || !link->isLink());