destroyed global classes; view hierarchy instead

[chaz/yoink] / src / Main.hh

diff --git a/src/Main.hh b/src/Main.hh
index 91a4b4c3d2701922db35fde2f1e01fa29d81e70e..a5ce29336493c95c0115152ef2b0119e3b7116ab 100644 (file)
--- 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;
 };