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

diff --git a/src/Main.hh b/src/Main.hh
index 91a4b4c..a5ce293 100644
--- a/src/Main.hh
+++ b/src/Main.hh
@@ -23,25 +23,23 @@
 #include <boost/shared_ptr.hpp>
 
 #include <Moof/Dispatch.hh>
-#include <Moof/Layer.hh>
 #include <Moof/Math.hh>
+#include <Moof/View.hh>
 
 
+namespace Mf {
+class Settings;
+class View;
+}
+
 class Main;
 typedef boost::shared_ptr<Main> MainP;
 
-class Main : public Mf::Layer
+class Main : public Mf::View
 {
 public:
 
-	Main();
-
-	static MainP alloc()
-	{
-		return MainP(new Main);
-	}
-
-	void addedToCore();
+	Main(Mf::Settings& settings, Mf::Video& video);
 
 	void update(Mf::Scalar t, Mf::Scalar dt);
 	void draw(Mf::Scalar alpha) const;
@@ -59,9 +57,8 @@ private:
 	 * Set OpenGL to a state we can know and depend on.
 	 */
 	static void setupGL();
-	static void contextCreated();
 
-	Mf::Dispatch::Handler	mDispatchHandler;
+	Mf::Dispatch::Handle mNewContextDispatch;
 };