Changeset 1968 for code/branches/objecthierarchy/src/orxonox

Timestamp:

Oct 20, 2008, 1:47:41 AM (16 years ago)

Author:

landauf

Message:

added MovableEntity with network optimization for constant velocity and rotation

added new Timer feature to destroy a Timer right after it called the function

Location:

code/branches/objecthierarchy/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• objects/Backlight.h (modified) (1 diff)
• objects/infos/LevelInfo.cc (modified) (1 diff)
• objects/worldentities/MovableEntity.cc (added)
• objects/worldentities/MovableEntity.h (added)
• objects/worldentities/PositionableEntity.h (modified) (1 diff)
• overlays/hud/ChatOverlay.cc (modified) (1 diff)
• overlays/hud/ChatOverlay.h (modified) (1 diff)
• tools/Timer.cc (modified) (3 diffs)
• tools/Timer.h (modified) (7 diffs)

code/branches/objecthierarchy/src/orxonox/CMakeLists.txt

@@ -45 +45 @@
   objects/worldentities/WorldEntity.cc
   objects/worldentities/PositionableEntity.cc
+  objects/worldentities/MovableEntity.cc
 #  objects/Backlight.cc
   objects/Camera.cc

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

@@ -33 +33 @@
 
 #include "WorldEntity.h"
-#include "tools/Timer.h"
 #include "tools/BillboardSet.h"
 

code/branches/objecthierarchy/src/orxonox/objects/infos/LevelInfo.cc

@@ -89 +89 @@
     void LevelInfo::setGametype(const std::string& gametype)
     {
-        std::cout << "0: " << gametype << std::endl;
         Identifier* identifier = ClassByString(gametype);
         if (identifier)
         {
-            std::cout << "1: " << identifier->getName() << std::endl;
             this->gametype_ = gametype;
             this->gametypeIdentifier_ = identifier;

code/branches/objecthierarchy/src/orxonox/objects/worldentities/PositionableEntity.h

@@ -43 +43 @@
             void registerVariables();
 
+            using WorldEntity::setPosition;
+            using WorldEntity::translate;
+            using WorldEntity::setOrientation;
+            using WorldEntity::rotate;
+            using WorldEntity::lookAt;
+            using WorldEntity::setDirection;
+
             inline void setPosition(const Vector3& position)
                 { this->node_->setPosition(position); }

code/branches/objecthierarchy/src/orxonox/overlays/hud/ChatOverlay.cc

@@ -90 +90 @@
         COUT(0) << "Chat: " << text << std::endl;
 
-        Timer<ChatOverlay>* timer = new Timer<ChatOverlay>;
-        ExecutorMember<ChatOverlay>* executor = createExecutor(createFunctor(&ChatOverlay::dropMessage));
-        executor->setDefaultValues(timer);
-        timer->setTimer(this->displayTime_, false, this, executor);
+        new Timer<ChatOverlay>(this->displayTime_, false, this, createExecutor(createFunctor(&ChatOverlay::dropMessage)), true);
 
         this->updateOverlayText();
     }
 
-    void ChatOverlay::dropMessage(Timer<ChatOverlay>* timer)
+    void ChatOverlay::dropMessage()
     {
         this->messages_.pop_front();
         this->updateOverlayText();
-
-        delete timer;
     }
 

code/branches/objecthierarchy/src/orxonox/overlays/hud/ChatOverlay.h

@@ -54 +54 @@
         private:
             void updateOverlayText();
-            void dropMessage(Timer<ChatOverlay>* timer);
+            void dropMessage();
 
             float displayTime_;

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

@@ -92 +92 @@
         this->bLoop_ = false;
         this->bActive_ = false;
+        this->bKillAfterCall_ = false;
 
         this->time_ = 0;
@@ -112 +113 @@
     {
         (*this->executor_)();
+
+        if (this->bKillAfterCall_)
+            delete this;
     }
 
@@ -136 +140 @@
             {
                 // It's time to call the function
-                if (this->bLoop_)
+                if (this->bLoop_ && !this->bKillAfterCall_)
                 {
                     this->time_ += this->interval_; // Q: Why '+=' and not '='? A: Think about it. It's more accurate like that. Seriously.

code/branches/objecthierarchy/src/orxonox/tools/Timer.h

@@ -116 +116 @@
             TimerBase();
 
-            Executor* executor_; //!< The executor of the function that should be called when the time expires
-
-            long long interval_; //!< The time-interval in micro seconds
-            bool bLoop_;         //!< If true, the function gets called every 'interval' seconds
-            bool bActive_;       //!< If true, the Timer ticks and calls the function if the time's up
-
-            long long time_;     //!< Internal variable, counting the time till the next function-call
+            Executor* executor_;  //!< The executor of the function that should be called when the time expires
+
+            long long interval_;  //!< The time-interval in micro seconds
+            bool bLoop_;          //!< If true, the function gets called every 'interval' seconds
+            bool bActive_;        //!< If true, the Timer ticks and calls the function if the time's up
+            bool bKillAfterCall_; //!< If true the timer gets deleted after it called the function
+
+            long long time_;      //!< Internal variable, counting the time till the next function-call
     };
 
@@ -139 +140 @@
                 @param exeuctor A executor of the function to call
             */
-            Timer(float interval, bool bLoop, T* object, ExecutorMember<T>* exeuctor)
-            {
-                this->setTimer(interval, bLoop, object, exeuctor);
+            Timer(float interval, bool bLoop, T* object, ExecutorMember<T>* exeuctor, bool bKillAfterCall = false)
+            {
+                this->setTimer(interval, bLoop, object, exeuctor, bKillAfterCall);
             }
 
@@ -151 +152 @@
                 @param exeuctor A executor of the function to call
             */
-            void setTimer(float interval, bool bLoop, T* object, ExecutorMember<T>* executor)
+            void setTimer(float interval, bool bLoop, T* object, ExecutorMember<T>* executor, bool bKillAfterCall = false)
             {
                 this->deleteExecutor();
@@ -162 +163 @@
 
                 this->time_ = this->interval_;
+                this->bKillAfterCall_ = bKillAfterCall;
             }
     };
@@ -177 +179 @@
                 @param exeuctor A executor of the function to call
             */
-            StaticTimer(float interval, bool bLoop, ExecutorStatic* executor)
-            {
-                this->setTimer(interval, bLoop, executor);
+            StaticTimer(float interval, bool bLoop, ExecutorStatic* executor, bool bKillAfterCall = false)
+            {
+                this->setTimer(interval, bLoop, executor, bKillAfterCall);
             }
 
@@ -189 +191 @@
                 @param executor A executor of the function to call
             */
-            void setTimer(float interval, bool bLoop, ExecutorStatic* executor)
+            void setTimer(float interval, bool bLoop, ExecutorStatic* executor, bool bKillAfterCall = false)
             {
                 this->deleteExecutor();
@@ -199 +201 @@
 
                 this->time_ = this->interval_;
+                this->bKillAfterCall_ = bKillAfterCall;
             }
     };