X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMainLayer.cc;h=38c849ebd08129cf2c2f83dcc447329f5546db3a;hp=85828c7f65dbfee150201d997ee6ffa0754e0b07;hb=e495074443d9fd7bc16137084cf9de3d031b75c4;hpb=a31d65a998121df0651c57bfb68782e2a07d2e2f diff --git a/src/MainLayer.cc b/src/MainLayer.cc index 85828c7..38c849e 100644 --- a/src/MainLayer.cc +++ b/src/MainLayer.cc @@ -31,14 +31,15 @@ #include #include // access -#include -#include #include +#include #include #include +#include #include #include +#include "ErrorHandler.hh" #include "GameLayer.hh" #include "MainLayer.hh" #include "TitleLayer.hh" @@ -51,21 +52,13 @@ MainLayer::MainLayer() { - Mf::dispatcher::addHandler("video.context_recreated", - boost::bind(&MainLayer::contextRecreated, this, _1), this); + mDispatchHandler = Mf::Engine::getInstance().addHandler("video.newcontext", + boost::bind(&MainLayer::contextRecreated, this)); setupGL(); } -MainLayer::~MainLayer() -{ - Mf::dispatcher::removeHandler(this); -} - - void MainLayer::pushed(Mf::Engine& engine) { - mEngine = &engine; - //Mf::Scalar coeff[] = {0.0, 1.0}; //Mf::Lerp interp(coeff, 0.25); @@ -74,11 +67,20 @@ void MainLayer::pushed(Mf::Engine& engine) //Mf::Transition::alloc(gameLayer, Mf::LayerP(), interp); //engine->push(transition); //engine->push(GameLayer::alloc()); - mEngine->push(TitleLayer::alloc()); + engine.push(TitleLayer::alloc()); } -void MainLayer::draw(Mf::Scalar alpha) const +void MainLayer::update(Mf::Engine& engine, Mf::Scalar t, Mf::Scalar dt) +{ + if (engine.getSize() == 1) + { + // this is the only layer left on the stack + engine.push(TitleLayer::alloc()); + } +} + +void MainLayer::draw(Mf::Engine& engine, Mf::Scalar alpha) const { glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); @@ -89,28 +91,24 @@ void MainLayer::draw(Mf::Scalar alpha) const glLoadIdentity(); } -bool MainLayer::handleEvent(const Mf::Event& event) +bool MainLayer::handleEvent(Mf::Engine& engine, const Mf::Event& event) { switch (event.type) { - case SDL_KEYDOWN: + case SDL_KEYUP: if (event.key.keysym.sym == SDLK_ESCAPE) { - quit(); + engine.clear(); } else if (event.key.keysym.sym == SDLK_f) { - mEngine->getVideo().toggleFull(); + engine.getVideo()->toggleFull(); } else if (event.key.keysym.sym == SDLK_l) { - Mf::Video& video = mEngine->getVideo(); - video.toggleCursorGrab(); - video.toggleCursorVisible(); - } - else if (event.key.keysym.sym == SDLK_y) - { - mEngine->push(GameLayer::alloc()); + Mf::VideoP video = engine.getVideo(); + video->toggleCursorGrab(); + video->toggleCursorVisible(); } break; @@ -119,24 +117,13 @@ bool MainLayer::handleEvent(const Mf::Event& event) break; case SDL_QUIT: - quit(); + engine.clear(); break; } return false; } -void MainLayer::quit() -{ -#if NDEBUG - // we don't really need to unwind the stack and shut everything down because - // the operating system will take care of cleaning up - exit(0); -#else - mEngine->clear(); -#endif -} - void MainLayer::setupGL() { @@ -161,7 +148,7 @@ void MainLayer::setupGL() glMatrixMode(GL_MODELVIEW); } -void MainLayer::contextRecreated(const Mf::Notification* note) +void MainLayer::contextRecreated() { // whenever the context is destroyed and a new one created, it probably // won't contain our state so we need to set that up again @@ -219,7 +206,7 @@ void printInfo(int argc, char* argv[]) std::cout << " Executable: " << argv[0] << std::endl << " Version: "VERSION << std::endl -#ifdef __DATE__ +#if defined(__DATE__) && defined(__TIME__) << " Built: "__DATE__" "__TIME__ << std::endl #endif << " Compiler: "COMPILER_STRING << std::endl @@ -233,10 +220,18 @@ void printInfo(int argc, char* argv[]) << "-" #endif << "double-precision " +#ifndef USE_GTK + << "-" +#endif + << "gtk " #ifndef PROFILING_ENABLED << "-" #endif << "profile " +#ifndef USE_QT4 + << "-" +#endif + << "qt4 " #ifndef USE_THREADS << "-" #endif @@ -251,9 +246,6 @@ void goodbye() } -typedef cml::matrix< Mf::Scalar, cml::fixed<5,5>, - cml::col_basis, cml::col_major > Matrix5; - int main(int argc, char* argv[]) { if (argc > 1) @@ -271,6 +263,7 @@ int main(int argc, char* argv[]) } } + std::cout << std::endl << PACKAGE_STRING << std::endl << "Compiled " << __TIME__ " " __DATE__ << std::endl << "Send patches and bug reports to <" @@ -304,19 +297,20 @@ int main(int argc, char* argv[]) Mf::Resource::addSearchPath(YOINK_DATADIR); - std::string iconFile = Mf::Resource::getPath("yoink.png"); - // Build the list of config files to search for, in this order: // 1. YOINK_DATADIR/yoinkrc - // 2. /etc/yoinkrc + // 2. /etc/yoinkrc (not for Windows) // 3. $HOME/.yoinkrc // 4. YOINKRC (environment) std::string configFiles; configFiles += Mf::Resource::getPath("yoinkrc"); - configFiles += ":/etc/yoinkrc:$HOME/.yoinkrc"; +#if !defined(_WIN32) && !defined(__WIN32__) + configFiles += ":/etc/yoinkrc"; +#endif + configFiles += ":$HOME/.yoinkrc"; char* configFile = getenv("YOINKRC"); if (configFile) @@ -325,19 +319,31 @@ int main(int argc, char* argv[]) configFiles += configFile; } + Mf::Settings& settings = Mf::Settings::getInstance(); + settings.loadFromFile(configFiles); + settings.parseArgs(argc, argv); + + std::string iconFile = Mf::Resource::getPath(PACKAGE".png"); + try { - Mf::Engine app(argc, argv, PACKAGE_STRING, iconFile, configFiles); + Mf::Engine& app = Mf::Engine::getInstance(); + app.setVideo(Mf::Video::alloc(PACKAGE_STRING, iconFile)); app.push(MainLayer::alloc()); app.run(); } - catch (Mf::Exception e) + catch (const Mf::Exception& e) { - Mf::logError("unhandled exception: <<%s>>", e.what()); - Mf::logInfo("it's time to crash now :-("); - throw e; + Mf::ModalDialog dialog; + dialog.title = PACKAGE_STRING; + dialog.text1 = "Unhandled Exception"; + dialog.text2 = getErrorString(e); + dialog.type = Mf::ModalDialog::CRITICAL; + dialog.run(); + + return 1; } return 0;