Changeset 9667 for code/trunk/src/libraries/core/object/ClassFactory.h

Timestamp:

Aug 25, 2013, 9:08:42 PM (12 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/object (copied) (copied from code/branches/core6/src/libraries/core/object)
• src/libraries/core/object/ClassFactory.h (modified) (3 diffs)

code/trunk/src/libraries/core/object/ClassFactory.h

@@ -43 +43 @@
 
 #include "util/Output.h"
-#include "core/class/Identifier.h"
 
 namespace orxonox
@@ -50 +49 @@
     // ###       Factory       ###
     // ###########################
-    /// Base-class of ClassFactory.
+    /// Base-class of all factories.
     class _CoreExport Factory
     {
         public:
-            virtual ~Factory() {};
-            virtual OrxonoxClass* fabricate(BaseObject* creator) = 0;
+            virtual ~Factory() {}
+            virtual Identifiable* fabricate(Context* context) = 0;
     };
 
@@ -61 +60 @@
     // ###      ClassFactory       ###
     // ###############################
-    /// The ClassFactory is able to create new objects of a specific class.
+    /// The ClassFactory is the base-class of all class-spezific factories
     template <class T>
     class ClassFactory : public Factory
     {
+    };
+
+    // ###############################
+    // ###   ClassFactoryNoArgs    ###
+    // ###############################
+    /// The ClassFactoryNoArgs is able to create new objects of a specific class that require no constructor arguments.
+    template <class T>
+    class ClassFactoryNoArgs : public ClassFactory<T>
+    {
         public:
-            /**
-                @brief Constructor: Adds the ClassFactory to the Identifier of the same type.
-                @param name The name of the class
-                @param bLoadable True if the class can be loaded through XML
-            */
-            ClassFactory(const std::string& name, bool bLoadable = true)
-            {
-                orxout(verbose, context::misc::factory) << "Create entry for " << name << " in Factory." << endl;
-                ClassIdentifier<T>::getIdentifier(name)->addFactory(this);
-                ClassIdentifier<T>::getIdentifier()->setLoadable(bLoadable);
-            }
-
             /**
                 @brief Creates and returns a new object of class T.
                 @return The new object
             */
-            inline OrxonoxClass* fabricate(BaseObject* creator)
+            inline Identifiable* fabricate(Context* context)
             {
-                return static_cast<OrxonoxClass*>(new T(creator));
+                return static_cast<Identifiable*>(new T());
+            }
+    };
+
+    // ###############################
+    // ### ClassFactoryWithContext ###
+    // ###############################
+    /// The ClassFactoryWithContext is able to create new objects of a specific class that require a context as constructor argument
+    template <class T>
+    class ClassFactoryWithContext : public ClassFactory<T>
+    {
+        public:
+            /**
+                @brief Creates and returns a new object of class T.
+                @return The new object
+            */
+            inline Identifiable* fabricate(Context* context)
+            {
+                return static_cast<Identifiable*>(new T(context));
             }
     };