Changeset 366 for code/branches/objecthierarchy/src/orxonox/core

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/core

Files:

• OrxonoxClass.cc (modified) (1 diff)
• OrxonoxClass.h (modified) (1 diff)

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_;
     };
 }