Changeset 457 for code/branches/objecthierarchy/src/orxonox/core/ClassFactory.h

Timestamp:

Dec 10, 2007, 8:34:48 PM (17 years ago)

Author:

landauf

Message:

changed the class-hierarchy creation: call Factory::createClassHierarchy() to create the hierarchy.
until now it was automatically created at the program-start, but that could have been a problem in the future when classes depend on ogre, because ogre isn't already initialized at that program-start, so i've changed it.

File:

• code/branches/objecthierarchy/src/orxonox/core/ClassFactory.h (modified) (3 diffs)

code/branches/objecthierarchy/src/orxonox/core/ClassFactory.h

@@ -10 +10 @@
 
 #include "Identifier.h"
-#include "Debug.h"
 
 namespace orxonox
@@ -22 +21 @@
     {
         public:
-            static bool create();
+            static bool create(const std::string& name);
             BaseObject* fabricate();
 
@@ -34 +33 @@
 
     /**
-        @brief Adds the ClassFactory to the Identifier of the same type and creates a new object to retrieve the parents.
+        @brief Adds the ClassFactory to the Identifier of the same type and the Identifier to the Factory.
         @return Always true (this is needed because the compiler only allows assignments before main())
     */
     template <class T>
-    bool ClassFactory<T>::create()
+    bool ClassFactory<T>::create(const std::string& name)
     {
-        // Add the ClassFactory to the Classidentifier of type T
         ClassIdentifier<T>::getIdentifier()->addFactory(new ClassFactory<T>);
-
-        // To create the new branch of the class-hierarchy, we create a new object and delete it afterwards.
-        ClassIdentifier<T>::getIdentifier()->startCreatingHierarchy();
-        COUT(4) << "*** Create Factory -> Create Class\n";
-        BaseObject* temp = ClassIdentifier<T>::getIdentifier()->fabricate();
-        delete temp;
-        ClassIdentifier<T>::getIdentifier()->stopCreatingHierarchy();
+        Factory::add(name, ClassIdentifier<T>::getIdentifier());
 
         return true;