cade lab fixes

[chaz/yoink] / src / Moof / Layer.hh

diff --git a/src/Moof/Layer.hh b/src/Moof/Layer.hh
index 8ec678d6b26fa0decfbbaac39f0ad5e83eef709a..31607fba32a5459767e405227db074eb052c3110 100644 (file)
--- a/src/Moof/Layer.hh
+++ b/src/Moof/Layer.hh
@@ -31,7 +31,6 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <Moof/Drawable.hh>
 #include <Moof/Event.hh>
 #include <Moof/Math.hh>
 
@@ -39,20 +38,21 @@
 namespace Mf {
 
 
-// forward declaration
-class Engine;
-
-
-struct Layer : public Drawable
+class Layer
 {
+public:
+
        virtual ~Layer() {}
 
-       virtual void pushed(Engine& engine) {}
-       virtual void popped(Engine& engine) {}
+       virtual void addedToCore() {}
+       virtual void removedFromCore() {}
 
        virtual void update(Scalar t, Scalar dt) {}
        virtual void draw(Scalar alpha) const {}
-       virtual bool handleEvent(const Event& event) { return false; }
+       virtual bool handleEvent(const Event& event)
+       {
+               return false;
+       }
 };
 
 typedef boost::shared_ptr<Layer> LayerP;