foundational changes; tying up some loose ends

[chaz/yoink] / src / MainLayer.hh

diff --git a/src/MainLayer.hh b/src/MainLayer.hh
index 97385830a326259ea64e5b6534530ff2579dd0ed..731adef4e2239018d91708afa184f334aed47831 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,7 +53,6 @@ class MainLayer : public Mf::Layer
 public:
 
        MainLayer();
-       ~MainLayer();
 
        static MainLayerP alloc()
        {
@@ -61,10 +61,9 @@ public:
 
        void pushed(Mf::Engine& engine);
 
-       void draw(Mf::Scalar alpha) const;
-       bool handleEvent(const Mf::Event& event);
-
-       void quit();
+       void update(Mf::Engine& engine, Mf::Scalar t, Mf::Scalar dt);
+       void draw(Mf::Engine& engine, Mf::Scalar alpha) const;
+       bool handleEvent(Mf::Engine& engine, const Mf::Event& event);
 
 private:
 
@@ -72,9 +71,9 @@ 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;
 };