cleaned up interpolator classes

[chaz/yoink] / src / GameLayer.cc

diff --git a/src/GameLayer.cc b/src/GameLayer.cc
index 0ed249c8af964ffffd1bd009c21592350459280e..6db27b16bb8b34011f9a6829c3ea81eca711d81f 100644 (file)
--- a/src/GameLayer.cc
+++ b/src/GameLayer.cc
@@ -26,8 +26,8 @@
 
 *******************************************************************************/
 
-#include <Moof/Engine.hh>
-#include <Moof/Exception.hh>
+#include <Moof/Core.hh>
+#include <Moof/Error.hh>
 #include <Moof/Log.hh>
 #include <Moof/Math.hh>
 #include <Moof/OpenGL.hh>
@@ -35,7 +35,6 @@
 #include <Moof/Video.hh>
 
 #include "GameLayer.hh"
-#include "Hud.hh"
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -50,7 +49,7 @@ void GameLayer::loadSceneLoader()
        std::string loaderPath = Scene::getPath("loader");
        if (loaderPath == "")
        {
-               throw Mf::Exception(Mf::ErrorCode::RESOURCE_NOT_FOUND, "loader");
+               throw Mf::Error(Mf::Error::RESOURCE_NOT_FOUND, "loader");
        }
 
        Mf::Script::Result status = mState.script.doFile(loaderPath);
@@ -59,14 +58,14 @@ void GameLayer::loadSceneLoader()
                std::string str;
                mState.script[-1].get(str);
 
-               throw Mf::Exception(Mf::ErrorCode::SCRIPT_ERROR, str);
+               throw Mf::Error(Mf::Error::SCRIPT_ERROR, str);
        }
 
        mState.script.getGlobalTable().pushField("scenes");
        mState.script.getTop().get(mState.sceneList);
        if (mState.sceneList.size() == 0)
        {
-               throw Mf::Exception(Mf::ErrorCode::SCRIPT_ERROR,
+               throw Mf::Error(Mf::Error::SCRIPT_ERROR,
                                "no variable `scenes' within loader");
        }
 }
@@ -84,7 +83,7 @@ void GameLayer::advanceScene()
                        std::string str;
                        mState.script[-1].get(str);
 
-                       throw Mf::Exception(Mf::ErrorCode::SCRIPT_ERROR, str);
+                       throw Mf::Error(Mf::Error::SCRIPT_ERROR, str);
                }
 
                mState.script.getGlobalTable().pushField("Event");
@@ -103,6 +102,7 @@ void GameLayer::advanceScene()
 
 
 GameLayer::GameLayer() :
+       mHud(Hud::alloc(mState)),
        mMusic("NightFusionIntro"),
        mPunchSound("Thump")
 {
@@ -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));
@@ -122,18 +122,18 @@ GameLayer::GameLayer() :
                        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();
 }
 
 
-void GameLayer::pushed(Mf::Engine& engine)
+void GameLayer::pushedOntoEngine()
 {
-       engine.push(Hud::alloc(mState));
+       Mf::core.push(mHud);
 
        mRay.direction.set(1.0, 0.0);
 
@@ -147,7 +147,7 @@ void GameLayer::pushed(Mf::Engine& engine)
 }
 
 
-void GameLayer::update(Mf::Engine& engine, Mf::Scalar t, Mf::Scalar dt)
+void GameLayer::update(Mf::Scalar t, Mf::Scalar dt)
 {
        mState.camera.update(t, dt);
        mState.heroine->update(t, dt);
@@ -155,7 +155,7 @@ void GameLayer::update(Mf::Engine& engine, Mf::Scalar t, Mf::Scalar dt)
        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;
@@ -193,14 +193,14 @@ void GameLayer::rayTimer()
        {
                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;
        }
 }
 
 
-void GameLayer::draw(Mf::Engine& engine, Mf::Scalar alpha) const
+void GameLayer::draw(Mf::Scalar alpha) const
 {
        mState.camera.uploadToGL(alpha);
 
@@ -219,7 +219,7 @@ void GameLayer::draw(Mf::Engine& engine, Mf::Scalar alpha) const
        mSphere.draw();
 }
 
-bool GameLayer::handleEvent(Mf::Engine& engine, const Mf::Event& event)
+bool GameLayer::handleEvent(const Mf::Event& event)
 {
        switch (event.type)
        {
@@ -259,12 +259,12 @@ bool GameLayer::handleEvent(Mf::Engine& engine, const Mf::Event& event)
                case SDL_KEYUP:
                        if (event.key.keysym.sym == SDLK_ESCAPE)
                        {
-                               engine.pop(this);
+                               Mf::core.pop(this);
                                return true;
                        }
                        else if (event.key.keysym.sym == SDLK_h)
                        {
-                               engine.push(Hud::alloc(mState));
+                               Mf::core.push(mHud);
                                return true;
                        }
                        return mState.heroine->handleEvent(event);
@@ -285,13 +285,13 @@ bool GameLayer::handleEvent(Mf::Engine& engine, const Mf::Event& event)
 
 void GameLayer::setProjection()
 {
-       Mf::VideoP video = Mf::Engine::getInstance().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)
 {
-       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);
 }