X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMainLayer.cc;h=ad2dbbc5f22d9a607f69327783032eee338c4236;hp=6a426fb8f41c89cfba117571a945a554854fffb9;hb=be9ebc1104574e5e81e19c5caba0c23b54df826d;hpb=cfe38a72ab859538db6269bc9b97f55e8f1f8709 diff --git a/src/MainLayer.cc b/src/MainLayer.cc index 6a426fb..ad2dbbc 100644 --- a/src/MainLayer.cc +++ b/src/MainLayer.cc @@ -31,15 +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" @@ -52,21 +52,13 @@ 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& engine) -{ - mEngine = &engine; - //Mf::Scalar coeff[] = {0.0, 1.0}; //Mf::Lerp interp(coeff, 0.25); @@ -75,10 +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()); + 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); @@ -94,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) { - mEngine->getVideo().toggleFull(); + Mf::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 = Mf::engine.getVideo(); + video->toggleCursorGrab(); + video->toggleCursorVisible(); } break; @@ -120,19 +118,13 @@ bool MainLayer::handleEvent(const Mf::Event& event) break; case SDL_QUIT: - quit(); + Mf::engine.clear(); break; } return false; } -void MainLayer::quit() -{ - // remove all the layers - mEngine->clear(); -} - void MainLayer::setupGL() { @@ -150,14 +142,16 @@ void MainLayer::setupGL() glClearColor(0.0, 0.0, 0.0, 1.0); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - gluPerspective(60.0, 1.33333, 1.0, 2500.0); + //glMatrixMode(GL_PROJECTION); + //glLoadIdentity(); + //Mf::Scalar ratio = Mf::engine.getVideo()->getWidth() / + //Mf::engine.getVideo()->getHeight(); + //gluPerspective(60.0, ratio, 1.0, 250.0); - glMatrixMode(GL_MODELVIEW); + //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 @@ -215,9 +209,7 @@ void printInfo(int argc, char* argv[]) std::cout << " Executable: " << argv[0] << std::endl << " Version: "VERSION << std::endl -#if defined(__DATE__) && defined(__TIME__) - << " Built: "__DATE__" "__TIME__ << std::endl -#endif + << " Built: " << COMPILE_TIME << std::endl << " Compiler: "COMPILER_STRING << std::endl << " Assets: " << assets << std::endl << "Build options: " @@ -272,6 +264,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 <" @@ -280,17 +273,20 @@ 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); -#elif YOINK_LOGLEVEL >= 2 - Mf::setLogLevel(Mf::LOG_SCRIPT); -#elif YOINK_LOGLEVEL >= 1 - Mf::setLogLevel(Mf::LOG_ERROR); -#elif YOINK_LOGLEVEL - Mf::setLogLevel(Mf::LOG_NONE); -#endif + // make sure the engine started up okay + const Mf::Error& error = Mf::engine.getError(); + if (error.isError()) + { + Mf::ModalDialog dialog; + dialog.title = PACKAGE_STRING; + dialog.text1 = "Uh oh!"; + dialog.text2 = getErrorString(error); + dialog.type = Mf::ModalDialog::CRITICAL; + dialog.run(); + + // openal errors are not fatal + if (error.code() != Mf::Error::OPENAL_INIT) return 1; + } // Add search paths; they should be searched in this order: @@ -305,19 +301,18 @@ int main(int argc, char* argv[]) Mf::Resource::addSearchPath(YOINK_DATADIR); - std::string iconFile = Mf::Resource::getPath(PACKAGE".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"; + std::string configFiles = Mf::Resource::getPath("yoinkrc"); +#if !defined(_WIN32) && !defined(__WIN32__) + configFiles += ":/etc/yoinkrc"; +#endif + configFiles += ":$HOME/.yoinkrc"; char* configFile = getenv("YOINKRC"); if (configFile) @@ -326,22 +321,31 @@ int main(int argc, char* argv[]) configFiles += configFile; } + Mf::Settings& settings = Mf::Settings::getInstance(); + settings.loadFromFile(configFiles); + settings.parseArgs(argc, argv); + + Mf::Log::Level logLevel; + if (settings.get("loglevel", logLevel)) Mf::Log::setLevel(logLevel); + + Mf::engine.initWithSettings(settings); + + 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 (const Mf::Exception& e) + catch (const Mf::Error& error) { - Mf::logError("unhandled exception (code %d): \"%s\"", - e.code(), e.what()); - Mf::ModalDialog dialog; dialog.title = PACKAGE_STRING; dialog.text1 = "Unhandled Exception"; - dialog.text2 = e.what(); + dialog.text2 = getErrorString(error); dialog.type = Mf::ModalDialog::CRITICAL; dialog.run();