Changeset 9629 for code/branches/core6/src/libraries/core/class

Timestamp:

Aug 9, 2013, 9:26:46 PM (12 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

Location:

code/branches/core6/src/libraries/core/class

Files:

• Identifier.cc (modified) (1 diff)
• Identifier.h (modified) (1 diff)
• SubclassIdentifier.h (modified) (1 diff)

code/branches/core6/src/libraries/core/class/Identifier.cc

@@ -174 +174 @@
         @return The new object
     */
-    OrxonoxClass* Identifier::fabricate(BaseObject* creator)
+    OrxonoxClass* Identifier::fabricate(Context* context)
     {
         if (this->factory_)
         {
-            return this->factory_->fabricate(creator);
+            return this->factory_->fabricate(context);
         }
         else

code/branches/core6/src/libraries/core/class/Identifier.h

@@ -125 +125 @@
             inline bool hasFactory() const { return (this->factory_ != 0); }
 
-            OrxonoxClass* fabricate(BaseObject* creator);
+            OrxonoxClass* fabricate(Context* context);
 
             /// Returns true if the class can be loaded through XML.

code/branches/core6/src/libraries/core/class/SubclassIdentifier.h

@@ -163 +163 @@
 
             /// Creates a new object of the type of the assigned Identifier and dynamic_casts it to the minimal type given by T.
-            T* fabricate(BaseObject* creator) const
-            {
-                OrxonoxClass* newObject = this->identifier_->fabricate(creator);
+            T* fabricate(Context* context) const
+            {
+                OrxonoxClass* newObject = this->identifier_->fabricate(context);
 
                 // Check if the creation was successful