foundational changes; tying up some loose ends

[chaz/yoink] / src / MainLayer.cc

diff --git a/src/MainLayer.cc b/src/MainLayer.cc
index 6a426fb8f41c89cfba117571a945a554854fffb9..38c849ebd08129cf2c2f83dcc447329f5546db3a 100644 (file)
--- a/src/MainLayer.cc
+++ b/src/MainLayer.cc
@@ -31,15 +31,15 @@
 #include <string>
 #include <unistd.h>            // access
 
 #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/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 <Moof/Transition.hh>
 #include <Moof/Video.hh>
 

+#include "ErrorHandler.hh"

 #include "GameLayer.hh"
 #include "MainLayer.hh"
 #include "TitleLayer.hh"
 #include "GameLayer.hh"
 #include "MainLayer.hh"
 #include "TitleLayer.hh"


@@ -52,21 +52,13 @@
 
 MainLayer::MainLayer()
 {
 
 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();
 }
 
        setupGL();
 }
 

-MainLayer::~MainLayer()
-{
-       Mf::dispatcher::removeHandler(this);
-}
-
-

 void MainLayer::pushed(Mf::Engine& engine)
 {
 void MainLayer::pushed(Mf::Engine& engine)
 {

-       mEngine = &engine;
-

        //Mf::Scalar coeff[] = {0.0, 1.0};
        //Mf::Lerp interp(coeff, 0.25);
 
        //Mf::Scalar coeff[] = {0.0, 1.0};
        //Mf::Lerp interp(coeff, 0.25);
 


@@ -75,11 +67,20 @@ void MainLayer::pushed(Mf::Engine& engine)
                //Mf::Transition<Mf::Lerp>::alloc(gameLayer, Mf::LayerP(), interp);
        //engine->push(transition);
        //engine->push(GameLayer::alloc());
                //Mf::Transition<Mf::Lerp>::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);
 
 {
        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 


@@ -90,28 +91,24 @@ void MainLayer::draw(Mf::Scalar alpha) const
        glLoadIdentity();
 }
 
        glLoadIdentity();
 }
 

-bool MainLayer::handleEvent(const Mf::Event& event)
+bool MainLayer::handleEvent(Mf::Engine& engine, const Mf::Event& event)

 {
        switch (event.type)
        {
 {
        switch (event.type)
        {

-               case SDL_KEYDOWN:
+               case SDL_KEYUP:

                        if (event.key.keysym.sym == SDLK_ESCAPE)
                        {
                        if (event.key.keysym.sym == SDLK_ESCAPE)
                        {

-                               quit();
+                               engine.clear();

                        }
                        else if (event.key.keysym.sym == SDLK_f)
                        {
                        }
                        else if (event.key.keysym.sym == SDLK_f)
                        {

-                               mEngine->getVideo().toggleFull();
+                               engine.getVideo()->toggleFull();

                        }
                        else if (event.key.keysym.sym == SDLK_l)
                        {
                        }
                        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;
 
                        }
                        break;
 


@@ -120,19 +117,13 @@ bool MainLayer::handleEvent(const Mf::Event& event)
                        break;
 
                case SDL_QUIT:
                        break;
 
                case SDL_QUIT:

-                       quit();
+                       engine.clear();

                        break;
        }
 
        return false;
 }
 
                        break;
        }
 
        return false;
 }
 

-void MainLayer::quit()
-{
-       // remove all the layers
-       mEngine->clear();
-}
-

 
 void MainLayer::setupGL()
 {
 
 void MainLayer::setupGL()
 {


@@ -157,7 +148,7 @@ void MainLayer::setupGL()
        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
 {
        // 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


@@ -272,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 <"
        std::cout << std::endl << PACKAGE_STRING << std::endl
                          << "Compiled " << __TIME__ " " __DATE__ << std::endl
                          << "Send patches and bug reports to <"


@@ -305,19 +297,20 @@ int main(int argc, char* argv[])
 
        Mf::Resource::addSearchPath(YOINK_DATADIR);
 
 
        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
 
        // 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");
        // 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)
 
        char* configFile = getenv("YOINKRC");
        if (configFile)


@@ -326,22 +319,27 @@ int main(int argc, char* argv[])
                configFiles += configFile;
        }
 
                configFiles += configFile;
        }
 

+       Mf::Settings& settings = Mf::Settings::getInstance();
+       settings.loadFromFile(configFiles);
+       settings.parseArgs(argc, argv);
+
+       std::string iconFile = Mf::Resource::getPath(PACKAGE".png");
+
+

        try
        {
        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 (const Mf::Exception& e)
        {
                app.push(MainLayer::alloc());
 
                app.run();
        }
        catch (const Mf::Exception& e)
        {

-               Mf::logError("unhandled exception (code %d): \"%s\"",
-                               e.code(), e.what());
-

                Mf::ModalDialog dialog;
                dialog.title = PACKAGE_STRING;
                dialog.text1 = "Unhandled Exception";
                Mf::ModalDialog dialog;
                dialog.title = PACKAGE_STRING;
                dialog.text1 = "Unhandled Exception";

-               dialog.text2 = e.what();
+               dialog.text2 = getErrorString(e);

                dialog.type = Mf::ModalDialog::CRITICAL;
                dialog.run();
 
                dialog.type = Mf::ModalDialog::CRITICAL;
                dialog.run();