X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FTitleLayer.cc;h=6bc70f3b6d7d7a251dab5bf3eef26100ac51ed9a;hp=d31fe8702bff754e376a9cfd0cdc4d4ca2cd5a00;hb=831f04d4bc19a390415ac0bbac4331c7a65509bc;hpb=837bae9f2bf7b25e1d3d2625eeaf39c1d2f48827

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