cleaned up interpolator classes

[chaz/yoink] / src / GameLayer.cc

diff --git a/src/GameLayer.cc b/src/GameLayer.cc
index 46c32631aad077b362f9db36bebc7513bd179c10..6db27b16bb8b34011f9a6829c3ea81eca711d81f 100644 (file)
--- a/src/GameLayer.cc
+++ b/src/GameLayer.cc
@@ -26,7 +26,7 @@
 
 *******************************************************************************/
 
-#include <Moof/Engine.hh>
+#include <Moof/Core.hh>
 #include <Moof/Error.hh>
 #include <Moof/Log.hh>
 #include <Moof/Math.hh>
@@ -110,7 +110,7 @@ GameLayer::GameLayer() :
        mMusic.enqueue("NightFusionLoop");
 
        bool isMute = false;
-       Mf::Settings::getInstance().get("nomusic", isMute);
+       Mf::settings.get("nomusic", isMute);
        if (!isMute) mMusic.play();
 
        //mMusic.setPosition(Mf::Vector3(10.0, 5.0, 0.0));
@@ -124,8 +124,8 @@ GameLayer::GameLayer() :
        mState.heroine = Heroine::alloc();
        mState.heroine->animation.startSequence("FlyDiagonallyUp");
 
-       Mf::Scalar a[6] = {0.0, 1.5, -0.5, 3.0, -2.0, 1.0};
-       mState.interp.init(a, 5.0, Mf::Interpolator::OSCILLATE);
+       mState.interp.init(0.0, 1.0);
+       mState.interp.reset(4.0, Mf::Interp::OSCILLATE);
 
        setProjection();
 }
@@ -133,7 +133,7 @@ GameLayer::GameLayer() :
 
 void GameLayer::pushedOntoEngine()
 {
-       Mf::engine.push(mHud);
+       Mf::core.push(mHud);
 
        mRay.direction.set(1.0, 0.0);
 
@@ -259,12 +259,12 @@ bool GameLayer::handleEvent(const Mf::Event& event)
                case SDL_KEYUP:
                        if (event.key.keysym.sym == SDLK_ESCAPE)
                        {
-                               Mf::engine.pop(this);
+                               Mf::core.pop(this);
                                return true;
                        }
                        else if (event.key.keysym.sym == SDLK_h)
                        {
-                               Mf::engine.push(mHud);
+                               Mf::core.push(mHud);
                                return true;
                        }
                        return mState.heroine->handleEvent(event);
@@ -285,8 +285,8 @@ bool GameLayer::handleEvent(const Mf::Event& event)
 
 void GameLayer::setProjection()
 {
-       Mf::VideoP video = Mf::engine.getVideo();
-       setProjection(video->getWidth(), video->getHeight());
+       ASSERT(Mf::video && "no current video context from which to get dimensions");
+       setProjection(Mf::video->getWidth(), Mf::video->getHeight());
 }
 
 void GameLayer::setProjection(Mf::Scalar width, Mf::Scalar height)