preliminary physics, sound, hud

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

diff --git a/src/Moof/Engine.hh b/src/Moof/Engine.hh
index 112b87ea8dba3ea07f8d1cbefe5407003e045b4e..971d68fe1e28eb59e3536056dd19c4355ec0668c 100644 (file)
--- a/src/Moof/Engine.hh
+++ b/src/Moof/Engine.hh
@@ -29,6 +29,8 @@
 #ifndef _MOOF_ENGINE_HH_
 #define _MOOF_ENGINE_HH_
 
+#include <stdexcept>
+
 #include <boost/shared_ptr.hpp>
 
 #include <Moof/Dispatcher.hh>
@@ -46,12 +48,12 @@ class Video;
 class Engine : public Singleton<Engine>
 {
 public:
-       Engine(const std::string& name, int argc, char* argv[],
-                       const std::string& configFile);
+       Engine(int argc, char* argv[], const std::string& configFile,
+                       const std::string& name, const std::string& iconFile);
        virtual ~Engine();
 
        int run();
-       void stop();
+       void stop(int exitCode = 0);
 
        void setTimestep(Scalar ts);
        Scalar getTimestep();
@@ -66,9 +68,15 @@ public:
        virtual void draw(Scalar alpha);
        virtual void handleEvent(const Event& event);
 
+       struct Exception : std::runtime_error
+       {
+               explicit Exception(const std::string& what_arg) :
+                       std::runtime_error(what_arg) {}
+       };
+
 private:
-       class EngineImpl;
-       boost::shared_ptr<EngineImpl> impl_;
+       class Impl;
+       boost::shared_ptr<Impl> impl_;
 };