*
**************************************************************************/
-#include <cstdlib> // atexit, getenv
+#include "config.h"
+
+#include <cstdlib> // atexit
#include <exception>
#include <functional>
#include <iostream>
#include <string>
-#include <unistd.h> // access
+#if PLATFORM_WIN32
+inline int isatty(int dummy) { return 0; }
+#else
+#include <termios.h>
+#endif
+
+#include <stlplus/portability/file_system.hpp>
+#include <stlplus/portability/subprocesses.hpp>
+
+#include <moof/image.hh>
#include <moof/log.hh>
#include <moof/modal_dialog.hh>
#include <moof/opengl.hh>
#include <moof/resource.hh>
#include <moof/settings.hh>
+#include <moof/string.hh>
#include <moof/video.hh>
-#include "GameLayer.hh"
#include "Main.hh"
-#include "TitleLayer.hh"
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
-#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
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)
// 2. YOINK_DATADIR (configure)
std::string path;
-
- char* dataDir = getenv("YOINK_DATADIR");
- if (dataDir)
+ std::string datadir = stlplus::env_vector()["YOINK_DATADIR"];
+ if (!datadir.empty())
{
- path += dataDir;
+ path += datadir;
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
// 3. $HOME/.yoinkrc
// 4. YOINKRC (environment)
- std::string path("yoinkrc");
- moof::resource::find_path(path);
+ std::string path = moof::resource::find_file("yoinkrc");
-#if !defined(_WIN32)
+#if PLATFORM_POSIX
path += ":/etc/yoinkrc";
#endif
path += ":$HOME/.yoinkrc";
- char* configFile = getenv("YOINKRC");
- if (configFile)
+ std::string rc_file = stlplus::env_vector()["YOINKRC"];
+ if (!rc_file.empty())
{
path += ":";
- path += configFile;
+ path += rc_file;
}
return path;
}
-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);
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);
+
+ //glEnable(GL_LIGHTING);
+ glEnable(GL_LIGHT0);
+
+ glEnable(GL_COLOR_MATERIAL);
+ glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
- //glMatrixMode(GL_PROJECTION);
- //glLoadIdentity();
- //moof::scalar ratio = moof::core.getVideo()->width() /
- //moof::core.getVideo()->height();
- //gluPerspective(60.0, ratio, 1.0, 250.0);
+ 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);
- //glMatrixMode(GL_MODELVIEW);
+ 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]..."
<< "See documentation for more options." << std::endl;
}
-void Main::printInfo(int argc, char* argv[])
+void Main::print_info(int argc, char* argv[])
{
- std::string assets;
- std::string datadir;
- std::string config;
-
- assets.assign(YOINK_DATADIR);
- int accessible = access(assets.c_str(), R_OK);
- if (accessible != 0) assets += " (no access)";
-
- char* temp = getenv("YOINK_DATADIR");
- if (temp)
- {
- datadir = temp;
- accessible = access(temp, R_OK);
- if (accessible != 0) 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
+}
- temp = getenv("YOINKRC");
- if (temp)
+void Main::print_option(const std::string& option, bool enabled)
+{
+ if (isatty(1) == 1)
{
- config = temp;
- accessible = access(temp, R_OK);
- if (accessible != 0) config += " (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: "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 PROFILING_ENABLED
- << "-"
-#endif
- << "profile "
-#ifndef USE_QT4
- << "-"
-#endif
- << "qt4 "
-#ifndef USE_THREADS
- << "-"
-#endif
- << "threads" << std::endl
- << " YOINKRC: " << config << 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 <moof/socket.hh>
-
int main(int argc, char* argv[])
{
- moof::resolver_task task("4950", "lappy");
- task.run();
-
- int i = task.wait();
- moof::log_warning("task ended with code:", i);
-
- std::vector<moof::socket::address>::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<uint8_t> 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]);
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;
}
}
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);
try
{
- std::string iconPath(PACKAGE".png");
- moof::resource::find_path(iconPath);
- moof::image icon(iconPath);
- icon.set_as_icon();
+ 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;
}
projects / chaz / yoink / blobdiff