*******************************************************************************/
-#include <Moof/Engine.hh>
+#include <Moof/Core.hh>
#include <Moof/Error.hh>
#include <Moof/Log.hh>
#include <Moof/Math.hh>
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));
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::pushedOntoEngine()
{
- Mf::engine.push(mHud);
+ Mf::core.push(mHud);
mRay.direction.set(1.0, 0.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;
{
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;
}
}
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);
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)
{
- 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);
}