X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMainLayer.cc;h=568f0cd0ebe84b2185945895692d5045c89c7454;hp=2266326402f89b475df8c1a57b3f4abd3dba9d37;hb=a295f8def17036c8071b56e181364f99a377cae7;hpb=a4debfe4a5f5d339410788971b698ba00cb7f09c diff --git a/src/MainLayer.cc b/src/MainLayer.cc index 2266326..568f0cd 100644 --- a/src/MainLayer.cc +++ b/src/MainLayer.cc @@ -27,18 +27,19 @@ *******************************************************************************/ #include // atexit, getenv -#include #include #include +#include // access -#include -#include #include +#include #include #include +#include #include #include +#include "ErrorHandler.hh" #include "GameLayer.hh" #include "MainLayer.hh" #include "TitleLayer.hh" @@ -46,25 +47,18 @@ #if HAVE_CONFIG_H #include "config.h" #endif +#include "version.h" MainLayer::MainLayer() { - Mf::dispatcher::addHandler("video.context_recreated", - boost::bind(&MainLayer::contextRecreated, this, _1), this); + mDispatchHandler = Mf::engine.addHandler("video.newcontext", + boost::bind(&MainLayer::contextRecreated, this)); setupGL(); } -MainLayer::~MainLayer() +void MainLayer::pushedOntoEngine() { - 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); @@ -73,10 +67,20 @@ void MainLayer::pushed(Mf::Engine& e) //Mf::Transition::alloc(gameLayer, Mf::LayerP(), interp); //engine->push(transition); //engine->push(GameLayer::alloc()); - engine->push(TitleLayer::alloc()); + Mf::engine.push(TitleLayer::alloc()); } +void MainLayer::update(Mf::Scalar t, Mf::Scalar dt) +{ + if (Mf::engine.getSize() == 1) + { + // this is the only layer left on the stack + //Mf::engine.push(TitleLayer::alloc()); + Mf::engine.clear(); + } +} + void MainLayer::draw(Mf::Scalar alpha) const { glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); @@ -92,24 +96,20 @@ bool MainLayer::handleEvent(const Mf::Event& event) { switch (event.type) { - case SDL_KEYDOWN: + case SDL_KEYUP: if (event.key.keysym.sym == SDLK_ESCAPE) { - quit(); + Mf::engine.clear(); } else if (event.key.keysym.sym == SDLK_f) { - engine->getVideo().toggleFull(); + Mf::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 = Mf::engine.getVideo(); + video->toggleCursorGrab(); + video->toggleCursorVisible(); } break; @@ -118,24 +118,13 @@ bool MainLayer::handleEvent(const Mf::Event& event) break; case SDL_QUIT: - quit(); + Mf::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() { @@ -160,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 @@ -171,12 +160,15 @@ void MainLayer::contextRecreated(const Mf::Notification* note) void printUsage() { - std::cout << "Usage: "PACKAGE" [-h|--help] [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 << " -h, --help" << std::endl << " show this help and exit" << std::endl + << " -i, --info" << std::endl + << " show version and build information" << std::endl << " detail=1|2|3" << std::endl << " the level of detail of game scenes" << std::endl << " fullscreen=true|false" << std::endl @@ -187,20 +179,90 @@ void printUsage() << "See documentation for more options." << std::endl; } +void printInfo(int argc, char* argv[]) +{ + std::string assets; + std::string datadir; + std::string config; + + assets.assign(YOINK_DATADIR); + int accessible = access(assets.c_str(), R_OK); + if (accessible != 0) assets += " (no access)"; + + char* temp = getenv("YOINK_DATADIR"); + if (temp) + { + datadir = temp; + accessible = access(temp, R_OK); + if (accessible != 0) datadir += " (no access)"; + } + + temp = getenv("YOINKRC"); + if (temp) + { + config = temp; + accessible = access(temp, R_OK); + if (accessible != 0) config += " (no access)"; + } + + std::cout << " Executable: " << argv[0] << std::endl + << " Version: "VERSION << std::endl + << " Built: " << COMPILE_TIME << std::endl + << " Compiler: "COMPILER_STRING << std::endl + << " Assets: " << assets << std::endl + << "Build options: " +#ifdef NDEBUG + << "-" +#endif + << "debug " +#ifndef USE_DOUBLE_PRECISION + << "-" +#endif + << "double-precision " +#ifndef USE_GTK + << "-" +#endif + << "gtk " +#ifndef PROFILING_ENABLED + << "-" +#endif + << "profile " +#ifndef USE_QT4 + << "-" +#endif + << "qt4 " +#ifndef USE_THREADS + << "-" +#endif + << "threads" << std::endl + << " YOINKRC: " << config << std::endl + << "YOINK_DATADIR: " << datadir << std::endl; +} + void goodbye() { std::cout << std::endl << "Goodbye..." << std::endl << std::endl; } + int main(int argc, char* argv[]) { - if (argc > 1 && - (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0)) + if (argc > 1) { - printUsage(); - return 0; + std::string arg(argv[1]); + if (arg == "-h" || arg == "--help") + { + printUsage(); + return 0; + } + else if (arg == "-i" || arg == "--info") + { + printInfo(argc, argv); + return 0; + } } + std::cout << std::endl << PACKAGE_STRING << std::endl << "Compiled " << __TIME__ " " __DATE__ << std::endl << "Send patches and bug reports to <" @@ -209,16 +271,28 @@ 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); + // make sure the engine started up okay + if (Mf::engine.getError().isError()) + { + Mf::ModalDialog dialog; + dialog.title = PACKAGE_STRING; + dialog.text1 = "Fatal Error"; + dialog.text2 = getErrorString(Mf::engine.getError()); + dialog.type = Mf::ModalDialog::CRITICAL; + dialog.run(); + + return 1; + } + + +#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 @@ -234,19 +308,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) @@ -255,19 +330,30 @@ 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); - app.push(MainLayer::alloc()); + Mf::engine.setVideo(Mf::Video::alloc(PACKAGE_STRING, iconFile)); + Mf::engine.push(MainLayer::alloc()); - app.run(); + Mf::engine.run(); } - catch (Mf::Exception e) + catch (const Mf::Error& error) { - 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(error); + dialog.type = Mf::ModalDialog::CRITICAL; + dialog.run(); + + return 1; } return 0;