]> Dogcows Code - chaz/yoink/blobdiff - src/MainLayer.cc
moved log level from configure to setting
[chaz/yoink] / src / MainLayer.cc
index 51881a770d0e03d8f6d2846c96542c4a2e265d34..ad2dbbc5f22d9a607f69327783032eee338c4236 100644 (file)
 
 *******************************************************************************/
 
-#include <cstdlib>             // getenv
-#include <cstring>
+#include <cstdlib>             // atexit, getenv
 #include <iostream>
 #include <string>
+#include <unistd.h>            // access
 
-#include <Moof/Dispatcher.hh>
-#include <Moof/Exception.hh>
 #include <Moof/Log.hh>
+#include <Moof/ModalDialog.hh>
 #include <Moof/OpenGL.hh>
 #include <Moof/Resource.hh>
+#include <Moof/Settings.hh>
+#include <Moof/Transition.hh>
 #include <Moof/Video.hh>
 
+#include "ErrorHandler.hh"
 #include "GameLayer.hh"
 #include "MainLayer.hh"
+#include "TitleLayer.hh"
 
 #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);
+       //Mf::Scalar coeff[] = {0.0, 1.0};
+       //Mf::Lerp interp(coeff, 0.25);
+
+       //Mf::LayerP gameLayer = GameLayer::alloc();
+       //Mf::Transition<Mf::Lerp>::Ptr transition =
+               //Mf::Transition<Mf::Lerp>::alloc(gameLayer, Mf::LayerP(), interp);
+       //engine->push(transition);
+       //engine->push(GameLayer::alloc());
+       Mf::engine.push(TitleLayer::alloc());
 }
 
 
-void MainLayer::pushed(Mf::Engine& e)
+void MainLayer::update(Mf::Scalar t, Mf::Scalar dt)
 {
-       engine = &e;
-       engine->pushLayer(GameLayer::alloc());
+       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_DEPTH_BUFFER_BIT);
+       glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+       glMatrixMode(GL_PROJECTION);
+       glLoadIdentity();
+
+       glMatrixMode(GL_MODELVIEW);
+       glLoadIdentity();
 }
 
 bool MainLayer::handleEvent(const Mf::Event& event)
 {
        switch (event.type)
        {
-               case SDL_KEYDOWN:
+               case SDL_KEYUP:
                        if (event.key.keysym.sym == SDLK_ESCAPE)
                        {
-                               engine->clearLayers();
+                               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->pushLayer(GameLayer::alloc());
+                               Mf::VideoP video = Mf::engine.getVideo();
+                               video->toggleCursorGrab();
+                               video->toggleCursorVisible();
                        }
                        break;
 
+               case SDL_VIDEORESIZE:
+                       glViewport(0, 0, event.resize.w, event.resize.h);
+                       break;
+
                case SDL_QUIT:
-                       engine->clearLayers();
+                       Mf::engine.clear();
                        break;
        }
 
@@ -108,34 +129,29 @@ bool MainLayer::handleEvent(const Mf::Event& event)
 void MainLayer::setupGL()
 {
        glEnable(GL_TEXTURE_2D);
-
-       //glEnable(GL_CULL_FACE);
        glEnable(GL_DEPTH_TEST);
 
+       glEnable(GL_LINE_SMOOTH);
+       glEnable(GL_POLYGON_SMOOTH);
        glShadeModel(GL_SMOOTH);
-       //glEnable(GL_POLYGON_SMOOTH);
 
-       //int texSize;
-       //glGetIntegerv(GL_MAX_TEXTURE_SIZE, &texSize);
-       //std::cout << "texture size: " << texSize << std::endl;
-       
        //glEnable(GL_BLEND);
        //glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
        glEnable(GL_ALPHA_TEST);
        glAlphaFunc(GL_GREATER, 0.0);
 
-       glClearColor(1.0, 0.0, 0.0, 1.0);
+       glClearColor(0.0, 0.0, 0.0, 1.0);
 
        //glMatrixMode(GL_PROJECTION);
        //glLoadIdentity();
-       //gluPerspective(60.0, 1.33333, 1.0, 2500.0);
+       //Mf::Scalar ratio = Mf::engine.getVideo()->getWidth() /
+               //Mf::engine.getVideo()->getHeight();
+       //gluPerspective(60.0, ratio, 1.0, 250.0);
 
        //glMatrixMode(GL_MODELVIEW);
-       
-       //glLineWidth(10.0f);
 }
 
-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
@@ -146,12 +162,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
@@ -162,32 +181,112 @@ 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 <"
                          PACKAGE_BUGREPORT << ">." << std::endl << std::endl;
 
+       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:
@@ -202,19 +301,18 @@ 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";
+       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)
@@ -223,22 +321,37 @@ 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.pushLayer(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;
        }
 
-       std::cout << std::endl << "Goodbye..." << std::endl << std::endl;
        return 0;
 }
 
This page took 0.025578 seconds and 4 git commands to generate.