dispatcher alias methods

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

diff --git a/src/Moof/Engine.cc b/src/Moof/Engine.cc
index be8ca5fac61e184f0b54a0da244355e5b33e89a2..df6b35a8e92d2fece2439fe9a0499884d07f480c 100644 (file)
--- a/src/Moof/Engine.cc
+++ b/src/Moof/Engine.cc
@@ -32,8 +32,9 @@
 
 #include <SDL/SDL.h>
 #include "fastevents.h"
+#include <SDL/SDL_sound.h>
+#include <AL/alut.h>
 
-#include "Dispatcher.hh"
 #include "Engine.hh"
 #include "Random.hh"
 #include "Settings.hh"
@@ -44,35 +45,39 @@
 namespace Mf {
 
 
-class Engine::EngineImpl
+class Engine::Impl
 {
 public:
-       EngineImpl(int argc, char* argv[], const std::string& configFile,
+       Impl(int argc, char* argv[], const std::string& configFile,
                        const std::string& name, const std::string& iconFile,
                        Engine* outer) :
-               interface(outer),
-               settings(argc, argv)
+               interface(outer)
        {
                if (SDL_Init(SDL_INIT_EVERYTHING | SDL_INIT_EVENTTHREAD) != 0)
                {
-                       throw Exception(SDL_GetError());
+                       std::cerr << "sdl is complaining: " << SDL_GetError() << std::endl;
+                       throw Exception(Exception::SDL_ERROR);
                }
                if (FE_Init() != 0)
                {
-                       throw Exception(FE_GetError());
+                       std::cerr << "fast events error: " << FE_GetError() << std::endl;
+                       throw Exception(Exception::SDL_ERROR);
                }
+               if (Sound_Init() == 0)
+               {
+                       std::cerr << "sound initialization failed: " << Sound_GetError()
+                               << std::endl;
+                       throw Exception(Exception::SDL_ERROR);
+               }
+               alutInit(&argc, argv);
 
+               Settings& settings = Settings::getInstance();
+               settings.parseArgs(argc, argv);
                settings.loadFromFile(configFile);
 
                long randomSeed;
-               if (settings.get("engine.rngseed", randomSeed))
-               {
-                       setSeed(randomSeed);
-               }
-               else
-               {
-                       setSeed();
-               }
+               if (settings.get("engine.rngseed", randomSeed)) setSeed(randomSeed);
+               else setSeed();
 
                double ts = 0.01;
                settings.get("engine.timestep", ts);
@@ -85,15 +90,17 @@ public:
                printFps = false;
                settings.get("video.printfps", printFps);
 
-               video = VideoPtr(new Video(name, iconFile));
+               video = Video::alloc(name, iconFile);
                video->makeActive();
        }
 
-       ~EngineImpl()
+       ~Impl()
        {
                // the video object must be destroyed before we can shutdown SDL
                video.reset();
 
+               alutExit();
+               Sound_Quit();
                FE_Quit();
                SDL_Quit();
        }
@@ -103,7 +110,7 @@ public:
         * The main loop.  This just calls dispatchEvents(), update(), and draw()
         * over and over again.  The timing of the update and draw are decoupled.
         * The actual frame rate is also calculated here.  This function will return
-        * with a value of 0 if the member variable running becomes true.
+        * the exit code used to stop the loop.
         */
 
        int run()
@@ -141,6 +148,10 @@ public:
 
                                nextStep += timestep;
                        }
+                       if (ticksNow >= nextStep)
+                       {
+                               nextStep = ticksNow + timestep;
+                       }
 
                        if (ticksNow >= nextDraw)
                        {
@@ -179,7 +190,7 @@ public:
                }
                while (running);
 
-               return 0;
+               return exitCode;
        }
 
 
@@ -211,11 +222,10 @@ public:
 
        Engine*         interface;
 
-       Settings        settings;
-       Dispatcher      dispatcher;
-       VideoPtr        video;
+       VideoP          video;
 
        bool            running;
+       int                     exitCode;
 
        Scalar          timestep;
        Scalar          drawRate;
@@ -227,8 +237,7 @@ public:
 
 Engine::Engine(int argc, char* argv[], const std::string& configFile,
                const std::string& name, const std::string& iconFile) :
-       impl_(new Engine::EngineImpl(argc, argv, configFile, name, iconFile, this))
-{}
+       impl_(new Engine::Impl(argc, argv, configFile, name, iconFile, this)) {}
 
 Engine::~Engine() {}
 
@@ -238,9 +247,10 @@ int Engine::run()
        return impl_->run();
 }
 
-void Engine::stop()
+void Engine::stop(int exitCode)
 {
        impl_->running = false;
+       impl_->exitCode = exitCode;
 }