new timer class

[chaz/yoink] / src / Moof / Engine.cc

diff --git a/src/Moof/Engine.cc b/src/Moof/Engine.cc
index 80a203e6989b368a86cb12c0790568fef0bc7b6c..e97c8b5d1b7edbae52a5b48ebc1072574e697ebe 100644 (file)
--- a/src/Moof/Engine.cc
+++ b/src/Moof/Engine.cc
@@ -54,9 +54,9 @@ public:
                interface(outer)
        {
 #if defined(_WIN32) || defined (_WIN64) || defined(__WIN32__)
                interface(outer)
        {
 #if defined(_WIN32) || defined (_WIN64) || defined(__WIN32__)

-               if (SDL_Init(SDL_INIT_EVERYTHING) != 0)
+               if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) != 0)

 #else
 #else

-               if (SDL_Init(SDL_INIT_EVERYTHING | SDL_INIT_EVENTTHREAD) != 0)
+               if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTTHREAD) != 0)

 #endif
                {
                        logError("sdl is complaining: %s", SDL_GetError());
 #endif
                {
                        logError("sdl is complaining: %s", SDL_GetError());


@@ -112,7 +112,7 @@ public:
 
        int run()
        {
 
        int run()
        {

-               Scalar ticksNow = getTicks();
+               Scalar ticksNow = Timer::getTicks();

 
                Scalar nextStep = ticksNow;
                Scalar nextDraw = ticksNow;
 
                Scalar nextStep = ticksNow;
                Scalar nextDraw = ticksNow;


@@ -128,13 +128,15 @@ public:
                running = true;
                do
                {
                running = true;
                do
                {

-                       Scalar newTicks = getTicks();
+                       Scalar newTicks = Timer::getTicks();

                        deltaTime = newTicks - ticksNow;
                        ticksNow = newTicks;
 
                        if (deltaTime >= 0.25) deltaTime = 0.25;
                        accumulator += deltaTime;
 
                        deltaTime = newTicks - ticksNow;
                        ticksNow = newTicks;
 
                        if (deltaTime >= 0.25) deltaTime = 0.25;
                        accumulator += deltaTime;
 

+                       Timer::fireIfExpired(ticksNow);
+

                        while (accumulator >= timestep)
                        {
                                dispatchEvents();
                        while (accumulator >= timestep)
                        {
                                dispatchEvents();


@@ -183,7 +185,8 @@ public:
                        }
 
                        // be a good citizen and give back what you don't need
                        }
 
                        // be a good citizen and give back what you don't need

-                       sleep(std::min(nextStep, nextDraw), true);
+                       Timer::sleep(std::min(std::min(nextStep, nextDraw),
+                                               Timer::getNextFire()), true);

                }
                while (running);
 
                }
                while (running);