cleaned up interpolator classes

[chaz/yoink] / src / TitleLayer.cc

diff --git a/src/TitleLayer.cc b/src/TitleLayer.cc
index a12168a9639eeeaf047b28b0317883e1906c184b..afe13e91771a5f3ac2e7b7edb3639e2a1a124d91 100644 (file)
--- a/src/TitleLayer.cc
+++ b/src/TitleLayer.cc
@@ -26,7 +26,7 @@
 
 *******************************************************************************/
 
-#include <Moof/Engine.hh>
+#include <Moof/Core.hh>
 #include <Moof/OpenGL.hh>
 #include <Moof/Transition.hh>
 
@@ -34,24 +34,22 @@
 #include "TitleLayer.hh"
 
 
-void TitleLayer::pushed(Mf::Engine& e)
+void TitleLayer::addedToCore()
 {
-       engine = &e;
+       mFadeIn.init(0.0, 1.0);
+       mFadeIn.reset(0.1);
 
-       Mf::Scalar coeff[] = {0.0, 1.0};
-       fadeIn.init(coeff, 0.1);
-
-       gameLayer = GameLayer::alloc();
+       mGameLayer = GameLayer::alloc();
 }
 
 void TitleLayer::update(Mf::Scalar t, Mf::Scalar dt)
 {
-       if (!fadeIn.isDone()) fadeIn.update(t, dt);
+       mFadeIn.update(t, dt);
 }
 
 void TitleLayer::draw(Mf::Scalar alpha) const
 {
-       glClearColor(0.0, 0.0, fadeIn.getState(alpha), 1.0);
+       glClearColor(0.0, 0.0, mFadeIn.getState(alpha), 1.0);
        glClear(GL_COLOR_BUFFER_BIT);
 }
 
@@ -60,16 +58,20 @@ bool TitleLayer::handleEvent(const Mf::Event& event)
        switch (event.type)
        {
                case SDL_KEYUP:
-                       Mf::LayerP titleLayer = engine->pop(this);
-                       //engine->pushLayer(GameLayer::alloc());
+                       if (event.key.keysym.sym == SDLK_ESCAPE)
+                       {
+                               break;
+                       }
+
+                       Mf::LayerP titleLayer = Mf::core.pop(this);
 
-                       Mf::Scalar coeff[] = {0.0, 1.0};
-                       Mf::Lerp interp(coeff, 0.2);
+                       Mf::Lerp interp(0.1);
+                       interp.init(0.0, 1.0);
 
-                       //Mf::LayerP gameLayer = GameLayer::alloc();
                        Mf::Transition<Mf::Lerp>::Ptr transition =
-                               Mf::Transition<Mf::Lerp>::alloc(gameLayer, titleLayer, interp);
-                       engine->push(transition);
+                               Mf::Transition<Mf::Lerp>::alloc(mGameLayer, titleLayer, interp);
+                       Mf::core.push(transition);
+
                        return true;
        }