Changeset 11562 for code/branches/ScriptableController_HS17/src/libraries/tools/Timer.h

Timestamp:

Nov 13, 2017, 5:25:09 PM (6 years ago)

Author:

kohlia

Message:

Figuring out when the different things are ready in orxonox

File:

• code/branches/ScriptableController_HS17/src/libraries/tools/Timer.h (modified) (2 diffs)

code/branches/ScriptableController_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();
@@ -153 +155 @@
 
             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