cleaned up interpolator classes

[chaz/yoink] / src / GameLayer.cc

diff --git a/src/GameLayer.cc b/src/GameLayer.cc
index 7a8e98cc32471455749b47cf933df38e816d541c..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>
 #include <Moof/Error.hh>
 #include <Moof/Log.hh>
 #include <Moof/Math.hh>


@@ -110,7 +110,7 @@ GameLayer::GameLayer() :
        mMusic.enqueue("NightFusionLoop");
 
        bool isMute = false;
        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));
        if (!isMute) mMusic.play();
 
        //mMusic.setPosition(Mf::Vector3(10.0, 5.0, 0.0));


@@ -122,10 +122,10 @@ GameLayer::GameLayer() :
                        0.1, Mf::Timer::REPEAT);
 
        mState.heroine = Heroine::alloc();
                        0.1, Mf::Timer::REPEAT);
 
        mState.heroine = Heroine::alloc();

-       mState.heroine->animation.startSequence("GreenDiamond");
+       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();
 }
 
        setProjection();
 }


@@ -133,7 +133,7 @@ GameLayer::GameLayer() :
 
 void GameLayer::pushedOntoEngine()
 {
 
 void GameLayer::pushedOntoEngine()
 {

-       Mf::engine.push(mHud);
+       Mf::core.push(mHud);

 
        mRay.direction.set(1.0, 0.0);
 
 
        mRay.direction.set(1.0, 0.0);
 


@@ -155,7 +155,7 @@ void GameLayer::update(Mf::Scalar t, Mf::Scalar dt)
        mState.scene->checkForCollision(*mState.heroine);
 
        mState.camera.setPosition(Mf::Vector3(-mState.heroine->getState().position[0],
        mState.scene->checkForCollision(*mState.heroine);
 
        mState.camera.setPosition(Mf::Vector3(-mState.heroine->getState().position[0],

-                               -mState.heroine->getState().position[1], -6));
+                               -mState.heroine->getState().position[1], -8));

        //mState.camera.lookAt(Mf::promote(mState.heroine->getState().position));
 
        mRay.point = mState.heroine->getState().position;
        //mState.camera.lookAt(Mf::promote(mState.heroine->getState().position));
 
        mRay.point = mState.heroine->getState().position;


@@ -193,9 +193,9 @@ void GameLayer::rayTimer()
        {
                hits.front().normal.normalize();
                mRay.solve(point, hits.front().distance);
        {
                hits.front().normal.normalize();
                mRay.solve(point, hits.front().distance);

-               Mf::logInfo << "scene: d = " << hits.front().distance << std::endl;
-               Mf::logInfo << "       P = " << point << std::endl;
-               Mf::logInfo << "       n = " << hits.front().normal << std::endl;
+               //Mf::logInfo << "scene: d = " << hits.front().distance << std::endl;
+               //Mf::logInfo << "       P = " << point << std::endl;
+               //Mf::logInfo << "       n = " << hits.front().normal << std::endl;

        }
 }
 
        }
 }
 


@@ -259,12 +259,12 @@ bool GameLayer::handleEvent(const Mf::Event& event)
                case SDL_KEYUP:
                        if (event.key.keysym.sym == SDLK_ESCAPE)
                        {
                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)
                        {
                                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);
                                return true;
                        }
                        return mState.heroine->handleEvent(event);


@@ -285,13 +285,13 @@ bool GameLayer::handleEvent(const Mf::Event& event)
 
 void GameLayer::setProjection()
 {
 
 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)
 {
 }
 
 void GameLayer::setProjection(Mf::Scalar width, Mf::Scalar height)
 {

-       mState.camera.setProjection(cml::rad(60.0), width / height, 1.0, 200.0);
+       mState.camera.setProjection(cml::rad(45.0), width / height, 1.0, 200.0);

 }
 
 
 }