the massive refactoring effort

[chaz/yoink] / src / TitleLayer.cc

diff --git a/src/TitleLayer.cc b/src/TitleLayer.cc
index 9e33c361f532b0345fc52910375e0be3dfbde477..6bc70f3b6d7d7a251dab5bf3eef26100ac51ed9a 100644 (file)
--- a/src/TitleLayer.cc
+++ b/src/TitleLayer.cc
@@ -9,36 +9,35 @@
 *
 **************************************************************************/
 
-#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.1);
 
        //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)
        {
@@ -50,15 +49,15 @@ bool TitleLayer::handleEvent(const Mf::Event& event)
                        }
 
                        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;