rename myaction to callback
This commit is contained in:
+2
-2
@@ -9,14 +9,14 @@ using namespace std;
|
|||||||
|
|
||||||
Timer::Timer(size_t triggeramount, function<bool()> myaction, milliseconds triggerinterval)
|
Timer::Timer(size_t triggeramount, function<bool()> myaction, milliseconds triggerinterval)
|
||||||
:triggeramount(triggeramount)
|
:triggeramount(triggeramount)
|
||||||
, timeraction(myaction)
|
, callback(myaction)
|
||||||
, triggerinterval(triggerinterval) {}
|
, triggerinterval(triggerinterval) {}
|
||||||
|
|
||||||
void Timer::add_time(milliseconds deltatime) {
|
void Timer::add_time(milliseconds deltatime) {
|
||||||
accumulator += deltatime;
|
accumulator += deltatime;
|
||||||
if (accumulator >= triggerinterval) {
|
if (accumulator >= triggerinterval) {
|
||||||
accumulator -= triggerinterval;
|
accumulator -= triggerinterval;
|
||||||
timeraction();
|
callback();
|
||||||
triggercount++;
|
triggercount++;
|
||||||
if (!isinfinite && triggercount >= triggeramount){
|
if (!isinfinite && triggercount >= triggeramount){
|
||||||
isexpired=true;
|
isexpired=true;
|
||||||
|
|||||||
+3
-2
@@ -11,13 +11,14 @@
|
|||||||
class Timer {
|
class Timer {
|
||||||
public:
|
public:
|
||||||
size_t triggeramount;
|
size_t triggeramount;
|
||||||
|
|
||||||
bool isexpired = false;
|
bool isexpired = false;
|
||||||
bool isinfinite = false;
|
bool isinfinite = false;
|
||||||
size_t triggercount = 0;
|
size_t triggercount = 0;
|
||||||
std::function<bool()> timeraction;
|
|
||||||
|
std::function<bool()> callback;
|
||||||
|
|
||||||
Timer(size_t triggeramount, std::function<bool()> myaction, std::chrono::milliseconds triggerinterval);
|
Timer(size_t triggeramount, std::function<bool()> myaction, std::chrono::milliseconds triggerinterval);
|
||||||
|
|
||||||
void add_time(std::chrono::milliseconds deltatime);
|
void add_time(std::chrono::milliseconds deltatime);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|||||||
Reference in New Issue
Block a user