Changeset 2155 for code/branches/objecthierarchy

Timestamp:

Nov 8, 2008, 5:13:18 PM (16 years ago)

Author:

landauf

Message:

added mbool (bool with memory) to fix particlespawner-on-client problem. maybe further changes are needed if a similar problem affects other classes.

if the mbool changes from true to false and back to true within one server tick, the value stays true on the client, but a callback is called.
if you have to switch the state also on the client, a more advanced control logic is needed, but also possible with mbool (you could use 2 mbools, synchronize one and compare with the other).

Location:

code/branches/objecthierarchy/src

Files:

• core/BaseObject.cc (modified) (1 diff)
• core/BaseObject.h (modified) (3 diffs)
• orxonox/objects/worldentities/pawns/Spectator.cc (modified) (1 diff)
• util/Math.h (modified) (2 diffs)
• util/mbool.h (added)

code/branches/objecthierarchy/src/core/BaseObject.cc

@@ -41 +41 @@
 #include "Template.h"
 #include "util/String.h"
+#include "util/mbool.h"
 
 namespace orxonox

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

@@ -45 +45 @@
 #include "XMLIncludes.h"
 #include "Event.h"
+#include "util/mbool.h"
 
 namespace orxonox
@@ -73 +74 @@
             /** @brief Sets the state of the objects activity. @param bActive True = active */
             inline void setActive(bool bActive)
-            { 
-                bool bTemp = this->bActive_;
-                this->bActive_ = bActive;
-                if ( bTemp != bActive )
+            {
+                if (this->bActive_ != 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_; }
+            inline const mbool& isActive() const { return this->bActive_; }
             /** @brief This function gets called if the activity of the object changes. */
             virtual void changedActivity() {}
 
             /** @brief Sets the state of the objects visibility. @param bVisible True = visible */
-            inline void setVisible(bool bVisible) { this->bVisible_ = bVisible; this->changedVisibility(); }
+            inline void setVisible(bool bVisible)
+            {
+                if (this->bVisible_ != 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_; }
+            inline const mbool& isVisible() const { return this->bVisible_; }
             /** @brief This function gets called if the visibility of the object changes. */
             virtual void changedVisibility() {}
@@ -144 +153 @@
             std::string name_;                          //!< The name of the object
             std::string oldName_;                       //!< The old name of the object
-            bool bActive_;                              //!< True = the object is active
-            bool bVisible_;                             //!< True = the object is visible
+            mbool bActive_;                             //!< True = the object is active
+            mbool bVisible_;                            //!< True = the object is visible
 
         private:

code/branches/objecthierarchy/src/orxonox/objects/worldentities/pawns/Spectator.cc

@@ -203 +203 @@
                 {
                     if (this->getGametype()->isStartCountdownRunning())
-                        this->hudmode_ = 2 + 10*ceil(this->getGametype()->getStartCountdown());
+                        this->hudmode_ = 2 + 10*(int)ceil(this->getGametype()->getStartCountdown());
                     else
                         this->hudmode_ = 3;

code/branches/objecthierarchy/src/util/Math.h

@@ -39 +39 @@
 #include <ostream>
 #include <string>
+#include <cmath>
 #include <boost/static_assert.hpp>
 
@@ -145 +146 @@
     {
         return x*x*x;
-    }
-
-    /**
-        @brief Rounds the value down.
-    */
-    template <typename T>
-    inline int floor(T x)
-    {
-        return (int)(x);
-    }
-
-    /**
-        @brief Rounds the value up.
-    */
-    template <typename T>
-    inline int ceil(T x)
-    {
-        int temp = floor(x);
-        return (temp != x) ? (temp + 1) : temp;
     }