X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMainLayer.cc;h=40377365d18149cf02c7ec8fec0ae4cbd1e4e899;hp=2e687855dd73d03a557bcf2108d9940d1706ed4c;hb=b357615aba1dbde81e3c6999366604e6001010a7;hpb=31d52677b38d935297d132bdbd956c655cd3feee diff --git a/src/MainLayer.cc b/src/MainLayer.cc index 2e68785..4037736 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() +void MainLayer::pushed(Mf::Engine& engine) { - Mf::dispatcher::removeHandler(this); -} - - -void MainLayer::pushed(Mf::Engine& e) -{ - engine = &e; - //Mf::Scalar coeff[] = {0.0, 1.0}; //Mf::Lerp interp(coeff, 0.25); @@ -74,11 +67,21 @@ void MainLayer::pushed(Mf::Engine& e) //Mf::Transition::alloc(gameLayer, Mf::LayerP(), interp); //engine->push(transition); //engine->push(GameLayer::alloc()); - engine->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()); + engine.clear(); + } +} + +void MainLayer::draw(Mf::Engine& engine, Mf::Scalar alpha) const { glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); @@ -89,28 +92,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) { - engine->getVideo().toggleFull(); + engine.getVideo()->toggleFull(); } else if (event.key.keysym.sym == SDLK_l) { - Mf::Video& video = engine->getVideo(); - video.toggleCursorGrab(); - video.toggleCursorVisible(); - } - else if (event.key.keysym.sym == SDLK_y) - { - engine->push(GameLayer::alloc()); + Mf::VideoP video = engine.getVideo(); + video->toggleCursorGrab(); + video->toggleCursorVisible(); } break; @@ -119,24 +118,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 - engine->clear(); -#endif -} - void MainLayer::setupGL() { @@ -161,7 +149,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 @@ -172,7 +160,8 @@ void MainLayer::contextRecreated(const Mf::Notification* note) void printUsage() { - std::cout << "Usage: "PACKAGE" [-h|--help] [-i|--info] [OPTION=VALUE]..." << std::endl + std::cout << "Usage: "PACKAGE" [-h|--help] [-i|--info] [OPTION=VALUE]..." + << std::endl << "The alien-smashing action game." << std::endl << std::endl << "Options:" << std::endl @@ -218,9 +207,7 @@ void printInfo(int argc, char* argv[]) std::cout << " Executable: " << argv[0] << std::endl << " Version: "VERSION << std::endl -#ifdef __DATE__ - << " Built: "__DATE__" "__TIME__ << std::endl -#endif + << " Built: " << COMPILE_TIME << std::endl << " Compiler: "COMPILER_STRING << std::endl << " Assets: " << assets << std::endl << "Build options: " @@ -232,10 +219,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 @@ -250,7 +245,6 @@ void goodbye() } - int main(int argc, char* argv[]) { if (argc > 1) @@ -268,6 +262,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 <" @@ -276,16 +271,14 @@ int main(int argc, char* argv[]) atexit(goodbye); -#if YOINK_LOGLEVEL >= 4 - Mf::setLogLevel(Mf::LOG_DEBUG); -#elif YOINK_LOGLEVEL >= 3 - Mf::setLogLevel(Mf::LOG_INFO); +#if YOINK_LOGLEVEL >= 3 + Mf::Log::setLevel(Mf::Log::INFO); #elif YOINK_LOGLEVEL >= 2 - Mf::setLogLevel(Mf::LOG_SCRIPT); + Mf::Log::setLevel(Mf::Log::WARNING); #elif YOINK_LOGLEVEL >= 1 - Mf::setLogLevel(Mf::LOG_ERROR); + Mf::Log::setLevel(Mf::Log::ERROR); #elif YOINK_LOGLEVEL - Mf::setLogLevel(Mf::LOG_NONE); + Mf::Log::setLevel(Mf::Log::NONE); #endif @@ -301,19 +294,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) @@ -322,19 +316,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;