X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMain.cc;h=8361b39d3dffe7a5e24eda753650e2722aad6092;hp=277cc3dde45eaa7642c79cc1d61b3a4aa196f252;hb=e0fb747f2e647115d0b8953615c254d25c045345;hpb=41f8dd670e963aad94527ce2be0486268993a477 diff --git a/src/Main.cc b/src/Main.cc index 277cc3d..8361b39 100644 --- a/src/Main.cc +++ b/src/Main.cc @@ -9,54 +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 "ErrorHandler.hh" #include "GameLayer.hh" #include "Main.hh" #include "TitleLayer.hh" - -#if HAVE_CONFIG_H -#include "config.h" -#endif #include "version.h" -Main::Main(Mf::Settings& settings, Mf::Video& video) : - Mf::View(settings, video) +Main::Main(moof::settings& settings, moof::video& video) : + moof::view(settings, video) { - Mf::Dispatch& dispatch = Mf::Dispatch::global(); - mNewContextDispatch = dispatch.addTarget("video.newcontext", + moof::dispatcher& dispatcher = moof::dispatcher::global(); + mNewContextDispatch = dispatcher.add_target("video.newcontext", boost::bind(&Main::setupGL)); setupGL(); } -void Main::update(Mf::Scalar t, Mf::Scalar dt) +void Main::update(moof::scalar t, moof::scalar dt) { if (children().size() == 0) { - //Mf::logWarning("main view has no children"); + //moof::log_warning("main view has no children"); //stop(); //return; - addChild(TitleLayer::alloc()); + add_child(TitleLayer::alloc()); } - Mf::View::update(t, dt); + 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); @@ -66,24 +66,24 @@ void Main::draw(Mf::Scalar alpha) const glMatrixMode(GL_MODELVIEW); glLoadIdentity(); - Mf::View::draw(alpha); + moof::view::draw(alpha); } -bool Main::handleEvent(const Mf::Event& event) +bool Main::handle_event(const moof::event& event) { - if (Mf::View::handleEvent(event)) return true; + if (moof::view::handle_event(event)) return true; switch (event.type) { case SDL_KEYUP: if (event.key.keysym.sym == SDLK_f) { - video().toggleFull(); + video().toggle_fullscreen(); } else if (event.key.keysym.sym == SDLK_l) { - video().toggleCursorGrab(); - video().toggleCursorVisible(); + video().toggle_cursor_captured(); + video().toggle_cursor_visible(); } break; @@ -106,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; @@ -128,18 +129,20 @@ std::string Main::getConfigPath() // 4. YOINKRC (environment) std::string path("yoinkrc"); - Mf::Resource::getPath(path); + moof::resource::find(path); + + 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; @@ -164,8 +167,8 @@ 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); @@ -196,28 +199,22 @@ 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 @@ -245,6 +242,10 @@ void Main::printInfo(int argc, char* argv[]) << "-" #endif << "gtk " +#ifndef USE_HOTLOADING + << "-" +#endif + << "hotloading " #ifndef PROFILING_ENABLED << "-" #endif @@ -257,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; } @@ -276,69 +277,112 @@ void goodbye() } -#include +#include -int main(int argc, char* argv[]) +#include + +class MyAsset { - Mf::ResolverTask task("compy", "4950", SOCK_DGRAM); - task.run(); +public: + MyAsset(const std::string& path) + { + moof::log_info("MyAsset loading:", path); + + char buffer[1024]; - int i = task.wait(); - Mf::logWarning << "task ended with code: " << i << std::endl; + std::ifstream stream(path.c_str()); + stream.getline(buffer, sizeof(buffer)); + str = buffer; + stream.close(); + + cool(); + } - std::vector::const_iterator it; - for (it = task.addresses().begin(); it != task.addresses().end(); ++it) + void cool() { - Mf::SocketAddress addr = *it; + moof::log_info("MyAsset COOL:", str); + } - Mf::logInfo << "address: " << addr.name() << ":" << addr.port() - << " (" << addr.type() << ")" << std::endl; + void groovy() + { + moof::log_info("MyAsset GROOVY!!!!", str); } - Mf::SocketAddress addr("www.apple.com", "80", SOCK_DGRAM); - - Mf::logInfo << "address: " << addr.name() << ":" << addr.port() - << " (" << addr.type() << ")" << std::endl; + std::string str; +}; - Mf::Packet packet(1000000); - packet << (uint16_t)45; - Mf::logInfo << "packet size: " << packet.size() << std::endl; - packet << (int64_t)-1234567890123456789; - Mf::logInfo << "packet size: " << packet.size() << std::endl; +typedef moof::resource_handle MyAsset_handle; - packet << true << false << false << true << false << true << true; - Mf::logInfo << "packet size: " << packet.size() << std::endl; +class AnotherAsset +{ +public: + AnotherAsset(const std::string& path, double d = 5.0) + { + moof::log_info("AnotherAsset loading:", path); + dude = d; + } - std::vector hi; - hi.push_back(34); - hi.push_back(-12345); - hi.push_back(7734); - for (int a = 0; a < 15900; a++) + void cool() { - hi.push_back(a); + moof::log_info("AnotherAsset cool", dude); } - packet << hi; - Mf::logInfo << "packet size: " << packet.size() << std::endl; + void groovy() + { + moof::log_info("AnotherAsset GROOVY!!!!", dude); + } - packet << "hello world"; - Mf::logInfo << "packet size: " << packet.size() << std::endl; + double dude; +}; - packet << false << false << false << true << false; - Mf::logInfo << "packet size: " << packet.size() << std::endl; +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"); - for (it = task.addresses().begin(); it != task.addresses().end(); ++it) - { - Mf::SocketAddress addr = *it; - Mf::Socket sock(addr); - sock.write(packet); - } + //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(); - return 0; + //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) { @@ -358,31 +402,33 @@ int main(int argc, char* argv[]) hello(); atexit(goodbye); - Mf::Resource::addSearchPaths(Main::getSearchPath()); + moof::resource::add_search_paths(Main::getSearchPath()); - Mf::Settings settings(argc, argv, Main::getConfigPath()); + moof::settings settings(argc, argv, Main::getConfigPath()); - Mf::Log::Level logLevel = Mf::Log::INFO; + enum moof::log::level logLevel = moof::log::info; settings.get("loglevel", logLevel); - Mf::Log::setLevel(logLevel); + moof::log::level(logLevel); try { - Mf::Video::Attributes attributes(settings); - attributes.caption = PACKAGE_STRING; - attributes.icon = Mf::Resource::getPath(PACKAGE".png"); + std::string iconPath(PACKAGE".png"); + moof::resource::find(iconPath); + moof::image icon(iconPath); + icon.set_as_icon(); - Mf::Video video(attributes); + 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(Mf::ModalDialog::CRITICAL, - PACKAGE_STRING, "Unhandled Exception", - getErrorString(error)); + moof::modal_dialog dialog(moof::modal_dialog::error, + PACKAGE_STRING, "Unhandled Exception", + e.what()); dialog.run(); return 1;