Changeset 244 for code/branches/objecthierarchie/src/orxonox.cc

Timestamp:

Nov 25, 2007, 5:21:53 PM (16 years ago)

Author:

landauf

Message:

reimplementation of the factory and parts of the class-hierarchy-generating-algorithm. interfaces with protected constructors are now allowed.

File:

• code/branches/objecthierarchie/src/orxonox.cc (modified) (9 diffs)

code/branches/objecthierarchie/src/orxonox.cc

@@ -102 +102 @@
         startRenderLoop();
 */
+
+        #define testandcout(code) \
+          std::cout << #code << " " << code << "\n"
+
 /*
         std::cout << "Test 1\n";
@@ -176 +180 @@
         }
 */
-
-        #define testandcout(code) \
-          std::cout << #code << " " << code << "\n"
-
 /*
         std::cout << "\n";
@@ -205 +205 @@
         testandcout(test5_03->isA(Class(BaseObject)));
         testandcout(test5_03->isA(Class(Interface1)));
-
 
         std::cout << "\n";
@@ -346 +345 @@
         std::cout << "\n";
         std::cout << "A2 parent of A2B1C1: " << Class(A2)->isParentOf(Class(A2B1C1)) << "\n";
-
-
+*/
+/*
         std::cout << "Test 7\n";
         std::cout << "1\n";
@@ -427 +426 @@
 
         std::cout << "\n4\n";
-        BaseObject* test9_06 = Factory("A2B2");
+        BaseObject* test9_06 = ID("A2B2")->fabricate();
         std::cout << test9_06->getIdentifier()->getName() << "\n";
 
@@ -436 +435 @@
         delete test9_06;
 */
-
+/*
         std::cout << "Test 10\n";
         Identifier* test10_01 = Class(A1B2);
@@ -449 +448 @@
         BaseObject* test10_07;
         for (int i = 0; i < 10; i++)
-            test10_07 = Factory("A1B1C1");
+            test10_07 = ID("A1B1C1")->fabricate();
 
         std::cout << "1\n";
@@ -484 +483 @@
         for (int i = 0; i < 10; i++)
         {
-            test10_08 = Factory("A2B1C1");
+            test10_08 = ID("A2B1C1")->fabricate();
             test10_08->name_ = "A2B1C1#";
             test10_08->name_ += ('0' + i);
@@ -534 +533 @@
         for (Iterator<A2B1C1> it; it; --it)
             std::cout << "Name: " << it->name_ << "\n";
-
+*/
 
       }