X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMain.cc;h=8361b39d3dffe7a5e24eda753650e2722aad6092;hp=91a8d080ba04d14df9114e8a112f3ba179e4a63c;hb=e0fb747f2e647115d0b8953615c254d25c045345;hpb=837bae9f2bf7b25e1d3d2625eeaf39c1d2f48827 diff --git a/src/Main.cc b/src/Main.cc index 91a8d08..8361b39 100644 --- a/src/Main.cc +++ b/src/Main.cc @@ -9,62 +9,54 @@ * **************************************************************************/ -#include // atexit, getenv +#include "../config.h" + +#include // atexit +#include +#include #include #include -#include // access -#include -#include -#include -#include -#include -#include -#include +#include +#include + +#include +#include +#include +#include +#include +#include -#include "ErrorHandler.hh" #include "GameLayer.hh" #include "Main.hh" #include "TitleLayer.hh" - -#if HAVE_CONFIG_H -#include "config.h" -#endif #include "version.h" -Main::Main() +Main::Main(moof::settings& settings, moof::video& video) : + moof::view(settings, video) { - mDispatchHandler = Mf::core.addHandler("video.newcontext", - boost::bind(&Main::contextCreated)); + moof::dispatcher& dispatcher = moof::dispatcher::global(); + mNewContextDispatch = dispatcher.add_target("video.newcontext", + boost::bind(&Main::setupGL)); setupGL(); } -void Main::addedToCore() -{ - //Mf::Scalar coeff[] = {0.0, 1.0}; - //Mf::Lerp interp(coeff, 0.25); - - //Mf::LayerP gameLayer = GameLayer::alloc(); - //Mf::Transition::Ptr transition = - //Mf::Transition::alloc(gameLayer, Mf::LayerP(), interp); - //core.push(transition); - //core.push(GameLayer::alloc()); - Mf::core.push(TitleLayer::alloc()); -} - -void Main::update(Mf::Scalar t, Mf::Scalar dt) +void Main::update(moof::scalar t, moof::scalar dt) { - if (Mf::core.getSize() == 1) + if (children().size() == 0) { - // this is the only layer left on the stack - //Mf::core.push(TitleLayer::alloc()); - Mf::core.clear(); + //moof::log_warning("main view has no children"); + //stop(); + //return; + add_child(TitleLayer::alloc()); } + + moof::view::update(t, dt); } -void Main::draw(Mf::Scalar alpha) const +void Main::draw(moof::scalar alpha) const { glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); @@ -73,25 +65,25 @@ void Main::draw(Mf::Scalar alpha) const glMatrixMode(GL_MODELVIEW); glLoadIdentity(); + + moof::view::draw(alpha); } -bool Main::handleEvent(const Mf::Event& event) +bool Main::handle_event(const moof::event& event) { + if (moof::view::handle_event(event)) return true; + switch (event.type) { case SDL_KEYUP: - if (event.key.keysym.sym == SDLK_ESCAPE) + if (event.key.keysym.sym == SDLK_f) { - Mf::core.clear(); - } - else if (event.key.keysym.sym == SDLK_f) - { - Mf::video->toggleFull(); + video().toggle_fullscreen(); } else if (event.key.keysym.sym == SDLK_l) { - Mf::video->toggleCursorGrab(); - Mf::video->toggleCursorVisible(); + video().toggle_cursor_captured(); + video().toggle_cursor_visible(); } break; @@ -100,8 +92,8 @@ bool Main::handleEvent(const Mf::Event& event) break; case SDL_QUIT: - Mf::core.clear(); - break; + stop(); + return true; } return false; @@ -114,12 +106,13 @@ std::string Main::getSearchPath() // 1. YOINK_DATADIR (environment) // 2. YOINK_DATADIR (configure) - std::string path; + std::string path; + stlplus::env_vector environment; - char* dataDir = getenv("YOINK_DATADIR"); - if (dataDir) + std::string datadir = environment["YOINK_DATADIR"]; + if (!datadir.empty()) { - path += dataDir; + path += datadir; path += ":"; } path += YOINK_DATADIR; @@ -135,18 +128,21 @@ std::string Main::getConfigPath() // 3. $HOME/.yoinkrc // 4. YOINKRC (environment) - std::string path = Mf::Resource::getPath("yoinkrc"); + std::string path("yoinkrc"); + moof::resource::find(path); -#if !defined(_WIN32) && !defined(__WIN32__) + stlplus::env_vector environment; + +#if !defined(_WIN32) path += ":/etc/yoinkrc"; #endif path += ":$HOME/.yoinkrc"; - char* configFile = getenv("YOINKRC"); - if (configFile) + std::string rc_file = environment["YOINKRC"]; + if (!rc_file.empty()) { path += ":"; - path += configFile; + path += rc_file; } return path; @@ -171,21 +167,13 @@ void Main::setupGL() //glMatrixMode(GL_PROJECTION); //glLoadIdentity(); - //Mf::Scalar ratio = Mf::core.getVideo()->getWidth() / - //Mf::core.getVideo()->getHeight(); + //moof::scalar ratio = moof::core.getVideo()->width() / + //moof::core.getVideo()->height(); //gluPerspective(60.0, ratio, 1.0, 250.0); //glMatrixMode(GL_MODELVIEW); } -void Main::contextCreated() -{ - // 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 - setupGL(); -} - - void Main::printUsage() { @@ -211,36 +199,37 @@ void Main::printUsage() void Main::printInfo(int argc, char* argv[]) { - std::string assets; - std::string datadir; - std::string config; + stlplus::env_vector environment; + std::string assets; assets.assign(YOINK_DATADIR); - int accessible = access(assets.c_str(), R_OK); - if (accessible != 0) assets += " (no access)"; + if (!stlplus::file_readable(assets)) assets += " (no access)"; - char* temp = getenv("YOINK_DATADIR"); - if (temp) + std::string datadir = environment["YOINK_DATADIR"]; + if (!datadir.empty()) { - datadir = temp; - accessible = access(temp, R_OK); - if (accessible != 0) datadir += " (no access)"; + if (!stlplus::folder_readable(datadir)) datadir += " (no access)"; } - temp = getenv("YOINKRC"); - if (temp) + std::string rc_file = environment["YOINKRC"]; + if (!rc_file.empty()) { - config = temp; - accessible = access(temp, R_OK); - if (accessible != 0) config += " (no access)"; + if (!stlplus::file_readable(rc_file)) rc_file += " (no access)"; } std::cout << " Executable: " << argv[0] << std::endl +#ifdef YOINK_GITHEAD + << " Commit: "YOINK_GITHEAD << std::endl +#endif << " Version: "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 @@ -253,6 +242,10 @@ void Main::printInfo(int argc, char* argv[]) << "-" #endif << "gtk " +#ifndef USE_HOTLOADING + << "-" +#endif + << "hotloading " #ifndef PROFILING_ENABLED << "-" #endif @@ -265,7 +258,7 @@ void Main::printInfo(int argc, char* argv[]) << "-" #endif << "threads" << std::endl - << " YOINKRC: " << config << std::endl + << " YOINKRC: " << rc_file << std::endl << "YOINK_DATADIR: " << datadir << std::endl; } @@ -283,8 +276,114 @@ void goodbye() std::cout << std::endl << "Goodbye..." << std::endl << std::endl; } + +#include + +#include + +class MyAsset +{ +public: + MyAsset(const std::string& path) + { + moof::log_info("MyAsset loading:", path); + + char buffer[1024]; + + std::ifstream stream(path.c_str()); + stream.getline(buffer, sizeof(buffer)); + str = buffer; + stream.close(); + + cool(); + } + + void cool() + { + moof::log_info("MyAsset COOL:", str); + } + + void groovy() + { + moof::log_info("MyAsset GROOVY!!!!", str); + } + + std::string str; +}; + +typedef moof::resource_handle MyAsset_handle; + +class AnotherAsset +{ +public: + AnotherAsset(const std::string& path, double d = 5.0) + { + moof::log_info("AnotherAsset loading:", path); + dude = d; + } + + + void cool() + { + moof::log_info("AnotherAsset cool", dude); + } + + void groovy() + { + moof::log_info("AnotherAsset GROOVY!!!!", dude); + } + + double dude; +}; + + int main(int argc, char* argv[]) { + moof::resource::register_type("mine"); + + //moof::resource::add_type("k"); + + //{ + //moof::resource_ptr myAsset = moof::resource::load(assetName, + //"prefix", "mine"); + + //MyAsset_handle aCopy = myAsset; + + //MyAsset_handle copy2 = moof::resource::load(assetName, "asdfas", "mine"); + + ////if (myAsset->check()) myAsset->get()->cool(); + //myAsset->get()->cool(); + ////myAsset->get()->groovy(); + + //aCopy.get()->cool(); + //copy2.get()->cool(); + + //log_info("rsrc ptr:", moof::resource::load(assetName, "", "mine")); + //} + //log_info("rsrc ptr:", moof::resource::load(assetName, "", "k")); + //moof::resource::load(assetName, "", "mine")->get()->cool(); + + ////if (myAsset) myAsset.get()->cool(); + ////else moof::log_error("asset not obtained..."); + + MyAsset_handle myAsset = moof::resource::load("/home/chaz/meh.mine"); + MyAsset* asset = myAsset.get(); + if (asset) asset->cool(); + else moof::log_warning("no asset obtained!!"); + + //moof::timer reloadTimer( + //boost::bind(&moof::resource::reload_as_needed), + //SCALAR(2.0), + //moof::timer::repeat); + + for (;;) + { + if (myAsset) myAsset.get()->cool(); + moof::resource::reload_as_needed(); + sleep(1); + } + + if (argc > 1) { std::string arg(argv[1]); @@ -303,35 +402,36 @@ int main(int argc, char* argv[]) hello(); atexit(goodbye); - Mf::Resource::addSearchPaths(Main::getSearchPath()); + moof::resource::add_search_paths(Main::getSearchPath()); - Mf::settings.loadFromFiles(Main::getConfigPath()); - Mf::settings.parseArgs(argc, argv); + moof::settings settings(argc, argv, Main::getConfigPath()); - Mf::Log::Level logLevel = Mf::Log::INFO; - Mf::settings.get("loglevel", logLevel); - Mf::Log::setLevel(logLevel); + enum moof::log::level logLevel = moof::log::info; + settings.get("loglevel", logLevel); + moof::log::level(logLevel); try { - Mf::Video video(PACKAGE_STRING, - Mf::Resource::getPath(PACKAGE".png")); - MainP app = Main::alloc(); - Mf::core.push(app); - Mf::core.run(); + std::string iconPath(PACKAGE".png"); + moof::resource::find(iconPath); + moof::image icon(iconPath); + icon.set_as_icon(); + + class moof::video::attributes attributes(settings); + moof::video video(PACKAGE_STRING, attributes); + Main mainView(settings, video); + + mainView.run(); + return 0; } - catch (const Mf::Error& error) + catch (const std::exception& e) { - Mf::ModalDialog dialog; - dialog.title = PACKAGE_STRING; - dialog.text1 = "Unhandled Exception"; - dialog.text2 = getErrorString(error); - dialog.type = Mf::ModalDialog::CRITICAL; - dialog.run(); + moof::modal_dialog dialog(moof::modal_dialog::error, + PACKAGE_STRING, "Unhandled Exception", + e.what()); + dialog.run(); return 1; } - - return 0; }