*******************************************************************************/
#include <Moof/Engine.hh>
-#include <Moof/Exception.hh>
+#include <Moof/Error.hh>
#include <Moof/Log.hh>
#include <Moof/Math.hh>
#include <Moof/OpenGL.hh>
#include <Moof/Video.hh>
#include "GameLayer.hh"
-#include "Hud.hh"
#if HAVE_CONFIG_H
#include "config.h"
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);
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");
}
}
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");
GameLayer::GameLayer() :
+ mHud(Hud::alloc(mState)),
mMusic("NightFusionIntro"),
mPunchSound("Thump")
{
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);
}
-void GameLayer::pushed(Mf::Engine& engine)
+void GameLayer::pushedOntoEngine()
{
- engine.push(Hud::alloc(mState));
+ Mf::engine.push(mHud);
mRay.direction.set(1.0, 0.0);
}
-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);
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;
{
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);
mSphere.draw();
}
-bool GameLayer::handleEvent(Mf::Engine& engine, const Mf::Event& event)
+bool GameLayer::handleEvent(const Mf::Event& event)
{
switch (event.type)
{
case SDL_KEYUP:
if (event.key.keysym.sym == SDLK_ESCAPE)
{
- engine.pop(this);
+ Mf::engine.pop(this);
return true;
}
else if (event.key.keysym.sym == SDLK_h)
{
- engine.push(Hud::alloc(mState));
+ Mf::engine.push(mHud);
return true;
}
return mState.heroine->handleEvent(event);
void GameLayer::setProjection()
{
- Mf::VideoP video = Mf::Engine::getInstance().getVideo();
+ Mf::VideoP video = Mf::engine.getVideo();
setProjection(video->getWidth(), 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);
}