Changeset 366 for code/branches

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.

Location:

code/branches/objecthierarchy/src/orxonox

Files:

• core/OrxonoxClass.cc (modified) (1 diff)
• core/OrxonoxClass.h (modified) (1 diff)
• objects/BaseObject.h (modified) (1 diff)
• orxonox.cc (modified) (6 diffs)

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

@@ -8 +8 @@
 namespace orxonox
 {
-    /** @brief Constructor: Sets identifier_ and parents_ to zero. */
+    /** @brief Constructor: Sets the default values. */
     OrxonoxClass::OrxonoxClass()
     {
         this->identifier_ = 0;
         this->parents_ = 0;
+
+        this->bActive_ = true;
+        this->bVisible_ = true;
     }
 

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

@@ -43 +43 @@
             inline MetaObjectList& getMetaList() { return this->metaList_; }
 
+            inline bool isA(const Identifier* identifier)
+                { return this->getIdentifier()->isA(identifier); }
+            inline bool isDirectlyA(const Identifier* identifier)
+                { return this->getIdentifier()->isDirectlyA(identifier); }
+            inline bool isChildOf(const Identifier* identifier)
+                { return this->getIdentifier()->isChildOf(identifier); }
+            inline bool isParentOf(const Identifier* identifier)
+                { return this->getIdentifier()->isParentOf(identifier); }
+
+            inline bool isA(const SubclassIdentifier<class B>* identifier)
+                { return this->getIdentifier()->isA(identifier->getIdentifier()); }
+            inline bool isDirectlyA(const SubclassIdentifier<class B>* identifier)
+                { return this->getIdentifier()->isDirectlyA(identifier->getIdentifier()); }
+            inline bool isChildOf(const SubclassIdentifier<class B>* identifier)
+                { return this->getIdentifier()->isChildOf(identifier->getIdentifier()); }
+            inline bool isParentOf(const SubclassIdentifier<class B>* identifier)
+                { return this->getIdentifier()->isParentOf(identifier->getIdentifier()); }
+
+            inline bool isA(const SubclassIdentifier<class B> identifier)
+                { return this->getIdentifier()->isA(identifier.getIdentifier()); }
+            inline bool isDirectlyA(const SubclassIdentifier<class B> identifier)
+                { return this->getIdentifier()->isDirectlyA(identifier.getIdentifier()); }
+            inline bool isChildOf(const SubclassIdentifier<class B> identifier)
+                { return this->getIdentifier()->isChildOf(identifier.getIdentifier()); }
+            inline bool isParentOf(const SubclassIdentifier<class B> identifier)
+                { return this->getIdentifier()->isParentOf(identifier.getIdentifier()); }
+
+            inline bool isA(const OrxonoxClass* object)
+                { return this->getIdentifier()->isA(object->getIdentifier()); }
+            inline bool isDirectlyA(const OrxonoxClass* object)
+                { return this->getIdentifier()->isDirectlyA(object->getIdentifier()); }
+            inline bool isChildOf(const OrxonoxClass* object)
+                { return this->getIdentifier()->isChildOf(object->getIdentifier()); }
+            inline bool isParentOf(const OrxonoxClass* object)
+                { return this->getIdentifier()->isParentOf(object->getIdentifier()); }
+
+
+            inline void setName(const std::string& name) { this->name_ = name; }
+            inline const std::string& getName() const { return this->name_; }
+
+            inline void setActive(bool bActive) { this->bActive_ = bActive; }
+            inline const bool isActive() const { return this->bActive_; }
+
+            inline void setVisible(bool bVisible) { this->bVisible_ = bVisible; }
+            inline const bool isVisible() const { return this->bVisible_; }
+
         private:
             Identifier* identifier_;        //!< The Identifier of the object
             IdentifierList* parents_;       //!< List of all parents of the object
             MetaObjectList metaList_;       //!< MetaObjectList, containing all ObjectLists and ObjectListElements the object is registered in
+
+            std::string name_;
+            bool bActive_;
+            bool bVisible_;
     };
 }

code/branches/objecthierarchy/src/orxonox/objects/BaseObject.h

@@ -11 +11 @@
             BaseObject();
             virtual ~BaseObject();
-
-            inline bool isA(const Identifier* identifier)
-                { this->getIdentifier()->isA(identifier); }
-            inline bool isDirectlyA(const Identifier* identifier)
-                { this->getIdentifier()->isDirectlyA(identifier); }
-            inline bool isChildOf(const Identifier* identifier)
-                { this->getIdentifier()->isChildOf(identifier); }
-            inline bool isParentOf(const Identifier* identifier)
-                { this->getIdentifier()->isParentOf(identifier); }
-
-            inline bool isA(const SubclassIdentifier<class B>* identifier)
-                { this->getIdentifier()->isA(identifier->getIdentifier()); }
-            inline bool isDirectlyA(const SubclassIdentifier<class B>* identifier)
-                { this->getIdentifier()->isDirectlyA(identifier->getIdentifier()); }
-            inline bool isChildOf(const SubclassIdentifier<class B>* identifier)
-                { this->getIdentifier()->isChildOf(identifier->getIdentifier()); }
-            inline bool isParentOf(const SubclassIdentifier<class B>* identifier)
-                { this->getIdentifier()->isParentOf(identifier->getIdentifier()); }
-
-            inline bool isA(const SubclassIdentifier<class B> identifier)
-                { this->getIdentifier()->isA(identifier.getIdentifier()); }
-            inline bool isDirectlyA(const SubclassIdentifier<class B> identifier)
-                { this->getIdentifier()->isDirectlyA(identifier.getIdentifier()); }
-            inline bool isChildOf(const SubclassIdentifier<class B> identifier)
-                { this->getIdentifier()->isChildOf(identifier.getIdentifier()); }
-            inline bool isParentOf(const SubclassIdentifier<class B> identifier)
-                { this->getIdentifier()->isParentOf(identifier.getIdentifier()); }
-
-            inline bool isA(const OrxonoxClass* object)
-                { this->getIdentifier()->isA(object->getIdentifier()); }
-            inline bool isDirectlyA(const OrxonoxClass* object)
-                { this->getIdentifier()->isDirectlyA(object->getIdentifier()); }
-            inline bool isChildOf(const OrxonoxClass* object)
-                { this->getIdentifier()->isChildOf(object->getIdentifier()); }
-            inline bool isParentOf(const OrxonoxClass* object)
-                { this->getIdentifier()->isParentOf(object->getIdentifier()); }
-
-            std::string name_; // test
-
     };
 }

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";
-*/
+
       }