Changeset 218 for code/branches

Timestamp:

Nov 19, 2007, 5:57:02 AM (17 years ago)

Author:

landauf

Message:

added factory

Location:

code/branches/objecthierarchie/src

Files:

• BaseObject.cc (modified) (1 diff)
• CMakeLists.txt (modified) (1 diff)
• ClassHierarchy.h (modified) (3 diffs)
• Factory.cc (added)
• Factory.h (added)
• Identifier.h (modified) (7 diffs)
• IdentifierIncludes.h (modified) (1 diff)
• OrxonoxClass.h (modified) (1 diff)
• Test.h (modified) (2 diffs)
• orxonox.cc (modified) (4 diffs)
• test1.cc (modified) (1 diff)
• test2.cc (modified) (1 diff)
• test3.cc (modified) (1 diff)

code/branches/objecthierarchie/src/BaseObject.cc

@@ -3 +3 @@
 namespace orxonox
 {
+    CreateFactory(BaseObject);
+
     BaseObject::BaseObject()
     {

code/branches/objecthierarchie/src/CMakeLists.txt

@@ -2 +2 @@
 
 # create a few variables to simplify life
-SET(SRC_FILES orxonox.cc IdentifierList.cc ObjectList.cc Identifier.cc ClassHierarchy.cc OrxonoxClass.cc BaseObject.cc test1.cc test2.cc test3.cc)
-SET(INC_FILES ClassHierarchy.h Identifier.h IdentifierList.h ObjectList.h OrxonoxClass.h BaseObject.h Test.h test1.h test2.h test3.h)
+SET(SRC_FILES orxonox.cc IdentifierList.cc ObjectList.cc Identifier.cc Factory.cc ClassHierarchy.cc OrxonoxClass.cc BaseObject.cc test1.cc test2.cc test3.cc)
+SET(INC_FILES IdentifierIncludes.h ClassHierarchy.h Identifier.h Factory.h IdentifierList.h ObjectList.h OrxonoxClass.h BaseObject.h Test.h test1.h test2.h test3.h)
 
 #Creates an executable

code/branches/objecthierarchie/src/ClassHierarchy.h

@@ -11 +11 @@
 // - ClassIdentifier
 // - BaseIdentifier
+// - Factory
 
 // IN WORK:
-// - Factory
 
 // TO DO:
 // - iterate through lists
-// - searchtree for classname-strings
 
 
@@ -37 +36 @@
         private:
             ClassHierarchy();
+            ClassHierarchy(const ClassHierarchy& hierarchy);
             ~ClassHierarchy();
             void startCreatingHierarchy() { this->hierarchyCreatingCounter_++; std::cout << "*** Increased Hierarchy-Creating-Counter to " << this->hierarchyCreatingCounter_ << "\n"; }
@@ -91 +91 @@
         ClassIdentifier<ClassName>::getIdentifier()
 
-    #define Factory(ClassName) \
-        ClassIdentifier<ClassName>::create()
+    #define CreateFactory(ClassName) \
+        Identifier* global_##ClassName##_Identifier = ClassIdentifier<ClassName>::getIdentifier()
+
+    #define Factory(Name) \
+        ClassFactory::fabricate(Name)
 }
 

code/branches/objecthierarchie/src/Identifier.h

@@ -6 +6 @@
 #include "ObjectList.h"
 #include "OrxonoxClass.h"
+#include "Factory.h"
 
 namespace orxonox
@@ -21 +22 @@
             void addObject(OrxonoxClass* object);
             void removeObject(OrxonoxClass* object);
+
+            virtual OrxonoxClass* fabricate() {};
 
             bool isA(Identifier* identifier);
@@ -61 +64 @@
             static ClassIdentifier<T>* registerClass(IdentifierList* parents, std::string name, bool bRootClass, bool bIsAbstractClass);
             static ClassIdentifier<T>* getIdentifier();
+            OrxonoxClass* fabricate();
+            T* fabricateClass();
 
         private:
@@ -83 +88 @@
     {
         this->pointer_ = NULL;
+    }
+
+    template <class T>
+    OrxonoxClass* ClassIdentifier<T>::fabricate()
+    {
+        return this->fabricateClass();
+    }
+
+    template <class T>
+    T* ClassIdentifier<T>::fabricateClass()
+    {
+        return new T;
     }
 
@@ -97 +114 @@
                 pointer_->name_ = name;
                 pointer_->bIsAbstractClass_ = bIsAbstractClass;
+
+                ClassFactory::add(name, pointer_);
+
                 pointer_->initialize(parents);
             }
@@ -124 +144 @@
     }
 
-
     // ##### BaseIdentifier #####
     template <class B>
-    class BaseIdentifier// : public Identifier
+    class BaseIdentifier
     {
         public:
             BaseIdentifier();
 
-            //template <class T>
-            BaseIdentifier<B>& operator= (/*Class*/Identifier/*<T>*/* identifier)
+            BaseIdentifier<B>& operator= (Identifier* identifier)
             {
                 if (!identifier->isA(ClassIdentifier<B>::getIdentifier()))
@@ -145 +163 @@
                 return *this;
             }
+
+            Identifier* operator* ()
+            {
+                return this->identifier_;
+            }
+
+            Identifier* operator-> () const
+            {
+                return this->identifier_;
+            }
+
+            B* fabricate()
+            {
+                OrxonoxClass* newObject = this->identifier_->fabricate();
+                if (newObject)
+                {
+                    return dynamic_cast<B*>(newObject);
+                }
+                else
+                {
+                    if (this->identifier_)
+                    {
+                        std::cout << "Error: Class " << this->identifier_->getName() << " is not a " << ClassIdentifier<B>::getIdentifier()->getName() << "!\n";
+                        std::cout << "Error: Couldn't fabricate a new Object.\n";
+                        std::cout << "Aborting...\n";
+                    }
+                    else
+                    {
+                        std::cout << "Error: Couldn't fabricate a new Object - Identifier is undefined.\n";
+                        std::cout << "Aborting...\n";
+                    }
+
+                    abort();
+                }
+            }
+
             inline Identifier* getIdentifier()
                 { return this->identifier_; }

code/branches/objecthierarchie/src/IdentifierIncludes.h

@@ -1 +1 @@
 #include "ClassHierarchy.h"
 #include "Identifier.h"
+#include "Factory.h"
 #include "IdentifierList.h"
 #include "ObjectList.h"

code/branches/objecthierarchie/src/OrxonoxClass.h

@@ -11 +11 @@
         public:
             OrxonoxClass();
-            ~OrxonoxClass();
+            virtual ~OrxonoxClass();
             Identifier* getIdentifier() { return this->identifier_; }
             void setIdentifier(Identifier* identifier) { this->identifier_ = identifier; }

code/branches/objecthierarchie/src/Test.h

@@ -2 +2 @@
 #define _Test_H__
 
+#include "BaseObject.h"
 #include "IdentifierIncludes.h"
 
@@ -125 +126 @@
             A3B2C2() { registerObject(A3B2C2); }
     };
+
+    CreateFactory(A1);
+    CreateFactory(A2);
+    CreateFactory(A3);
+    CreateFactory(A1B1);
+    CreateFactory(A1B2);
+    CreateFactory(A2B1);
+    CreateFactory(A2B2);
+    CreateFactory(A3B1);
+    CreateFactory(A3B2);
+    CreateFactory(A1B1C1);
+    CreateFactory(A1B1C2);
+    CreateFactory(A1B2C1);
+    CreateFactory(A2B1C1);
+    CreateFactory(A2B2C1);
+    CreateFactory(A3B1C1);
+    CreateFactory(A3B1C2);
+    CreateFactory(A3B2C1);
+    CreateFactory(A3B2C2);
 }
 

code/branches/objecthierarchie/src/orxonox.cc

@@ -31 +31 @@
 #include <OgreCEGUIRenderer.h>
 
+#include "IdentifierIncludes.h"
 #include "BaseObject.h"
 #include "Test.h"
@@ -446 +447 @@
         test7_02 = Class(A1B1);
 
-        std::cout << test7_01.getIdentifier()->getName() << "\n";
-        std::cout << test7_02.getIdentifier()->getName() << "\n";
+        std::cout << test7_01->getName() << "\n";
+        std::cout << test7_02->getName() << "\n";
 */
 /*
@@ -461 +462 @@
         test7_05 = Class(A2);
 */
-
+/*
         std::cout << "Test 8\n";
 
@@ -498 +499 @@
         delete test8_02;
         delete test8_03;
-
+*/
+
+        std::cout << "Test 9\n";
+        std::cout << "1\n";
+        Identifier* test9_01 = Class(A3);
+        OrxonoxClass* test9_02 = test9_01->fabricate();
+        std::cout << test9_02->getIdentifier()->getName() << "\n";
+
+        std::cout << "\n2\n";
+        OrxonoxClass* test9_03 = Class(A1B2)->fabricate();
+        std::cout << test9_03->getIdentifier()->getName() << "\n";
+
+        std::cout << "\n3\n";
+        BaseIdentifier<A1> test9_04;
+        test9_04 = Class(A1B1C1);
+        A1* test9_05 = test9_04.fabricate();
+        std::cout << test9_05->getIdentifier()->getName() << "\n";
+
+        std::cout << "\n4\n";
+        OrxonoxClass* test9_06 = Factory("A2B2");
+        std::cout << test9_06->getIdentifier()->getName() << "\n";
+
+        std::cout << "\n5\n";
+        delete test9_02;
+        delete test9_03;
+        delete test9_05;
+        delete test9_06;
 
       }

code/branches/objecthierarchie/src/test1.cc

@@ -5 +5 @@
 namespace orxonox
 {
+    CreateFactory(Test1);
+
     Test1::Test1()
     {

code/branches/objecthierarchie/src/test2.cc

@@ -5 +5 @@
 namespace orxonox
 {
+    CreateFactory(Test2);
+
     Test2::Test2()
     {

code/branches/objecthierarchie/src/test3.cc

@@ -5 +5 @@
 namespace orxonox
 {
+    CreateFactory(Test3);
+
     Test3::Test3()
     {