*
**************************************************************************/
-#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.15);
- 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(mFadeIn.state(alpha), 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;
}