X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMain.cc;h=fb442d33ceb8cc2181be21559be625472d3ea090;hp=510a9b1b3a1e8bedc3f78926859842e32f3d8785;hb=bd62b2e6a6e5f1af5a635df3ff1a07f363d9ffe0;hpb=4f9eb9259092994de9690cf12f11437c35a6791e diff --git a/src/Main.cc b/src/Main.cc index 510a9b1..fb442d3 100644 --- a/src/Main.cc +++ b/src/Main.cc @@ -1,87 +1,60 @@ -/******************************************************************************* - - Copyright (c) 2009, Charles McGarvey - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*******************************************************************************/ +/*] Copyright (c) 2009-2010, Charles McGarvey [************************** +**] All rights reserved. +* +* vi:ts=4 sw=4 tw=75 +* +* Distributable under the terms and conditions of the 2-clause BSD license; +* see the file COPYING for a complete text of the license. +* +**************************************************************************/ #include // atexit, getenv +#include +#include #include #include #include // access -#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 "../config.h" #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); @@ -90,25 +63,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) - { - Mf::core.clear(); - } - else if (event.key.keysym.sym == SDLK_f) + 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; @@ -117,8 +90,8 @@ bool Main::handleEvent(const Mf::Event& event) break; case SDL_QUIT: - Mf::core.clear(); - break; + stop(); + return true; } return false; @@ -152,9 +125,10 @@ 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__) +#if !defined(_WIN32) path += ":/etc/yoinkrc"; #endif path += ":$HOME/.yoinkrc"; @@ -188,25 +162,18 @@ 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() { - std::cout << "Usage: "PACKAGE" [-h|--help] [-i|--info] [OPTION=VALUE]..." + std::cout << "Usage: " + << PACKAGE" [-h|--help] [-i|--info] [OPTION=VALUE]..." << std::endl << "The alien-smashing action game." << std::endl << std::endl @@ -220,7 +187,7 @@ void Main::printUsage() << " fullscreen=true|false" << std::endl << " if true, uses the entire display" << std::endl << " framerate=num" << std::endl - << " the target number of frames per second" << std::endl + << " number of frames to draw per second" << std::endl << std::endl << "See documentation for more options." << std::endl; } @@ -252,11 +219,18 @@ void Main::printInfo(int argc, char* argv[]) } 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 @@ -269,6 +243,10 @@ void Main::printInfo(int argc, char* argv[]) << "-" #endif << "gtk " +#ifndef USE_HOTLOADING + << "-" +#endif + << "hotloading " #ifndef PROFILING_ENABLED << "-" #endif @@ -299,8 +277,181 @@ 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 (;;) + //{ + //myAsset.get()->cool(); + //moof::resource::reload_as_needed(); + //sleep(1); + //} + + //return 0; + + moof::resolver_task task("4950", "lappy"); + task.run(); + + int i = task.wait(); + moof::log_warning("task ended with code:", i); + + std::vector::const_iterator it; + for (it = task.addresses().begin(); it != task.addresses().end(); ++it) + { + moof::socket::address addr = *it; + + moof::log_info("address:", addr, "(", addr.type(), ")"); + } + + //ASSERT(5 == 8 && "uh oh that's not right"); + + + std::vector hi; + for (int a = 0; a < 4000; a++) + { + hi.push_back(a); + } + + moof::log_info("array size:", hi.size()); + moof::packet packet; + packet << hi; + + //for (it = task.addresses().begin(); it != task.addresses().end(); ++it) + //{ + //moof::socket sock(*it); + moof::socket sock(moof::socket::address::broadcast("4950")); + //moof::socket sock("4950", "lappy", SOCK_DGRAM); + sock.set(SO_BROADCAST, 1); + sock.connect(); + + //if (sock.isConnected()) + //{ + moof::packet pack; + pack << "hello world"; + sock.write(pack); + //sock.write(pack, sock.address()); + moof::log_info("sent", pack.size(), "bytes"); + + const char* data = pack.bytes(); + for (unsigned i = 0; i < pack.size(); ++i) + { + moof::log_warning("meh:", data[i]); + } + + char data2[56]; + pack.read(data2, 13); + for (int i = 0; i < 13; ++i) + { + moof::log_warning("meh:", data2[i]); + } + //} + //else + //{ + //moof::log_error("NOT CONNECTED"); + //} + //} + + + //return 0; + + if (argc > 1) { std::string arg(argv[1]); @@ -319,36 +470,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; - if (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; } - -/** vim: set ts=4 sw=4 tw=80: *************************************************/ -