X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FGameLayer.cc;h=1e607586d486169afa681b8cea57015b5353e2e9;hp=a37f175801e8e38e280dfa857f9798724fd2c3b6;hb=7e84479de612a4ce287c6f63deb014b447a993ec;hpb=8a1acac01b444dccf8b57cedf08392ada2e473c1 diff --git a/src/GameLayer.cc b/src/GameLayer.cc index a37f175..1e60758 100644 --- a/src/GameLayer.cc +++ b/src/GameLayer.cc @@ -31,9 +31,11 @@ #include #include #include +#include #include #include "GameLayer.hh" +#include "Hud.hh" #if HAVE_CONFIG_H #include "config.h" @@ -45,37 +47,40 @@ Mf::Scalar GameLayer::getZCoord(const Mf::Vector2& position) const { Mf::Scalar z; - mScript.getGlobalTable().pushField("GetZCoord"); - mScript.push(position[0]); - mScript.push(position[1]); - mScript.call(2, 1); - mScript.getTop().get(z); - mScript.pop(); + 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); + std::string loaderPath = Scene::getPath("loader"); if (loaderPath == "") { throw Mf::Exception(Mf::ErrorCode::RESOURCE_NOT_FOUND, "loader"); } - Mf::Script::Status status = mScript.doFile(loaderPath); + Mf::Script::Status status = mState.script.doFile(loaderPath); if (status != Mf::Script::SUCCESS) { std::string str; - mScript[-1].get(str); + mState.script[-1].get(str); Mf::logScript("%s", str.c_str()); - throw Mf::Exception(Mf::ErrorCode::SCRIPT_ERROR, str.c_str()); + throw Mf::Exception(Mf::ErrorCode::SCRIPT_ERROR, str); } - mScript.getGlobalTable().pushField("scenes"); - mScript.getTop().get(mSceneList); - if (mSceneList.size() == 0) + 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"); @@ -84,11 +89,20 @@ void GameLayer::loadSceneLoader() void GameLayer::advanceScene() { - if (mSceneList.size() != 0) + if (mState.sceneList.size() != 0) { - mScene = Scene::alloc(mSceneList[0]); - mSceneList.erase(mSceneList.begin()); - mScene->load(mScript); + mState.scene = Scene::alloc(mState.sceneList[0]); + mState.sceneList.erase(mState.sceneList.begin()); + + Mf::Script::Status status = mState.scene->load(mState.script); + 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); + } } } @@ -99,52 +113,98 @@ GameLayer::GameLayer() : { mMusic.setLooping(true); mMusic.enqueue("NightFusionLoop"); - mMusic.stream(); + + bool isMute = false; + Mf::Settings::getInstance().get("nomusic", isMute); + if (!isMute) mMusic.play(); loadSceneLoader(); advanceScene(); // load the first scene - mHeroine = Heroine::alloc(); - mHeroine->animation.startSequence("FlyDiagonallyUp"); + 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}; - mInterp.init(a, 2.0, Mf::Interpolator::OSCILLATE); + mState.interp.init(a, 2.0, Mf::Interpolator::OSCILLATE); setProjection(); - - mHud = Hud::alloc(); } void GameLayer::pushed(Mf::Engine& engine) { - engine.push(mHud); + engine.push(Hud::alloc(mState)); + + mRay.direction.set(1.0, 0.0); + mRay3.direction.set(1.0, 0.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; } -void GameLayer::update(Mf::Scalar t, Mf::Scalar dt) +void GameLayer::update(Mf::Engine& engine, Mf::Scalar t, Mf::Scalar dt) { - mCamera.update(t, dt); - mHeroine->update(t, dt); + mState.camera.update(t, dt); + mState.heroine->update(t, dt); - mScene->checkForCollision(*mHeroine); + mState.scene->checkForCollision(*mState.heroine); - mCamera.setPosition(Mf::Vector3(-mHeroine->getState().position[0], - -mHeroine->getState().position[1], -10)); - //mCamera.lookAt(Mf::promote(mHeroine->getState().position)); + mState.camera.setPosition(Mf::Vector3(-mState.heroine->getState().position[0], + -mState.heroine->getState().position[1], -9)); + //mState.camera.lookAt(Mf::promote(mState.heroine->getState().position)); - //Mf::Vector3 heroinePosition = Mf::promote(mHeroine->getState().position); + //Mf::Vector3 heroinePosition = Mf::promote(mState.heroine->getState().position); //Mf::Sound::setListenerPosition(heroinePosition); - mInterp.update(t, dt); - mHud->setBar1Progress(mInterp.getState(dt)); - mHud->setBar2Progress(1.0 - mInterp.getState(dt)); + mRay.point = mState.heroine->getState().position; + mRay3.point = Mf::promote(mRay.point); + mRay3.direction = Mf::promote(mRay.direction); + + Mf::Ray<2>::Intersection meh; + Mf::Ray<3>::Intersection meh3; + + Mf::Scalar d = mLine.intersectRay(mRay, meh); + if (d > 0.0) + { + 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]); + } + //d = mPlane.intersectRay(mRay3, meh3); + //if (d > 0.0) + //{ + //Mf::logDebug("plane: d = %f", d); + //Mf::logDebug(" P = <%f,%f>", meh3.point[0], meh3.point[1]); + //Mf::logDebug(" n = <%f,%f>", meh3.normal[0], meh3.normal[1]); + //} + d = mSphere.intersectRay(mRay, meh); + if (d > 0.0) + { + 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]); + } + + std::list::Intersection> hits; + if (mState.scene->castRay(mRay, hits)) + { + Mf::logDebug("scene: d = %f", d); + Mf::logDebug(" P = <%f,%f>", hits.front().point[0], hits.front().point[1]); + Mf::logDebug(" n = <%f,%f>", hits.front().normal[0], hits.front().normal[1]); + } } -void GameLayer::draw(Mf::Scalar alpha) const +void GameLayer::draw(Mf::Engine& engine, Mf::Scalar alpha) const { - mCamera.uploadToGL(alpha); + mState.camera.uploadToGL(alpha); // DRAW THE SCENE Mf::Texture::resetBind(); @@ -152,45 +212,65 @@ void GameLayer::draw(Mf::Scalar alpha) const glEnableClientState(GL_VERTEX_ARRAY); glEnableClientState(GL_TEXTURE_COORD_ARRAY); - mScene->drawIfVisible(alpha, mCamera.getFrustum()); + mState.scene->drawIfVisible(alpha, mState.camera.getFrustum()); + + mState.heroine->setZCoord(getZCoord(mState.heroine->getState().position)); + mState.heroine->draw(alpha); - mHeroine->setZCoord(getZCoord(mHeroine->getState().position)); - mHeroine->draw(alpha); + mRay.draw(); + mLine.draw(); + mSphere.draw(); } -bool GameLayer::handleEvent(const Mf::Event& event) +bool GameLayer::handleEvent(Mf::Engine& engine, const Mf::Event& event) { switch (event.type) { case SDL_KEYDOWN: if (event.key.keysym.sym == SDLK_SPACE) { - mHeroine->animation.startSequence("Flattened"); + mState.heroine->animation.startSequence("Flattened"); Mf::logInfo("thump!"); mPunchSound.play(); return true; } - else if (event.key.keysym.sym == SDLK_p) + else if (event.key.keysym.sym == SDLK_m) { mMusic.toggle(); return true; } - else if (event.key.keysym.sym == SDLK_y) + else if (event.key.keysym.sym == SDLK_PAGEUP) + { + mRay.direction = cml::rotate_vector_2D(mRay.direction, cml::rad(10.0)); + return true; + } + else if (event.key.keysym.sym == SDLK_PAGEDOWN) { - Mf::Engine::getInstance().pop(); + mRay.direction = cml::rotate_vector_2D(mRay.direction, cml::rad(-10.0)); return true; } + return mState.heroine->handleEvent(event); case SDL_KEYUP: - return mHeroine->handleEvent(event); + if (event.key.keysym.sym == SDLK_ESCAPE) + { + engine.pop(this); + return true; + } + else if (event.key.keysym.sym == SDLK_h) + { + engine.push(Hud::alloc(mState)); + return true; + } + return mState.heroine->handleEvent(event); case SDL_MOUSEMOTION: case SDL_MOUSEBUTTONDOWN: - mCamera.handleEvent(event); + mState.camera.handleEvent(event); return true; case SDL_VIDEORESIZE: - setProjection(Mf::Scalar(event.resize.w), Mf::Scalar(event.resize.h)); + setProjection(event.resize.w, event.resize.h); break; } @@ -200,13 +280,13 @@ bool GameLayer::handleEvent(const Mf::Event& event) void GameLayer::setProjection() { - Mf::Video& video = Mf::Engine::getInstance().getVideo(); - setProjection(video.getWidth(), video.getHeight()); + Mf::VideoP video = Mf::Engine::getInstance().getVideo(); + setProjection(video->getWidth(), video->getHeight()); } void GameLayer::setProjection(Mf::Scalar width, Mf::Scalar height) { - mCamera.setProjection(cml::rad(60.0), width / height, 1.0, 200.0); + mState.camera.setProjection(cml::rad(60.0), width / height, 1.0, 200.0); }