added timer facility

diff --git a/src/app/Application.cpp b/src/app/Application.cpp
index 29eaee781e9ba20780fafa2cc4bde331777d059a..fc1d3801d4ab6fe65f0ea8af622904e0eb01b194 100644 (file)
--- a/src/app/Application.cpp
+++ b/src/app/Application.cpp
@@ -120,8 +120,12 @@ void Application::Run() {
 void Application::Loop() {
        Uint32 now(SDL_GetTicks());
        Uint32 deltaT(now - last);
+       GlobalTimers().Update(deltaT);
        if (deltaT > 34) deltaT = 34;
 
+       if (CurrentState()) {
+               CurrentState()->GraphicsTimers().Update(deltaT);
+       }
        HandleEvents();
        if (!StateChangePending()) {
                UpdateWorld(deltaT);
@@ -161,6 +165,7 @@ void Application::HandleEvents() {
 void Application::UpdateWorld(Uint32 deltaT) {
        if (!CurrentState()) return;
        for (Uint32 i(0); i < deltaT; ++i) {
+               CurrentState()->PhysicsTimers().Update(0.001f);
                CurrentState()->UpdateWorld(0.001f);
        }
 }

diff --git a/src/app/Application.h b/src/app/Application.h
index 5e9e88838dfb05db9ae0dc4d11dc64dacd8b7275..cf1261b28f1a8c8799c3ce8aa2a5217af9ef3ab2 100644 (file)
--- a/src/app/Application.h
+++ b/src/app/Application.h
@@ -9,6 +9,7 @@
 #define APP_APPLICATION_H_
 
 #include "Input.h"
+#include "Timer.h"
 #include "../sdl/InitScreen.h"
 
 #include <stack>
@@ -40,6 +41,7 @@ public:
        void Quit();
        Input &Buttons() { return input; }
        const Input &Buttons() const { return input; }
+       Timers<Uint32> &GlobalTimers() { return globalTimers; }
 
 private:
        struct StateCommand {
@@ -67,6 +69,7 @@ private:
        sdl::InitScreen *screen;
        std::stack<State *> states;
        std::queue<StateCommand> stateChanges;
+       Timers<Uint32> globalTimers;
        Input input;
        Uint32 last;
 

diff --git a/src/app/State.h b/src/app/State.h
index 678f2b986d88d69d68366bb829aaebbef47c0124..b4c26d047cd7c88429e62d56a164be048fdcd7aa 100644 (file)
--- a/src/app/State.h
+++ b/src/app/State.h
@@ -8,6 +8,8 @@
 #ifndef APP_APPLICATIONSTATE_H_
 #define APP_APPLICATIONSTATE_H_
 
+#include "Timer.h"
+
 #include <SDL.h>
 
 namespace app {
@@ -40,6 +42,14 @@ public:
        virtual void UpdateWorld(float deltaT) = 0;
        virtual void Render(SDL_Surface *) = 0;
 
+public:
+       Timers<Uint32> &GraphicsTimers() { return graphicsTimers; }
+       Timers<float> &PhysicsTimers() { return physicsTimers; }
+
+private:
+       Timers<Uint32> graphicsTimers;
+       Timers<float> physicsTimers;
+
 };
 
 }

diff --git a/src/app/Timer.h b/src/app/Timer.h
new file mode 100644 (file)
index 0000000..465ed64
--- /dev/null
+++ b/src/app/Timer.h
@@ -0,0 +1,100 @@
+/*
+ * Timer.h
+ *
+ *  Created on: Aug 10, 2012
+ *      Author: holy
+ */
+
+#ifndef APP_TIMER_H_
+#define APP_TIMER_H_
+
+#include <algorithm>
+#include <list>
+
+namespace app {
+
+template<class Time>
+struct TimerData {
+
+       TimerData() : time(0), target(0), refCount(0) { }
+       TimerData(Time target) : time(0), target(target), refCount(0) { }
+
+       Time time;
+       Time target;
+       int refCount;
+
+};
+
+
+template<class Time>
+class Timer {
+
+public:
+       Timer() : data(0) { }
+       ~Timer() { if (data) --data->refCount; }
+       Timer(TimerData<Time> *data) : data(data) { ++data->refCount; }
+       Timer(const Timer<Time> &other)
+       : data(other.data) { if (data) ++(data->refCount); }
+       Timer<Time> &operator =(const Timer<Time> &other) {
+               Timer<Time> temp(other);
+               Swap(temp);
+               return *this;
+       }
+       void Swap(Timer<Time> &other) {
+               std::swap(data, other.data);
+       }
+
+public:
+       bool Running() const {
+               return data;
+       }
+       bool Finished() const {
+               return data ? data->time >= data->target : false;
+       }
+       Time Elapsed() const {
+               return data ? data->time : Time();
+       }
+       Time Remaining() const {
+               return data ? (data->target - data->time) : Time();
+       }
+
+private:
+       TimerData<Time> *data;
+
+};
+
+
+template<class Time>
+class Timers {
+
+public:
+       Timers() { }
+
+public:
+       void Update(Time delta) {
+               for (typename std::list<TimerData<Time> >::iterator i(data.begin()), end(data.end()); i != end;) {
+                       i->time += delta;
+                       if (i->refCount <= 0) {
+                               i = data.erase(i);
+                       } else {
+                               ++i;
+                       }
+               }
+       }
+       Timer<Time> StartTimer() {
+               data.push_back(TimerData<Time>());
+               return Timer<Time>(&data.back());
+       }
+       Timer<Time> StartCountdown(Time duration) {
+               data.push_back(TimerData<Time>(duration));
+               return Timer<Time>(&data.back());
+       }
+
+private:
+       std::list<TimerData<Time> > data;
+
+};
+
+}
+
+#endif /* APP_TIMER_H_ */