X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FGameLayer.cc;h=d696f5ebdf851a0276f625f5c886eddb3dfd7594;hp=493aa6cfa5392334c6c4165edfcc0e7c5f0e948a;hb=449366f5f32d24f2a2a6589da6e16b2bf0d61773;hpb=987971a961454d97082c6448fdc0bbeb540281bb diff --git a/src/GameLayer.cc b/src/GameLayer.cc index 493aa6c..d696f5e 100644 --- a/src/GameLayer.cc +++ b/src/GameLayer.cc @@ -1,281 +1,271 @@ -/******************************************************************************* - - 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 -#include -#include -#include -#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 "../config.h" + +#include + +#include +#include +#include +#include +#include #include "GameLayer.hh" -#if HAVE_CONFIG_H -#include "config.h" -#endif - void GameLayer::loadSceneLoader() { - mState.script.importStandardLibraries(); - importLogFunctions(mState.script); + state_.script.import_standard_libraries(); + moof::log::import(state_.script); - std::string loaderPath = Scene::getPath("loader"); - if (loaderPath == "") + std::string path("loader"); + if (!moof::resource::find(path)) { - throw Mf::Error(Mf::Error::RESOURCE_NOT_FOUND, "loader"); + throw std::runtime_error("cannot find scene loader script"); } - Mf::Script::Result status = mState.script.doFile(loaderPath); - if (status != Mf::Script::SUCCESS) + moof::script::status status = state_.script.do_file(path); + if (status != moof::script::success) { std::string str; - mState.script[-1].get(str); - - throw Mf::Error(Mf::Error::SCRIPT_ERROR, str); + state_.script[-1].get(str); + throw std::runtime_error("script error: " + str); } - mState.script.getGlobalTable().pushField("scenes"); - mState.script.getTop().get(mState.sceneList); - if (mState.sceneList.size() == 0) + state_.script.globals().push_field("scenes"); + state_.script.top().get(state_.sceneList); + if (state_.sceneList.size() == 0) { - throw Mf::Error(Mf::Error::SCRIPT_ERROR, - "no variable `scenes' within loader"); + throw std::runtime_error("no variable `scenes' in script loader."); } } -void GameLayer::advanceScene() +void GameLayer::advanceScene(moof::settings& settings) { - if (mState.sceneList.size() != 0) + if (state_.sceneList.size() != 0) { - mState.scene = Scene::alloc(mState.sceneList[0]); - mState.sceneList.erase(mState.sceneList.begin()); + state_.scene = Scene::alloc(state_.sceneList[0]); + state_.sceneList.erase(state_.sceneList.begin()); - Mf::Script::Result status = mState.scene->load(mState.script); - if (status != Mf::Script::SUCCESS) + moof::script::status status = state_.scene->load(settings, + state_.script); + if (status != moof::script::success) { std::string str; - mState.script[-1].get(str); - - throw Mf::Error(Mf::Error::SCRIPT_ERROR, str); + state_.script[-1].get(str); + throw std::runtime_error("script error: " + str); } - mState.script.getGlobalTable().pushField("Event"); - if (mState.script[-1].isTable()) + moof::script::slot table = state_.script.globals().push_field("Event"); + if (table.is_table()) { - mState.script[-1].pushField("Think"); - mState.script.set("Think", Mf::Script::REGISTRY); - mState.script.pop(2); - } - else - { - mState.script.pop(); + state_.script.push("Think"); + table.push_field("Think"); + state_.script.registry().set_field(); } + state_.script.pop(); } } -GameLayer::GameLayer() : - mHud(Hud::alloc(mState)), - mMusic("NightFusionIntro"), - mPunchSound("Thump") +GameLayer::GameLayer() { - mMusic.setLooping(true); - mMusic.enqueue("NightFusionLoop"); - - bool isMute = false; - Mf::settings.get("nomusic", isMute); - if (!isMute) mMusic.play(); - - //mMusic.setPosition(Mf::Vector3(10.0, 5.0, 0.0)); + moof::log_info("about to load sound resource..."); + music_ = moof::resource::load("sounds/NightFusionIntro.ogg"); + if (music_) + { + music_->loop(true); + music_->enqueue("NightFusionLoop"); + } + else moof::log_error("music not loaded"); - loadSceneLoader(); - advanceScene(); // load the first scene + //music_->position(moof::vector3(10.0, 5.0, 0.0)); mThinkTimer.init(boost::bind(&GameLayer::thinkTimer, this), - 0.1, Mf::Timer::REPEAT); - - mState.heroine = Heroine::alloc(); - mState.heroine->animation.startSequence("FlyDiagonallyUp"); + 0.1, moof::timer::repeat); - 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); + state_.heroine = Heroine::alloc(); + state_.heroine->animation.startSequence("FlyDiagonallyUp"); - setProjection(); + state_.interp.init(0.0, 1.0, 4.0, moof::lerp_scalar::oscillate); } -void GameLayer::pushedOntoEngine() +void GameLayer::did_add_to_view() { - Mf::core.push(mHud); + bool isMute = false; + settings().get("nomusic", isMute); + if (!isMute) music_->play(); + + loadSceneLoader(); + advanceScene(settings()); // load the first scene + + mHud = Hud::alloc(state_); + add_child(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, moof::timer::repeat); + + projection(); } -void GameLayer::update(Mf::Scalar t, Mf::Scalar dt) +void GameLayer::update(moof::scalar t, moof::scalar dt) { - mState.camera.update(t, dt); - mState.heroine->update(t, dt); + if (!state_.scene) return; + state_.camera.update(t, dt); + state_.heroine->update(t, dt); + + state_.scene->checkForCollision(*state_.heroine); - mState.scene->checkForCollision(*mState.heroine); + moof::vector3 cam= -moof::promote(state_.heroine->state().position, 8); + state_.camera.position(cam); - mState.camera.setPosition(Mf::Vector3(-mState.heroine->getState().position[0], - -mState.heroine->getState().position[1], -8)); - //mState.camera.lookAt(Mf::promote(mState.heroine->getState().position)); + mRay.point = state_.heroine->state().position; - mRay.point = mState.heroine->getState().position; + moof::view::update(t, dt); } void GameLayer::thinkTimer() { - mState.script.getRegistryTable().pushField("Think"); - if (mState.script[-1].isFunction()) mState.script.call(); - else mState.script.pop(); + state_.script.registry().push_field("Think"); + if (state_.script[-1].is_function()) state_.script.call(); + else state_.script.pop(); } void GameLayer::rayTimer() { - Mf::Ray<2>::Intersection meh; - std::list::Intersection> hits; - Mf::Vector2 point; + moof::ray2::contact meh; + std::list hits; + moof::vector2 point; - bool bam = mLine.intersectRay(mRay, meh); + bool bam = mLine.intersect_ray(mRay, meh); if (bam) { - meh.normal.normalize(); - hits.push_back(meh); + //meh.normal.normalize(); + //hits.push_back(meh); + mRay.solve(point, meh.distance); + moof::log_info << "line: d = " << meh.distance << std::endl; + moof::log_info << " P = " << point << std::endl; + moof::log_info << " n = " << meh.normal << std::endl; } - bam = mSphere.intersectRay(mRay, meh); + bam = mCircle.intersect_ray(mRay, meh); if (bam) { meh.normal.normalize(); hits.push_back(meh); } - if (mState.scene->castRay(mRay, hits)) + if (state_.scene->castRay(mRay, hits)) { 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; + moof::log_info << "scene: d = " << hits.front().distance << std::endl; + moof::log_info << " P = " << point << std::endl; + moof::log_info << " n = " << hits.front().normal << std::endl; } } -void GameLayer::draw(Mf::Scalar alpha) const +void GameLayer::draw(moof::scalar alpha) const { - mState.camera.uploadToGL(alpha); + if (!state_.scene) return; + state_.camera.upload_to_gl(alpha); // DRAW THE SCENE - Mf::Texture::resetBind(); + moof::texture::reset_binding(); glEnableClientState(GL_VERTEX_ARRAY); glEnableClientState(GL_TEXTURE_COORD_ARRAY); - mState.scene->drawIfVisible(alpha, mState.camera.getFrustum()); - - mState.heroine->draw(alpha); + state_.scene->draw_if_visible(alpha, state_.camera.frustum()); + state_.heroine->draw(alpha); mRay.draw(); mLine.draw(); - mSphere.draw(); + mCircle.draw(); + + moof::view::draw(alpha); } -bool GameLayer::handleEvent(const Mf::Event& event) +bool GameLayer::handle_event(const moof::event& event) { + if (moof::view::handle_event(event)) return true; + switch (event.type) { case SDL_KEYDOWN: if (event.key.keysym.sym == SDLK_SPACE) { - mState.heroine->animation.startSequence("Flattened"); - Mf::logInfo("thump!"); - mPunchSound.play(); + state_.heroine->animation.startSequence("Flattened"); + moof::log_info("thump!"); + //mPunchSound.play(); return true; } else if (event.key.keysym.sym == SDLK_m) { - mMusic.toggle(); + music_->toggle(); return true; } else if (event.key.keysym.sym == SDLK_PAGEUP) { - mRay.direction = cml::rotate_vector_2D(mRay.direction, - cml::rad(10.0)); + mRay.direction = moof::rotate_vector_2D(mRay.direction, + moof::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 = moof::rotate_vector_2D(mRay.direction, + moof::rad(-10.0)); return true; } else if (event.key.keysym.sym == SDLK_r) { loadSceneLoader(); - advanceScene(); + advanceScene(settings()); return true; } - return mState.heroine->handleEvent(event); + return state_.heroine->handle_event(event); case SDL_KEYUP: if (event.key.keysym.sym == SDLK_ESCAPE) { - Mf::core.pop(this); + parent().remove_child(this); return true; } else if (event.key.keysym.sym == SDLK_h) { - Mf::core.push(mHud); + add_child(mHud); return true; } - return mState.heroine->handleEvent(event); + return state_.heroine->handle_event(event); case SDL_MOUSEMOTION: case SDL_MOUSEBUTTONDOWN: - mState.camera.handleEvent(event); + state_.camera.handle_event(event); return true; case SDL_VIDEORESIZE: - setProjection(event.resize.w, event.resize.h); + projection(event.resize.w, event.resize.h); break; } @@ -283,17 +273,15 @@ bool GameLayer::handleEvent(const Mf::Event& event) } -void GameLayer::setProjection() +void GameLayer::projection() { - ASSERT(Mf::video && "no current video context from which to get dimensions"); - setProjection(Mf::video->getWidth(), Mf::video->getHeight()); + projection(video().width(), video().height()); } -void GameLayer::setProjection(Mf::Scalar width, Mf::Scalar height) +void GameLayer::projection(moof::scalar width, moof::scalar height) { - mState.camera.setProjection(cml::rad(45.0), width / height, 1.0, 200.0); + state_.camera.projection(moof::rad(60.0), + width / height, + SCALAR(1.0), SCALAR(200.0)); } - -/** vim: set ts=4 sw=4 tw=80: *************************************************/ -