X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMain.hh;h=aa4a0d9c028409bf75c3210f5b897f22cdf1a311;hp=91a4b4c3d2701922db35fde2f1e01fa29d81e70e;hb=831f04d4bc19a390415ac0bbac4331c7a65509bc;hpb=837bae9f2bf7b25e1d3d2625eeaf39c1d2f48827

diff --git a/src/Main.hh b/src/Main.hh
index 91a4b4c..aa4a0d9 100644
--- a/src/Main.hh
+++ b/src/Main.hh
@@ -22,30 +22,30 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <Moof/Dispatch.hh>
-#include <Moof/Layer.hh>
-#include <Moof/Math.hh>
+#include <moof/dispatcher.hh>
+#include <moof/math.hh>
+#include <moof/view.hh>
+
+
+namespace moof
+{
+	class settings;
+	class view;
+}
 
 
 class Main;
 typedef boost::shared_ptr<Main> MainP;
 
-class Main : public Mf::Layer
+class Main : public moof::view
 {
 public:
 
-	Main();
-
-	static MainP alloc()
-	{
-		return MainP(new Main);
-	}
-
-	void addedToCore();
+	Main(moof::settings& settings, moof::video& video);
 
-	void update(Mf::Scalar t, Mf::Scalar dt);
-	void draw(Mf::Scalar alpha) const;
-	bool handleEvent(const Mf::Event& event);
+	void update(moof::scalar t, moof::scalar dt);
+	void draw(moof::scalar alpha) const;
+	bool handle_event(const moof::event& event);
 
 	static std::string getSearchPath();
 	static std::string getConfigPath();
@@ -59,9 +59,8 @@ private:
 	 * Set OpenGL to a state we can know and depend on.
 	 */
 	static void setupGL();
-	static void contextCreated();
 
-	Mf::Dispatch::Handler	mDispatchHandler;
+	moof::dispatcher::handle mNewContextDispatch;
 };