Changeset 366 for code/branches/objecthierarchy/src/orxonox/orxonox.cc

Timestamp:

Dec 2, 2007, 2:07:01 AM (17 years ago)

Author:

landauf

Message:

moved common object-functions and -variables (like isA() and name_) from BaseObject to OrxonoxClass, so they can still be used while iterating through a list of objects inheriting from an interface.

File:

• code/branches/objecthierarchy/src/orxonox/orxonox.cc (modified) (6 diffs)

code/branches/objecthierarchy/src/orxonox/orxonox.cc

@@ -474 +474 @@
         delete test9_06;
 */
-/*
+
         std::cout << "Test 10\n";
         Identifier* test10_01 = Class(A1B2);
@@ -509 +509 @@
         {
             test10_08 = ID("A2B1C1")->fabricate();
-            test10_08->name_ = "A2B1C1#";
-            test10_08->name_ += ('0' + i);
+            std::string objName = "A2B1C1#";
+            objName += '0' + i;
+            test10_08->setName(objName);
 
             if (i == 0)
@@ -531 +532 @@
 
         for (Iterator<A2B1C1> it = ObjectList<A2B1C1>::start(); it; ++it)
-            std::cout << "Name: " << it->name_ << "\n";
+            std::cout << "Name: " << it->getName() << "\n";
 
         std::cout << "3\n";
         for (Iterator<A2B1C1> it = ObjectList<A2B1C1>::end(); it; --it)
-            std::cout << "Name: " << it->name_ << "\n";
+            std::cout << "Name: " << it->getName() << "\n";
 
         std::cout << "4\n";
@@ -553 +554 @@
         std::cout << "5\n";
         for (Iterator<A2B1C1> it = ObjectList<A2B1C1>::start(); it; ++it)
-            std::cout << "Name: " << it->name_ << "\n";
+            std::cout << "Name: " << it->getName() << "\n";
 
         std::cout << "6\n";
         for (Iterator<A2B1C1> it = ObjectList<A2B1C1>::end(); it; --it)
-            std::cout << "Name: " << it->name_ << "\n";
+            std::cout << "Name: " << it->getName() << "\n";
 
         std::cout << "7\n";
@@ -575 +576 @@
         std::cout << "8\n";
         for (Iterator<A2B1C1> it = ObjectList<A2B1C1>::start(); it; ++it)
-            std::cout << "Name: " << it->name_ << "\n";
+            std::cout << "Name: " << it->getName() << "\n";
 
         std::cout << "9\n";
         for (Iterator<A2B1C1> it = ObjectList<A2B1C1>::end(); it; --it)
-            std::cout << "Name: " << it->name_ << "\n";
+            std::cout << "Name: " << it->getName() << "\n";
 
         std::cout << "10\n";
@@ -597 +598 @@
         std::cout << "11\n";
         for (Iterator<A2B1C1> it = ObjectList<A2B1C1>::start(); it; ++it)
-            std::cout << "Name: " << it->name_ << "\n";
+            std::cout << "Name: " << it->getName() << "\n";
 
         std::cout << "12\n";
         for (Iterator<A2B1C1> it = ObjectList<A2B1C1>::end(); it; --it)
-            std::cout << "Name: " << it->name_ << "\n";
+            std::cout << "Name: " << it->getName() << "\n";
 
         std::cout << "13\n";
-*/
+
       }