X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FTitleLayer.cc;h=afe13e91771a5f3ac2e7b7edb3639e2a1a124d91;hp=ed8f4c1acd340d2ca952c32b90275f704d696f2a;hb=4f9eb9259092994de9690cf12f11437c35a6791e;hpb=a295f8def17036c8071b56e181364f99a377cae7

diff --git a/src/TitleLayer.cc b/src/TitleLayer.cc
index ed8f4c1..afe13e9 100644
--- 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,17 +34,17 @@
 #include "TitleLayer.hh"
 
 
-void TitleLayer::pushedOntoEngine()
+void TitleLayer::addedToCore()
 {
-	Mf::Scalar coeff[] = {0.0, 1.0};
-	mFadeIn.init(coeff, 0.1);
+	mFadeIn.init(0.0, 1.0);
+	mFadeIn.reset(0.1);
 
 	mGameLayer = GameLayer::alloc();
 }
 
 void TitleLayer::update(Mf::Scalar t, Mf::Scalar dt)
 {
-	if (!mFadeIn.isDone()) mFadeIn.update(t, dt);
+	mFadeIn.update(t, dt);
 }
 
 void TitleLayer::draw(Mf::Scalar alpha) const
@@ -58,21 +58,20 @@ bool TitleLayer::handleEvent(const Mf::Event& event)
 	switch (event.type)
 	{
 		case SDL_KEYUP:
-			//if (event.key.keysym.sym == SDLK_ESCAPE)
-			//{
-				//break;
-			//}
+			if (event.key.keysym.sym == SDLK_ESCAPE)
+			{
+				break;
+			}
 
-			Mf::LayerP titleLayer = Mf::engine.pop(this);
-			//engine.pushLayer(GameLayer::alloc());
+			Mf::LayerP titleLayer = Mf::core.pop(this);
 
-			Mf::Scalar coeff[] = {0.0, 0.75, 0.99, 1.0};
-			Mf::PolynomialInterpolator<3> interp(coeff, 0.1);
+			Mf::Lerp interp(0.1);
+			interp.init(0.0, 1.0);
+
+			Mf::Transition<Mf::Lerp>::Ptr transition =
+				Mf::Transition<Mf::Lerp>::alloc(mGameLayer, titleLayer, interp);
+			Mf::core.push(transition);
 
-			//Mf::LayerP mGameLayer = GameLayer::alloc();
-			Mf::Transition<Mf::PolynomialInterpolator<3> >::Ptr transition =
-				Mf::Transition<Mf::PolynomialInterpolator<3> >::alloc(mGameLayer, titleLayer, interp);
-			Mf::engine.push(transition);
 			return true;
 	}