Changeset 9635 for code/branches/core6/src/libraries/core/CoreIncludes.h

Timestamp:

Aug 11, 2013, 2:38:03 PM (12 years ago)

Author:

landauf

Message:

added Factory for classes that don't require a Context as constructor argument

File:

• code/branches/core6/src/libraries/core/CoreIncludes.h (modified) (1 diff)

code/branches/core6/src/libraries/core/CoreIncludes.h

@@ -113 +113 @@
 
 /**
-    @brief Creates the Factory.
+    @brief Creates and registers the Factory.
     @param ClassName The name of the class
 */
 #define CreateFactory(ClassName) \
-    Factory* _##ClassName##Factory = new orxonox::ClassFactory<ClassName>(#ClassName, true)
+    RegisterFactory(ClassName, new orxonox::ClassFactoryWithContext<ClassName>(#ClassName, true))
 
 /**
-    @brief Creates the Factory for classes which should not be loaded through XML.
+    @brief Creates and registers the Factory for classes which should not be loaded through XML.
     @param ClassName The name of the class
 */
 #define CreateUnloadableFactory(ClassName) \
-    Factory* _##ClassName##Factory = new orxonox::ClassFactory<ClassName>(#ClassName, false)
+    RegisterFactory(ClassName, new orxonox::ClassFactoryWithContext<ClassName>(#ClassName, false))
+
+/**
+    @brief Registers a given Factory.
+    @param ClassName The name of the class
+*/
+#define RegisterFactory(ClassName, FactoryInstance) \
+    Factory* _##ClassName##Factory = FactoryInstance
 
 /**