X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FTitleLayer.cc;fp=src%2FTitleLayer.cc;h=b865be05eff68ec0230c3c42f2ef7a3e33829865;hb=e0c0a3b5e7337cde55e520801d2e59e03dc97d9c;hp=d31fe8702bff754e376a9cfd0cdc4d4ca2cd5a00;hpb=ed5fcf5f1357fc42749408f705e9ec55531ff006;p=chaz%2Fyoink

diff --git a/src/TitleLayer.cc b/src/TitleLayer.cc
index d31fe87..b865be0 100644
--- a/src/TitleLayer.cc
+++ b/src/TitleLayer.cc
@@ -9,52 +9,57 @@
 *
 **************************************************************************/
 
-#include <Moof/Core.hh>
 #include <Moof/OpenGL.hh>
-#include <Moof/Transition.hh>
 
 #include "GameLayer.hh"
 #include "TitleLayer.hh"
 
 
-void TitleLayer::addedToCore()
+void TitleLayer::didAddToView()
 {
 	mFadeIn.init(0.0, 1.0);
 	mFadeIn.reset(0.1);
 
-	mGameLayer = GameLayer::alloc();
+	//mGameLayer = GameLayer::alloc();
 }
 
 void TitleLayer::update(Mf::Scalar t, Mf::Scalar dt)
 {
 	mFadeIn.update(t, dt);
+	Mf::View::update(t, dt);
 }
 
 void TitleLayer::draw(Mf::Scalar alpha) const
 {
 	glClearColor(0.0, 0.0, mFadeIn.getState(alpha), 1.0);
 	glClear(GL_COLOR_BUFFER_BIT);
+	Mf::View::draw(alpha);
 }
 
 bool TitleLayer::handleEvent(const Mf::Event& event)
 {
+	if (Mf::View::handleEvent(event)) return true;
+
 	switch (event.type)
 	{
 		case SDL_KEYUP:
 			if (event.key.keysym.sym == SDLK_ESCAPE)
 			{
-				break;
+				parent().removeChild(this);
+				return true;
 			}
 
-			Mf::LayerP titleLayer = Mf::core.pop(this);
+			mGameLayer = GameLayer::alloc();
+			parent().addChild(mGameLayer);
+
+			parent().removeChild(this);
 
-			Mf::Lerp interp(0.1);
-			interp.init(0.0, 1.0);
+			//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::Transition<Mf::Lerp>::Ptr transition =
+				//Mf::Transition<Mf::Lerp>::alloc(mGameLayer, titleLayer,
+												//interp);
 
 			return true;
 	}