X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FGameLayer.cc;h=493aa6cfa5392334c6c4165edfcc0e7c5f0e948a;hp=41000f395d645b8f13b4031e4f7db9e7a88bfcb6;hb=987971a961454d97082c6448fdc0bbeb540281bb;hpb=2d77fb5fb3480f522658f30af6addd5146530517 diff --git a/src/GameLayer.cc b/src/GameLayer.cc index 41000f3..493aa6c 100644 --- a/src/GameLayer.cc +++ b/src/GameLayer.cc @@ -26,63 +26,47 @@ *******************************************************************************/ -#include -#include +#include +#include #include #include #include +#include #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::Status status = mState.script.doFile(loaderPath); + Mf::Script::Result status = mState.script.doFile(loaderPath); if (status != Mf::Script::SUCCESS) { std::string str; mState.script[-1].get(str); - Mf::logScript("%s", str.c_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) { - Mf::logScript("no variable `scenes' within loader"); - throw Mf::Exception(Mf::ErrorCode::SCRIPT_ERROR, "no scenes to load"); + throw Mf::Error(Mf::Error::SCRIPT_ERROR, + "no variable `scenes' within loader"); } } @@ -92,50 +76,78 @@ void GameLayer::advanceScene() { mState.scene = Scene::alloc(mState.sceneList[0]); mState.sceneList.erase(mState.sceneList.begin()); - mState.scene->load(mState.script); + + Mf::Script::Result status = mState.scene->load(mState.script); + if (status != Mf::Script::SUCCESS) + { + std::string str; + mState.script[-1].get(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") { mMusic.setLooping(true); mMusic.enqueue("NightFusionLoop"); - mMusic.stream(); + + bool isMute = false; + Mf::settings.get("nomusic", isMute); + if (!isMute) mMusic.play(); + + //mMusic.setPosition(Mf::Vector3(10.0, 5.0, 0.0)); 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); mLine.a.set(20, 10); mLine.b.set(19, 14); - mPlane.normal.set(-1.0, 0.0, 0.0); - mPlane.d = 0.0; - mSphere.point.set(22, 5); mSphere.radius = 2; + + mRayTimer.init(boost::bind(&GameLayer::rayTimer, this), 1.0, Mf::Timer::REPEAT); } -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); @@ -143,41 +155,52 @@ 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)); - //Mf::Vector3 heroinePosition = Mf::promote(mState.heroine->getState().position); - //Mf::Sound::setListenerPosition(heroinePosition); - 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() +{ Mf::Ray<2>::Intersection meh; + std::list::Intersection> hits; + Mf::Vector2 point; + + bool bam = mLine.intersectRay(mRay, meh); + if (bam) + { + meh.normal.normalize(); + hits.push_back(meh); + } - Mf::Scalar d = mLine.intersectRay(mRay, meh); - if (d > 0.0) + bam = mSphere.intersectRay(mRay, meh); + if (bam) { - Mf::logDebug("line: d = %f", d); - Mf::logDebug(" P = <%f,%f>", meh.point[0], meh.point[1]); - Mf::logDebug(" n = <%f,%f>", meh.normal[0], meh.normal[1]); + meh.normal.normalize(); + hits.push_back(meh); } - //d = mPlane.intersectRay(mRay, meh); - //if (d > 0.0) - //{ - //Mf::logDebug("plane: d = %f", d); - //Mf::logDebug(" P = <%f,%f>", meh.point[0], meh.point[1]); - //Mf::logDebug(" n = <%f,%f>", meh.normal[0], meh.normal[1]); - //} - d = mSphere.intersectRay(mRay, meh); - if (d > 0.0) + + if (mState.scene->castRay(mRay, hits)) { - Mf::logDebug("sphere: d = %f", d); - Mf::logDebug(" P = <%f,%f>", meh.point[0], meh.point[1]); - Mf::logDebug(" n = <%f,%f>", meh.normal[0], meh.normal[1]); + 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; } } -void GameLayer::draw(Mf::Engine& engine, Mf::Scalar alpha) const +void GameLayer::draw(Mf::Scalar alpha) const { mState.camera.uploadToGL(alpha); @@ -189,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(); @@ -197,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) { @@ -216,12 +238,20 @@ bool GameLayer::handleEvent(Mf::Engine& engine, const Mf::Event& event) } else if (event.key.keysym.sym == SDLK_PAGEUP) { - mRay.direction = cml::rotate_vector_2D(mRay.direction, cml::rad(10.0)); + mRay.direction = cml::rotate_vector_2D(mRay.direction, + cml::rad(10.0)); return true; } else if (event.key.keysym.sym == SDLK_PAGEDOWN) { - mRay.direction = cml::rotate_vector_2D(mRay.direction, cml::rad(-10.0)); + mRay.direction = cml::rotate_vector_2D(mRay.direction, + cml::rad(-10.0)); + return true; + } + else if (event.key.keysym.sym == SDLK_r) + { + loadSceneLoader(); + advanceScene(); return true; } return mState.heroine->handleEvent(event); @@ -229,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); @@ -255,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); }