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

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

Location:

code/branches/core6/src/libraries/core/object

Files:

• ClassFactory.h (modified) (2 diffs)
• Context.cc (modified) (1 diff)
• Context.h (modified) (1 diff)

code/branches/core6/src/libraries/core/object/ClassFactory.h

@@ -55 +55 @@
         public:
             virtual ~Factory() {};
-            virtual OrxonoxClass* fabricate(BaseObject* creator) = 0;
+            virtual OrxonoxClass* fabricate(Context* context) = 0;
     };
 
@@ -82 +82 @@
                 @return The new object
             */
-            inline OrxonoxClass* fabricate(BaseObject* creator)
+            inline OrxonoxClass* fabricate(Context* context)
             {
-                return static_cast<OrxonoxClass*>(new T(creator));
+                return static_cast<OrxonoxClass*>(new T(context));
             }
     };

code/branches/core6/src/libraries/core/object/Context.cc

@@ -56 +56 @@
     /*static*/ Context* Context::getRootContext()
     {
-        static Context rootContext;
+        static Context rootContext(NULL);
         return &rootContext;
     }

code/branches/core6/src/libraries/core/object/Context.h

@@ -48 +48 @@
             static Context* getRootContext();
 
-            Context(Context* context = NULL);
+            Context(Context* context);
             virtual ~Context();