Changeset 1684 for code/branches/core3/src/core/BaseObject.h

Timestamp:

Aug 31, 2008, 4:32:31 AM (16 years ago)

Author:

landauf

Message:

• packed all super-function-related code into a bunch of macros and commented the code.
• added tick, XMLPort, changedActivity and changedVisibility as super-functions

File:

• code/branches/core3/src/core/BaseObject.h (modified) (4 diffs)

code/branches/core3/src/core/BaseObject.h

@@ -39 +39 @@
 #include "CorePrereqs.h"
 
+#include "Super.h"
+#include "OrxonoxClass.h"
 #include "util/XMLIncludes.h"
-#include "OrxonoxClass.h"
 
 namespace orxonox
@@ -65 +66 @@
 
             /** @brief Sets the state of the objects activity. @param bActive True = active */
-            inline void setActivity(bool bActive) { this->bActive_ = bActive; this->changedActivity(); }
+            inline void setActive(bool bActive) { this->bActive_ = bActive; this->changedActivity(); }
             /** @brief Returns the state of the objects activity. @return The state of the activity */
             inline bool isActive() const { return this->bActive_; }
@@ -72 +73 @@
 
             /** @brief Sets the state of the objects visibility. @param bVisible True = visible */
-            inline void setVisibility(bool bVisible) { this->bVisible_ = bVisible; this->changedVisibility(); }
+            inline void setVisible(bool bVisible) { this->bVisible_ = bVisible; this->changedVisibility(); }
             /** @brief Returns the state of the objects visibility. @return The state of the visibility */
             inline bool isVisible() const { return this->bVisible_; }
@@ -101 +102 @@
             Namespace* namespace_;
     };
+
+    SUPER_FUNCTION(1, BaseObject, XMLPort, false);
+    SUPER_FUNCTION(3, BaseObject, changedActivity, false);
+    SUPER_FUNCTION(4, BaseObject, changedVisibility, false);
 }