X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FEngine.hh;h=e49f44db853cbf30ca59539a5ab6f04bac64a1be;hp=971d68fe1e28eb59e3536056dd19c4355ec0668c;hb=a4debfe4a5f5d339410788971b698ba00cb7f09c;hpb=bfa6212d09d8735d8fd5e2638188e4a99f21ada4

diff --git a/src/Moof/Engine.hh b/src/Moof/Engine.hh
index 971d68f..e49f44d 100644
--- a/src/Moof/Engine.hh
+++ b/src/Moof/Engine.hh
@@ -29,49 +29,53 @@
 #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/Exception.hh>
+#include <Moof/Layer.hh>
 #include <Moof/Math.hh>
-#include <Moof/Singleton.hh>
 
 
 namespace Mf {
 
 
-// forward declaration
+// forward declarations
 class Video;
 
-class Engine : public Singleton<Engine>
+struct Engine
 {
-public:
-	Engine(int argc, char* argv[], const std::string& configFile,
-			const std::string& name, const std::string& iconFile);
-	virtual ~Engine();
+	Engine(int argc, char* argv[], const std::string& name, 
+			const std::string& iconFile, const std::string& configFile);
+	~Engine() {}
+
+	// get global instance
+	static Engine& getInstance();
 
-	int run();
-	void stop(int exitCode = 0);
+	void run();
 
 	void setTimestep(Scalar ts);
-	Scalar getTimestep();
+	Scalar getTimestep() const;
 	void setMaxFrameRate(long maxFps);
-	long getMaxFrameRate();
+	long getMaxFrameRate() const;
 
-	Video& getVideo();
-	long getFrameRate();
+	Video& getVideo() const;
+	long getFrameRate() const;
 
-	// Override these if you want.
-	virtual void update(Scalar t, Scalar dt);
-	virtual void draw(Scalar alpha);
-	virtual void handleEvent(const Event& event);
+	void push(LayerP layer);
+	LayerP pop();
+	// pops a specific layer and all layers above it
+	LayerP pop(Layer* layer);
+	void clear();
 
-	struct Exception : std::runtime_error
+	struct Exception : public Mf::Exception
 	{
-		explicit Exception(const std::string& what_arg) :
-			std::runtime_error(what_arg) {}
+		explicit Exception(unsigned error) :
+			Mf::Exception(error) {}
+
+		void raise()
+		{
+			throw *this;
+		}
 	};
 
 private: