X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FGameLayer.cc;h=493aa6cfa5392334c6c4165edfcc0e7c5f0e948a;hp=3f5a7a869fb2dd8d13e6da4671d82f78d474f47d;hb=987971a961454d97082c6448fdc0bbeb540281bb;hpb=7f3984f3f9524f5b6813e01ceb2fe576dadff94e diff --git a/src/GameLayer.cc b/src/GameLayer.cc index 3f5a7a8..493aa6c 100644 --- a/src/GameLayer.cc +++ b/src/GameLayer.cc @@ -26,8 +26,8 @@ *******************************************************************************/ -#include -#include +#include +#include #include #include #include @@ -35,37 +35,21 @@ #include #include "GameLayer.hh" -#include "Hud.hh" #if HAVE_CONFIG_H #include "config.h" #endif - -Mf::Scalar GameLayer::getZCoord(const Mf::Vector2& position) const -{ - Mf::Scalar z; - - mState.script.getGlobalTable().pushField("GetZCoord"); - mState.script.push(position[0]); - mState.script.push(position[1]); - mState.script.call(2, 1); - mState.script.getTop().get(z); - mState.script.pop(); - - return z; -} - void GameLayer::loadSceneLoader() { mState.script.importStandardLibraries(); - importLogPrintFunction(mState.script); + importLogFunctions(mState.script); 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); @@ -74,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"); } } @@ -99,13 +83,26 @@ 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"); + if (mState.script[-1].isTable()) + { + mState.script[-1].pushField("Think"); + mState.script.set("Think", Mf::Script::REGISTRY); + mState.script.pop(2); + } + else + { + mState.script.pop(); } } } GameLayer::GameLayer() : + mHud(Hud::alloc(mState)), mMusic("NightFusionIntro"), mPunchSound("Thump") { @@ -113,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)); @@ -121,19 +118,22 @@ GameLayer::GameLayer() : loadSceneLoader(); advanceScene(); // load the first scene + mThinkTimer.init(boost::bind(&GameLayer::thinkTimer, this), + 0.1, Mf::Timer::REPEAT); + 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, 2.0, Mf::Interpolator::OSCILLATE); + mState.interp.init(a, 5.0, Mf::Interpolator::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,12 +155,19 @@ 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], -9)); + -mState.heroine->getState().position[1], -8)); //mState.camera.lookAt(Mf::promote(mState.heroine->getState().position)); mRay.point = mState.heroine->getState().position; } +void GameLayer::thinkTimer() +{ + mState.script.getRegistryTable().pushField("Think"); + if (mState.script[-1].isFunction()) mState.script.call(); + else mState.script.pop(); +} + void GameLayer::rayTimer() { @@ -186,14 +193,14 @@ void GameLayer::rayTimer() { hits.front().normal.normalize(); mRay.solve(point, hits.front().distance); - Mf::logDebug << "scene: d = " << hits.front().distance << std::endl; - Mf::logDebug << " P = " << point << std::endl; - Mf::logDebug << " 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); @@ -205,7 +212,6 @@ void GameLayer::draw(Mf::Engine& engine, Mf::Scalar alpha) const mState.scene->drawIfVisible(alpha, mState.camera.getFrustum()); - mState.heroine->setZCoord(getZCoord(mState.heroine->getState().position)); mState.heroine->draw(alpha); mRay.draw(); @@ -213,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) { @@ -242,17 +248,23 @@ bool GameLayer::handleEvent(Mf::Engine& engine, const Mf::Event& event) cml::rad(-10.0)); return true; } + else if (event.key.keysym.sym == SDLK_r) + { + loadSceneLoader(); + advanceScene(); + return true; + } return mState.heroine->handleEvent(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); @@ -273,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); }