#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"
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);
//Mf::Transition<Mf::Lerp>::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);
{
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;
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
- mEngine->clear();
-#endif
-}
-
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
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: "
<< "-"
#endif
<< "double-precision "
+#ifndef USE_GTK
+ << "-"
+#endif
+ << "gtk "
#ifndef PROFILING_ENABLED
<< "-"
#endif
<< "profile "
+#ifndef USE_QT4
+ << "-"
+#endif
+ << "qt4 "
#ifndef USE_THREADS
<< "-"
#endif
}
-typedef cml::matrix< Mf::Scalar, cml::fixed<5,5>,
- cml::col_basis, cml::col_major > Matrix5;
-
int main(int argc, char* argv[])
{
if (argc > 1)
}
}
+
std::cout << std::endl << PACKAGE_STRING << std::endl
<< "Compiled " << __TIME__ " " __DATE__ << std::endl
<< "Send patches and bug reports to <"
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:
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)
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 (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;
projects / chaz / yoink / blobdiff