X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMoof%2FEngine.hh;h=aa751356f6a81b6ec1712cf1ee7bdf322384d749;hb=a5f0d391406a68275b41448fc3f49e8d8396c497;hp=112b87ea8dba3ea07f8d1cbefe5407003e045b4e;hpb=c2321281bf12a7efaedde930422c7ddbc92080d4;p=chaz%2Fyoink

diff --git a/src/Moof/Engine.hh b/src/Moof/Engine.hh
index 112b87e..aa75135 100644
--- a/src/Moof/Engine.hh
+++ b/src/Moof/Engine.hh
@@ -29,12 +29,13 @@
 #ifndef _MOOF_ENGINE_HH_
 #define _MOOF_ENGINE_HH_
 
+#include <stdexcept>
+
 #include <boost/shared_ptr.hpp>
 
 #include <Moof/Dispatcher.hh>
 #include <Moof/Event.hh>
 #include <Moof/Math.hh>
-#include <Moof/Singleton.hh>
 
 
 namespace Mf {
@@ -43,15 +44,19 @@ namespace Mf {
 // forward declaration
 class Video;
 
-class Engine : public Singleton<Engine>
+class Engine
 {
+protected:
+
+	Engine(int argc, char* argv[], const std::string& configFile,
+			const std::string& name, const std::string& iconFile);
+
 public:
-	Engine(const std::string& name, int argc, char* argv[],
-			const std::string& configFile);
+
 	virtual ~Engine();
 
 	int run();
-	void stop();
+	void stop(int exitCode = 0);
 
 	void setTimestep(Scalar ts);
 	Scalar getTimestep();
@@ -61,14 +66,22 @@ public:
 	Video& getVideo();
 	long getFrameRate();
 
-	// Override these if you want.
+	// override these if you want
 	virtual void update(Scalar t, Scalar dt);
 	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_;
+	Engine() {} // this class must be subclassed to be useful
+
+	class Impl;
+	boost::shared_ptr<Impl> impl_;
 };