Changeset 1629 for code/branches/input/src/orxonox/tools/Timer.h

Timestamp:

Jun 27, 2008, 8:07:29 AM (16 years ago)

Author:

rgrieder

Message:

updated input branch

File:

• code/branches/input/src/orxonox/tools/Timer.h (modified) (4 diffs)

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

@@ -78 +78 @@
 
             void run() const;
+            void deleteExecutor();
 
             /** @brief Starts the Timer: Function-call after 'interval' seconds. */
@@ -94 +95 @@
             inline bool isActive() const
                 { return this->bActive_; }
+            /** @brief Returns the remaining time until the Timer calls the function. @return The remaining time */
+            inline float getRemainingTime() const
+                { return this->time_; }
             /** @brief Gives the Timer some extra time. @param time The amount of extra time in seconds */
             inline void addTime(float time)
@@ -149 +153 @@
             void setTimer(float interval, bool bLoop, T* object, ExecutorMember<T>* executor)
             {
+                this->deleteExecutor();
+
                 this->interval_ = interval;
                 this->bLoop_ = bLoop;
@@ -185 +191 @@
             void setTimer(float interval, bool bLoop, ExecutorStatic* executor)
             {
+                this->deleteExecutor();
+
                 this->interval_ = interval;
                 this->bLoop_ = bLoop;