Changeset 11690 for code/branches/Presentation_HS17/src/libraries

Timestamp:

Dec 18, 2017, 12:40:00 PM (7 years ago)

Author:

patricwi

Message:

rolled back to functional without 2 branches

Location:

code/branches/Presentation_HS17

Files:

• . (modified) (1 prop)
• src/libraries/core/BaseObject.h (modified) (2 diffs)
• src/libraries/tools/Timer.cc (modified) (3 diffs)
• src/libraries/tools/Timer.h (modified) (2 diffs)

code/branches/Presentation_HS17/src/libraries/core/BaseObject.h

@@ -58 +58 @@
     class Gametype;
     class Level;
-    class ScriptableController;
 
     /// The BaseObject is the parent of all classes representing an instance in the game.
@@ -192 +191 @@
 
             static void loadAllEventStates(Element& xmlelement, XMLPort::Mode mode, BaseObject* object, Identifier* identifier);
-
 
         protected:

code/branches/Presentation_HS17/src/libraries/tools/Timer.cc

@@ -158 +158 @@
     }
 
-    Timer::Timer(float interval, bool bLoop, std::function<void ()> func, bool bKillAfterCall)
-    {
-        this->init();
-        RegisterObject(Timer);
-
-        this->setTimer(interval, bLoop, func, bKillAfterCall);
-    }
-
     /**
         @brief Initializes the Timer
@@ -201 +193 @@
         this->executor_ = executor;
         this->bActive_ = true;
-        this->isStdFunction_ = false;
 
         this->time_ = this->interval_;
         this->bKillAfterCall_ = bKillAfterCall;
 
-        if(executor != nullptr)
-            executor->getFunctor()->setSafeMode(true);
-    }
-
-    void Timer::setTimer(float interval, bool bLoop, std::function<void ()> func, bool bKillAfterCall)
-    {
-        // Without the cast, the call would be ambiguous, because nullptr is castable to
-        // both, ExecutorPtr and std::function.
-        this->setTimer(interval, bLoop, static_cast<ExecutorPtr>(nullptr), bKillAfterCall);
-        this->function_ = func;
-        this->isStdFunction_ = true;
+        executor->getFunctor()->setSafeMode(true);
     }
 
@@ -226 +207 @@
         bool temp = this->bKillAfterCall_; // to avoid errors with bKillAfterCall_=false and an exutors which destroy the timer
 
-        if(this->isStdFunction_)
-            this->function_();
-        else
-            (*this->executor_)();
+        (*this->executor_)();
 
         if (temp)

code/branches/Presentation_HS17/src/libraries/tools/Timer.h

@@ -108 +108 @@
 
             Timer(float interval, bool bLoop, const ExecutorPtr& executor, bool bKillAfterCall = false);
-            Timer(float interval, bool bLoop, std::function<void (void)> func, bool bKillAfterCall = false);
 
             void setTimer(float interval, bool bLoop, const ExecutorPtr& executor, bool bKillAfterCall = false);
-            void setTimer(float interval, bool bLoop, std::function<void (void)> func, bool bKillAfterCall = false);
 
             void run();
@@ -155 +153 @@
 
             ExecutorPtr executor_;  //!< The executor of the function that will be called when the time expires
-            std::function<void (void)> function_;
 
-            bool isStdFunction_;
             long long interval_;    //!< The time-interval in micro seconds
             bool bLoop_;            //!< If true, the executor gets called every @a interval seconds