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

diff --git a/src/TitleLayer.cc b/src/TitleLayer.cc
index b865be0..7a206c0 100644
--- a/src/TitleLayer.cc
+++ b/src/TitleLayer.cc
@@ -9,56 +9,55 @@
 *
 **************************************************************************/
 
-#include <Moof/OpenGL.hh>
+#include <moof/opengl.hh>
 
 #include "GameLayer.hh"
 #include "TitleLayer.hh"
 
 
-void TitleLayer::didAddToView()
+void TitleLayer::did_add_to_view()
 {
-	mFadeIn.init(0.0, 1.0);
-	mFadeIn.reset(0.1);
+	mFadeIn.init(0.0, 1.0, 0.15);
 
 	//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);
-	Mf::View::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);
-	Mf::View::draw(alpha);
+	moof::view::draw(alpha);
 }
 
-bool TitleLayer::handleEvent(const Mf::Event& event)
+bool TitleLayer::handle_event(const moof::event& event)
 {
-	if (Mf::View::handleEvent(event)) return true;
+	if (moof::view::handle_event(event)) return true;
 
 	switch (event.type)
 	{
 		case SDL_KEYUP:
 			if (event.key.keysym.sym == SDLK_ESCAPE)
 			{
-				parent().removeChild(this);
+				parent().stop();
 				return true;
 			}
 
 			mGameLayer = GameLayer::alloc();
-			parent().addChild(mGameLayer);
+			parent().add_child(mGameLayer);
 
-			parent().removeChild(this);
+			parent().remove_child(this);
 
-			//Mf::Lerp interp(0.1);
+			//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,
+			//moof::Transition<moof::lerp_scalar>::Ptr transition =
+				//moof::Transition<moof::lerp_scalar>::alloc(mGameLayer, titleLayer,
 												//interp);
 
 			return true;