X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMain.cc;h=a674bbcb0dd9675a560cd2e6564f8c17da1aa7b4;hp=046c7bcffb71560e42b24b3b9e9f5d74c971946d;hb=6c9943707d4f33035830eba0587a61a34eaecbc2;hpb=382626aad0a683ed8642a6a807eea743db45f7f8 diff --git a/src/Main.cc b/src/Main.cc index 046c7bc..a674bbc 100644 --- a/src/Main.cc +++ b/src/Main.cc @@ -17,43 +17,46 @@ #include #include +#if PLATFORM_WIN32 +inline int isatty(int dummy) { return 0; } +#else +#include +#endif + #include #include +#include #include #include #include #include #include +#include #include -#include "GameLayer.hh" #include "Main.hh" -#include "TitleLayer.hh" -#include "version.h" -Main::Main(moof::settings& settings, moof::video& video) : - moof::view(settings, video) +Main::Main(moof::settings& settings) : + moof::application(settings) { moof::dispatcher& dispatcher = moof::dispatcher::global(); - mNewContextDispatch = dispatcher.add_target("video.newcontext", - boost::bind(&Main::setupGL)); - setupGL(); + video_reloaded_ = dispatcher.add_target("video.newcontext", + boost::bind(&Main::setup_opengl)); + setup_opengl(); + +#if ENABLE_HOTLOADING + hotload_timer_.init(boost::bind(&moof::resource::reload_as_needed), + SCALAR(0.25), + moof::timer::repeat); +#endif } void Main::update(moof::scalar t, moof::scalar dt) { - if (children().size() == 0) - { - //moof::log_warning("main view has no children"); - //stop(); - //return; - add_child(TitleLayer::alloc()); - } - - moof::view::update(t, dt); + yoink.update(t, dt); } void Main::draw(moof::scalar alpha) const @@ -66,41 +69,45 @@ void Main::draw(moof::scalar alpha) const glMatrixMode(GL_MODELVIEW); glLoadIdentity(); - moof::view::draw(alpha); + yoink.draw(alpha); } -bool Main::handle_event(const moof::event& event) +void Main::handle_event(const moof::event& event) { - if (moof::view::handle_event(event)) return true; + if (yoink.handle_event(event)) return; switch (event.type) { case SDL_KEYUP: + if (event.key.keysym.sym == SDLK_f) { - video().toggle_fullscreen(); + moof::video::current()->toggle_fullscreen(); } else if (event.key.keysym.sym == SDLK_l) { - video().toggle_cursor_captured(); - video().toggle_cursor_visible(); + moof::video::current()->toggle_cursor_captured(); + moof::video::current()->toggle_cursor_visible(); + } + else if (event.key.keysym.sym == SDLK_ESCAPE) + { + stop(); } break; case SDL_VIDEORESIZE: + glViewport(0, 0, event.resize.w, event.resize.h); break; case SDL_QUIT: + stop(); - return true; } - - return false; } -std::string Main::getSearchPath() +std::string Main::search_paths() { // Add search paths; they should be searched in this order: // 1. YOINK_DATADIR (environment) @@ -114,11 +121,13 @@ std::string Main::getSearchPath() path += ":"; } path += YOINK_DATADIR; + path += ":"; + path += "data"; return path; } -std::string Main::getConfigPath() +std::string Main::config_paths() { // Build the list of config files to search for, in this order: // 1. YOINK_DATADIR/yoinkrc @@ -128,7 +137,7 @@ std::string Main::getConfigPath() std::string path = moof::resource::find_file("yoinkrc"); -#if !defined(_WIN32) +#if PLATFORM_POSIX path += ":/etc/yoinkrc"; #endif path += ":$HOME/.yoinkrc"; @@ -144,11 +153,13 @@ std::string Main::getConfigPath() } -void Main::setupGL() +void Main::setup_opengl() { glEnable(GL_TEXTURE_2D); glEnable(GL_DEPTH_TEST); + //glEnable(GL_CULL_FACE); + glEnable(GL_POINT_SMOOTH); glEnable(GL_LINE_SMOOTH); glEnable(GL_POLYGON_SMOOTH); glShadeModel(GL_SMOOTH); @@ -158,19 +169,26 @@ void Main::setupGL() glEnable(GL_ALPHA_TEST); glAlphaFunc(GL_GREATER, 0.0); - glClearColor(0.0, 0.0, 0.0, 1.0); + glClearColor(1.0, 0.0, 0.0, 1.0); - //glMatrixMode(GL_PROJECTION); - //glLoadIdentity(); - //moof::scalar ratio = moof::core.getVideo()->width() / - //moof::core.getVideo()->height(); - //gluPerspective(60.0, ratio, 1.0, 250.0); + //glEnable(GL_LIGHTING); + glEnable(GL_LIGHT0); - //glMatrixMode(GL_MODELVIEW); + glEnable(GL_COLOR_MATERIAL); + glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE); + + float amb[] = {0.1f, 0.1f, 0.1f, 1.0f}; + float dif[] = {0.6f, 0.6f, 0.6f, 1.0f}; + //glLightModelfv(GL_LIGHT_MODEL_AMBIENT, light); + glLightfv(GL_LIGHT0, GL_AMBIENT, amb); + glLightfv(GL_LIGHT0, GL_DIFFUSE, dif); + + float spec[] = {1.0f, 1.0f, 1.0f, 1.0f}; + glLightfv(GL_LIGHT0, GL_SPECULAR, spec); } -void Main::printUsage() +void Main::print_usage() { std::cout << "Usage: " << PACKAGE" [-h|--help] [-i|--info] [OPTION=VALUE]..." @@ -192,117 +210,59 @@ void Main::printUsage() << "See documentation for more options." << std::endl; } -void Main::printInfo(int argc, char* argv[]) +void Main::print_info(int argc, char* argv[]) { - stlplus::env_vector environment; - - std::string assets; - assets.assign(YOINK_DATADIR); - if (!stlplus::file_readable(assets)) assets += " (no access)"; - - std::string datadir = environment["YOINK_DATADIR"]; - if (!datadir.empty()) - { - if (!stlplus::folder_readable(datadir)) datadir += " (no access)"; - } +#if INCLUDE_CONFIG_FILE + extern char data_config_mk[]; + std::cout << data_config_mk; +#else + std::cout << std::endl << "Configuration not included." << std::endl; +#endif +} - std::string rc_file = environment["YOINKRC"]; - if (!rc_file.empty()) +void Main::print_option(const std::string& option, bool enabled) +{ + if (isatty(1) == 1) { - if (!stlplus::file_readable(rc_file)) rc_file += " (no access)"; + if (enabled) std::cout << "\033[1;94m"; + else std::cout << "\033[1m"; } - - std::cout << " Executable: " << argv[0] << std::endl -#ifdef YOINK_GITHEAD - << " Commit: "YOINK_GITHEAD << std::endl -#endif - << " Version: " << PACKAGE_VERSION << std::endl - << " Built: " << COMPILE_TIME << std::endl - << " Compiler: " << COMPILER_STRING << std::endl - << " Assets: " << assets << std::endl - << "Build options: " -#ifndef HAVE_CLOCK_GETTIME - << "-" -#endif - << "clock_gettime " -#ifdef NDEBUG - << "-" -#endif - << "debug " -#ifndef USE_DOUBLE_PRECISION - << "-" -#endif - << "double-precision " -#ifndef USE_GTK - << "-" -#endif - << "gtk " -#ifndef USE_HOTLOADING - << "-" -#endif - << "hotloading " -#ifndef PROFILING_ENABLED - << "-" -#endif - << "profile " -#ifndef USE_QT4 - << "-" -#endif - << "qt4 " -#ifndef USE_THREADS - << "-" -#endif - << "threads" << std::endl - << " YOINKRC: " << rc_file << std::endl - << "YOINK_DATADIR: " << datadir << std::endl; + if (!enabled) std::cout << "-"; + std::cout << option; + if (isatty(1) == 1) std::cout << "\033[0m"; + std::cout << " "; } void hello() { + if (isatty(1) == 1) std::cout << "\033[94m"; 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; + PACKAGE_BUGREPORT << ">." << std::endl << moof::log::endl; } void goodbye() { - std::cout << std::endl << "Goodbye..." << std::endl << std::endl; + if (isatty(1) == 1) std::cout << "\033[94m"; + std::cout << std::endl << "Goodbye." << std::endl << moof::log::endl; } -#include -#include -#include - - int main(int argc, char* argv[]) { - //moof::backend backend; - //moof::resource::add_search_paths(Main::getSearchPath()); - - //moof::image hey("textures/AlienWarrior.png"); - - //return 0; - - - // FIXME: This is temporary. - moof::timer reloadTimer(boost::bind(&moof::resource::reload_as_needed), - SCALAR(2.0), - moof::timer::repeat); - if (argc > 1) { std::string arg(argv[1]); if (arg == "-h" || arg == "--help") { - Main::printUsage(); + Main::print_usage(); return 0; } else if (arg == "-i" || arg == "--info") { - Main::printInfo(argc, argv); + Main::print_info(argc, argv); return 0; } } @@ -310,9 +270,11 @@ int main(int argc, char* argv[]) hello(); atexit(goodbye); - moof::resource::add_search_paths(Main::getSearchPath()); + moof::backend backend; + + moof::resource::set_search_paths(Main::search_paths()); - moof::settings settings(argc, argv, Main::getConfigPath()); + moof::settings settings(argc, argv, Main::config_paths()); enum moof::log::level logLevel = moof::log::info; settings.get("loglevel", logLevel); @@ -320,28 +282,33 @@ int main(int argc, char* argv[]) try { - //std::string iconPath(PACKAGE".png"); - //iconPath = moof::resource::find_file(iconPath); - //moof::image icon(iconPath); - //icon.set_as_icon(); - moof::image_handle icon(PACKAGE".png"); + moof::image_handle icon("yoink", "png"); if (icon) icon->set_as_icon(); + else moof::log_error("no icon loaded"); + icon.unload(); class moof::video::attributes attributes(settings); moof::video video(PACKAGE_STRING, attributes); - Main mainView(settings, video); + video.show_fps(true); - mainView.run(); - return 0; + Main app(settings); + return app.run(); } catch (const std::exception& e) { moof::modal_dialog dialog(moof::modal_dialog::error, - PACKAGE_STRING, "Unhandled Exception", + PACKAGE_STRING, "unhandled exception", e.what()); - dialog.run(); - return 1; } + catch (const char* e) + { + moof::modal_dialog dialog(moof::modal_dialog::error, + PACKAGE_STRING, "unhandled exception", + e); + dialog.run(); + } + + return 1; }