From 8b00d67febf133e89f6a0bfabc41feed555dc4a9 Mon Sep 17 00:00:00 2001 From: chai Date: Sat, 12 Jan 2019 21:48:33 +0800 Subject: =?UTF-8?q?*=E5=8E=BB=E6=8E=89=E6=96=87=E4=BB=B6=E5=89=8D=E7=BC=80?= =?UTF-8?q?je=5F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libjin/time/je_timer.cpp | 124 --------------------------------- src/libjin/time/je_timer.h | 158 ------------------------------------------- src/libjin/time/timer.cpp | 124 +++++++++++++++++++++++++++++++++ src/libjin/time/timer.h | 158 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 282 insertions(+), 282 deletions(-) delete mode 100644 src/libjin/time/je_timer.cpp delete mode 100644 src/libjin/time/je_timer.h create mode 100644 src/libjin/time/timer.cpp create mode 100644 src/libjin/time/timer.h (limited to 'src/libjin/time') diff --git a/src/libjin/time/je_timer.cpp b/src/libjin/time/je_timer.cpp deleted file mode 100644 index ef5a040..0000000 --- a/src/libjin/time/je_timer.cpp +++ /dev/null @@ -1,124 +0,0 @@ -#include "../core/je_configuration.h" -#if defined(jin_time) - -#include "je_timer.h" - -namespace JinEngine -{ - namespace Time - { - - - Timer::Timer() - : mHandlers() - { - } - - Timer::~Timer() - { - for (int i = 0; i < mHandlers.size(); ++i) - delete mHandlers[i]; - } - - void Timer::update(float dt) - { - // Process handler. - std::vector::iterator it = mHandlers.begin(); - for (; it != mHandlers.end(); ++it) - (*it)->process(dt); - // Erase canceled handler. - for (it = mHandlers.begin(); it != mHandlers.end();) - { - if ((*it)->canceled) - { - Handler* h = *it; - it = mHandlers.erase(it); - delete h; - } - else - ++it; - } - } - - void Timer::cancel(Handler* handler) - { - if(handler != nullptr) - handler->canceled = true; - } - - void Timer::cancelAll() - { - for (auto h : mHandlers) - cancel(h); - } - - Timer::Handler* Timer::every(float dt, TimerCallback callback, void* p, FinishCallback finish) - { - Handler* t = new Handler(Handler::EVERY, dt, 0, callback, p, finish); - mHandlers.push_back(t); - return t; - } - - Timer::Handler* Timer::after(float dt, TimerCallback callback, void* p, FinishCallback finish) - { - Handler* t = new Handler(Handler::AFTER, dt, 0, callback, p, finish); - mHandlers.push_back(t); - return t; - } - - Timer::Handler* Timer::repeat(float dt, int count, TimerCallback callback, void* p, FinishCallback finish) - { - Handler* t = new Handler(Handler::REPEAT, dt, count, callback, p, finish); - mHandlers.push_back(t); - return t; - } - - Timer::Handler::Handler(Type t, float d, int c, TimerCallback f, void* p, FinishCallback finishcallback) - : type(t) - , duration(d) - , count(c) - , tickdown(d) - , countdown(c) - , callback(f) - , paramters(p) - , canceled(false) - , finishCallback(finishcallback) - { - } - - Timer::Handler::~Handler() - { - if (finishCallback != nullptr) - finishCallback(paramters); - } - - void Timer::Handler::process(float dt) - { - tickdown -= dt; - if (tickdown <= 0) - { - tickdown += duration; - if (!canceled && callback != nullptr) - callback(paramters); - if (type == EVERY) - { - } - else if (type == AFTER) - { - canceled = true; - } - else if (type == REPEAT) - { - --countdown; - if (countdown <= 0) - canceled = true; - } - } - } - - float deltaTime = 0; - - } // namespace Time -} // namespace JinEngine - -#endif // defined(jin_time) \ No newline at end of file diff --git a/src/libjin/time/je_timer.h b/src/libjin/time/je_timer.h deleted file mode 100644 index 95c1925..0000000 --- a/src/libjin/time/je_timer.h +++ /dev/null @@ -1,158 +0,0 @@ -#ifndef __JE_TIMER_H__ -#define __JE_TIMER_H__ -#include "../core/je_configuration.h" -#if defined(jin_time) - -#include -#include - -#include "SDL2/SDL.h" - -#include "../common/je_object.h" - -namespace JinEngine -{ - namespace Time - { - - /// - /// - /// - class Timer : public Object - { - public: - - typedef std::function TimerCallback; - - typedef std::function FinishCallback; - - /// - /// - /// - class Handler : public Object - { - public: - friend class Timer; - enum Type - { - EVERY, - AFTER, - REPEAT, - }; - Handler(Type type, float duration, int count = 0, TimerCallback callback = nullptr, void* paramters = nullptr, FinishCallback finishcallback = nullptr); - virtual ~Handler(); - void process(float dt); - - protected: - int count; - int countdown; - float duration; - float tickdown; - Type type; - TimerCallback callback; - FinishCallback finishCallback; - void* paramters; - bool canceled; - }; - - /// - /// - /// - Timer(); - - /// - /// - /// - ~Timer(); - - /// - /// - /// - void update(float dt); - - /// - /// - /// - Handler* every(float dt, TimerCallback callback, void* paramters = nullptr, FinishCallback finish = nullptr); - - /// - /// - /// - Handler* after(float dt, TimerCallback callback, void* paramters, FinishCallback finish); - - /// - /// - /// - Handler* repeat(float dt, int count, TimerCallback callback, void* paramters, FinishCallback finish); - - /// - /// - /// - void cancel(Handler* handler); - - /// - /// - /// - void cancelAll(); - - private: - - std::vector mHandlers; - - }; - - /// - /// - /// - inline void sleep(int ms) - { - #if jin_time == jin_time_sdl - SDL_Delay(ms); - #endif - } - - /// - /// - /// - inline double getSecond() - { - #if jin_time == jin_time_sdl - return SDL_GetTicks() / 1000.f; - #endif - } - - /// - /// - /// - inline double getMilliSecond() - { - #if jin_time == jin_time_sdl - return SDL_GetTicks(); - #endif - } - - /// - /// Delta time between frames. - /// - extern float deltaTime; - - inline void step() - { - static float previous = 0; - static float current = getSecond(); - previous = current; - current = getSecond(); - deltaTime = current - previous; - } - - inline float getDeltaTime() - { - return deltaTime; - } - - } // namespace Time -} // namespace JinEngine - -#endif // defined(jin_time) - -#endif // __JE_TIMER_H__ \ No newline at end of file diff --git a/src/libjin/time/timer.cpp b/src/libjin/time/timer.cpp new file mode 100644 index 0000000..32b2f57 --- /dev/null +++ b/src/libjin/time/timer.cpp @@ -0,0 +1,124 @@ +#include "../core/configuration.h" +#if defined(jin_time) + +#include "timer.h" + +namespace JinEngine +{ + namespace Time + { + + + Timer::Timer() + : mHandlers() + { + } + + Timer::~Timer() + { + for (int i = 0; i < mHandlers.size(); ++i) + delete mHandlers[i]; + } + + void Timer::update(float dt) + { + // Process handler. + std::vector::iterator it = mHandlers.begin(); + for (; it != mHandlers.end(); ++it) + (*it)->process(dt); + // Erase canceled handler. + for (it = mHandlers.begin(); it != mHandlers.end();) + { + if ((*it)->canceled) + { + Handler* h = *it; + it = mHandlers.erase(it); + delete h; + } + else + ++it; + } + } + + void Timer::cancel(Handler* handler) + { + if(handler != nullptr) + handler->canceled = true; + } + + void Timer::cancelAll() + { + for (auto h : mHandlers) + cancel(h); + } + + Timer::Handler* Timer::every(float dt, TimerCallback callback, void* p, FinishCallback finish) + { + Handler* t = new Handler(Handler::EVERY, dt, 0, callback, p, finish); + mHandlers.push_back(t); + return t; + } + + Timer::Handler* Timer::after(float dt, TimerCallback callback, void* p, FinishCallback finish) + { + Handler* t = new Handler(Handler::AFTER, dt, 0, callback, p, finish); + mHandlers.push_back(t); + return t; + } + + Timer::Handler* Timer::repeat(float dt, int count, TimerCallback callback, void* p, FinishCallback finish) + { + Handler* t = new Handler(Handler::REPEAT, dt, count, callback, p, finish); + mHandlers.push_back(t); + return t; + } + + Timer::Handler::Handler(Type t, float d, int c, TimerCallback f, void* p, FinishCallback finishcallback) + : type(t) + , duration(d) + , count(c) + , tickdown(d) + , countdown(c) + , callback(f) + , paramters(p) + , canceled(false) + , finishCallback(finishcallback) + { + } + + Timer::Handler::~Handler() + { + if (finishCallback != nullptr) + finishCallback(paramters); + } + + void Timer::Handler::process(float dt) + { + tickdown -= dt; + if (tickdown <= 0) + { + tickdown += duration; + if (!canceled && callback != nullptr) + callback(paramters); + if (type == EVERY) + { + } + else if (type == AFTER) + { + canceled = true; + } + else if (type == REPEAT) + { + --countdown; + if (countdown <= 0) + canceled = true; + } + } + } + + float deltaTime = 0; + + } // namespace Time +} // namespace JinEngine + +#endif // defined(jin_time) \ No newline at end of file diff --git a/src/libjin/time/timer.h b/src/libjin/time/timer.h new file mode 100644 index 0000000..48e51ba --- /dev/null +++ b/src/libjin/time/timer.h @@ -0,0 +1,158 @@ +#ifndef __JE_TIMER_H__ +#define __JE_TIMER_H__ +#include "../core/configuration.h" +#if defined(jin_time) + +#include +#include + +#include "SDL2/SDL.h" + +#include "../common/object.h" + +namespace JinEngine +{ + namespace Time + { + + /// + /// + /// + class Timer : public Object + { + public: + + typedef std::function TimerCallback; + + typedef std::function FinishCallback; + + /// + /// + /// + class Handler : public Object + { + public: + friend class Timer; + enum Type + { + EVERY, + AFTER, + REPEAT, + }; + Handler(Type type, float duration, int count = 0, TimerCallback callback = nullptr, void* paramters = nullptr, FinishCallback finishcallback = nullptr); + virtual ~Handler(); + void process(float dt); + + protected: + int count; + int countdown; + float duration; + float tickdown; + Type type; + TimerCallback callback; + FinishCallback finishCallback; + void* paramters; + bool canceled; + }; + + /// + /// + /// + Timer(); + + /// + /// + /// + ~Timer(); + + /// + /// + /// + void update(float dt); + + /// + /// + /// + Handler* every(float dt, TimerCallback callback, void* paramters = nullptr, FinishCallback finish = nullptr); + + /// + /// + /// + Handler* after(float dt, TimerCallback callback, void* paramters, FinishCallback finish); + + /// + /// + /// + Handler* repeat(float dt, int count, TimerCallback callback, void* paramters, FinishCallback finish); + + /// + /// + /// + void cancel(Handler* handler); + + /// + /// + /// + void cancelAll(); + + private: + + std::vector mHandlers; + + }; + + /// + /// + /// + inline void sleep(int ms) + { + #if jin_time == jin_time_sdl + SDL_Delay(ms); + #endif + } + + /// + /// + /// + inline double getSecond() + { + #if jin_time == jin_time_sdl + return SDL_GetTicks() / 1000.f; + #endif + } + + /// + /// + /// + inline double getMilliSecond() + { + #if jin_time == jin_time_sdl + return SDL_GetTicks(); + #endif + } + + /// + /// Delta time between frames. + /// + extern float deltaTime; + + inline void step() + { + static float previous = 0; + static float current = getSecond(); + previous = current; + current = getSecond(); + deltaTime = current - previous; + } + + inline float getDeltaTime() + { + return deltaTime; + } + + } // namespace Time +} // namespace JinEngine + +#endif // defined(jin_time) + +#endif // __JE_TIMER_H__ \ No newline at end of file -- cgit v1.1-26-g67d0