X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FGameLayer.cc;h=331d04fbc9db98f81d02ba12a3c07c9fea618fed;hp=0ed249c8af964ffffd1bd009c21592350459280e;hb=76b3f4be992514a740ac03cdbdd57844142a0b4c;hpb=b357615aba1dbde81e3c6999366604e6001010a7 diff --git a/src/GameLayer.cc b/src/GameLayer.cc index 0ed249c..331d04f 100644 --- a/src/GameLayer.cc +++ b/src/GameLayer.cc @@ -1,33 +1,16 @@ -/******************************************************************************* - - Copyright (c) 2009, Charles McGarvey - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*******************************************************************************/ - -#include -#include +/*] Copyright (c) 2009-2010, Charles McGarvey [************************** +**] All rights reserved. +* +* vi:ts=4 sw=4 tw=75 +* +* Distributable under the terms and conditions of the 2-clause BSD license; +* see the file COPYING for a complete text of the license. +* +**************************************************************************/ + +#include +#include #include #include #include @@ -35,7 +18,6 @@ #include #include "GameLayer.hh" -#include "Hud.hh" #if HAVE_CONFIG_H #include "config.h" @@ -50,7 +32,7 @@ void GameLayer::loadSceneLoader() 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); @@ -59,14 +41,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"); } } @@ -84,7 +66,7 @@ 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"); @@ -103,6 +85,7 @@ void GameLayer::advanceScene() GameLayer::GameLayer() : + mHud(Hud::alloc(mState)), mMusic("NightFusionIntro"), mPunchSound("Thump") { @@ -110,7 +93,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)); @@ -122,41 +105,42 @@ GameLayer::GameLayer() : 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::pushed(Mf::Engine& engine) +void GameLayer::addedToCore() { - 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); - mSphere.point.set(22, 5); - mSphere.radius = 2; + mCircle.point.set(22, 5); + mCircle.radius = 2; - mRayTimer.init(boost::bind(&GameLayer::rayTimer, this), 1.0, Mf::Timer::REPEAT); + 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); mState.scene->checkForCollision(*mState.heroine); - mState.camera.setPosition(Mf::Vector3(-mState.heroine->getState().position[0], - -mState.heroine->getState().position[1], -6)); - //mState.camera.lookAt(Mf::promote(mState.heroine->getState().position)); + Mf::Vector3 camPosition(-mState.heroine->getState().position[0], + -mState.heroine->getState().position[1], -8); + mState.camera.setPosition(camPosition); mRay.point = mState.heroine->getState().position; } @@ -171,8 +155,8 @@ void GameLayer::thinkTimer() void GameLayer::rayTimer() { - Mf::Ray<2>::Intersection meh; - std::list::Intersection> hits; + Mf::Ray2::Contact meh; + std::list hits; Mf::Vector2 point; bool bam = mLine.intersectRay(mRay, meh); @@ -182,7 +166,7 @@ void GameLayer::rayTimer() hits.push_back(meh); } - bam = mSphere.intersectRay(mRay, meh); + bam = mCircle.intersectRay(mRay, meh); if (bam) { meh.normal.normalize(); @@ -200,7 +184,7 @@ void GameLayer::rayTimer() } -void GameLayer::draw(Mf::Engine& engine, Mf::Scalar alpha) const +void GameLayer::draw(Mf::Scalar alpha) const { mState.camera.uploadToGL(alpha); @@ -211,15 +195,14 @@ void GameLayer::draw(Mf::Engine& engine, Mf::Scalar alpha) const glEnableClientState(GL_TEXTURE_COORD_ARRAY); mState.scene->drawIfVisible(alpha, mState.camera.getFrustum()); - mState.heroine->draw(alpha); mRay.draw(); mLine.draw(); - mSphere.draw(); + mCircle.draw(); } -bool GameLayer::handleEvent(Mf::Engine& engine, const Mf::Event& event) +bool GameLayer::handleEvent(const Mf::Event& event) { switch (event.type) { @@ -259,12 +242,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); @@ -285,15 +268,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); } - -/** vim: set ts=4 sw=4 tw=80: *************************************************/ -