dispatch class not a singleton, engine is static

[chaz/yoink] / src / MainLayer.hh

diff --git a/src/MainLayer.hh b/src/MainLayer.hh
index 97385830a326259ea64e5b6534530ff2579dd0ed..4f0fc77d3b2d254905b301734fc7f22895d85d66 100644 (file)
--- a/src/MainLayer.hh
+++ b/src/MainLayer.hh
@@ -39,6 +39,7 @@
 
 #include <boost/shared_ptr.hpp>
 
+#include <Moof/Dispatch.hh>
 #include <Moof/Engine.hh>
 #include <Moof/Layer.hh>
 #include <Moof/Math.hh>
@@ -52,29 +53,27 @@ class MainLayer : public Mf::Layer
 public:
 
        MainLayer();
-       ~MainLayer();
 
        static MainLayerP alloc()
        {
                return MainLayerP(new MainLayer);
        }
 
-       void pushed(Mf::Engine& engine);
+       void pushedOntoEngine();
 
+       void update(Mf::Scalar t, Mf::Scalar dt);
        void draw(Mf::Scalar alpha) const;
        bool handleEvent(const Mf::Event& event);
 
-       void quit();
-
 private:
 
        /**
         * Set OpenGL to a state we can know and depend on.
         */
        void setupGL();
-       void contextRecreated(const Mf::Notification* note);
+       void contextRecreated();
 
-       Mf::Engine* mEngine;
+       Mf::Dispatch::Handler   mDispatchHandler;
 };