X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2Fruntime.cpp;h=2481f93a2edcac66feaf5f09f02aff38f30aaf75;hb=fda38181732e58537331c919dd699eaa830ead50;hp=e169a7bb5eb1d73efd4efa997ddc4f902c119ca9;hpb=1afc887a2040dfdedfa66913e94ff7a9634f648f;p=blank.git diff --git a/src/app/runtime.cpp b/src/app/runtime.cpp index e169a7b..2481f93 100644 --- a/src/app/runtime.cpp +++ b/src/app/runtime.cpp @@ -1,16 +1,18 @@ #include "Application.hpp" #include "Environment.hpp" #include "Runtime.hpp" -#include "ServerState.hpp" -#include "WorldState.hpp" #include "init.hpp" #include "../client/MasterState.hpp" #include "../io/filesystem.hpp" +#include "../io/TokenStreamReader.hpp" #include "../io/WorldSave.hpp" +#include "../server/ServerState.hpp" +#include "../standalone/MasterState.hpp" #include #include +#include #include #include #include @@ -47,6 +49,71 @@ string default_save_path() { namespace blank { +void Config::Load(std::istream &is) { + TokenStreamReader in(is); + std::string name; + while (in.HasMore()) { + if (in.Peek().type == Token::STRING) { + in.ReadString(name); + } else { + in.ReadIdentifier(name); + } + in.Skip(Token::EQUALS); + if (name == "audio.enabled") { + in.ReadBoolean(audio.enabled); + } else if (name == "input.keyboard") { + in.ReadBoolean(input.keyboard); + } else if (name == "input.mouse") { + in.ReadBoolean(input.mouse); + } else if (name == "input.pitch_sensitivity") { + in.ReadNumber(input.pitch_sensitivity); + } else if (name == "input.yaw_sensitivity") { + in.ReadNumber(input.yaw_sensitivity); + } else if (name == "net.host") { + in.ReadString(net.host); + } else if (name == "net.port") { + int port; + in.ReadNumber(port); + net.port = port; + } else if (name == "player.name") { + in.ReadString(player.name); + } else if (name == "video.dblbuf") { + in.ReadBoolean(video.dblbuf); + } else if (name == "video.vsync") { + in.ReadBoolean(video.vsync); + } else if (name == "video.msaa") { + in.ReadNumber(video.msaa); + } else if (name == "video.hud") { + in.ReadBoolean(video.hud); + } else if (name == "video.world") { + in.ReadBoolean(video.world); + } else if (name == "video.debug") { + in.ReadBoolean(video.debug); + } + if (in.HasMore() && in.Peek().type == Token::SEMICOLON) { + in.Skip(Token::SEMICOLON); + } + } +} + +void Config::Save(std::ostream &out) { + out << "audio.enabled = " << (audio.enabled ? "yes" : "no") << ';' << std::endl; + out << "input.keyboard = " << (input.keyboard ? "on" : "off") << ';' << std::endl; + out << "input.mouse = " << (input.keyboard ? "on" : "off") << ';' << std::endl; + out << "input.pitch_sensitivity = " << input.pitch_sensitivity << ';' << std::endl; + out << "input.yaw_sensitivity = " << input.yaw_sensitivity << ';' << std::endl; + out << "net.host = \"" << net.host << "\";" << std::endl; + out << "net.port = " << net.port << ';' << std::endl; + out << "player.name = \"" << player.name << "\";" << std::endl; + out << "video.dblbuf = " << (video.dblbuf ? "on" : "off") << ';' << std::endl; + out << "video.vsync = " << (video.vsync ? "on" : "off") << ';' << std::endl; + out << "video.msaa = " << video.msaa << ';' << std::endl; + out << "video.hud = " << (video.hud ? "on" : "off") << ';' << std::endl; + out << "video.world = " << (video.world ? "on" : "off") << ';' << std::endl; + out << "video.debug = " << (video.debug ? "on" : "off") << ';' << std::endl; +} + + HeadlessEnvironment::HeadlessEnvironment(const Config &config) : config(config) , loader(config.asset_path) @@ -69,7 +136,8 @@ Environment::Environment(Window &win, const Config &config) , audio() , viewport() , window(win) -, keymap() { +, keymap() +, msg_state(*this) { viewport.Clear(); window.Flip(); keymap.LoadDefault(); @@ -84,6 +152,12 @@ Environment::Environment(Window &win, const Config &config) } } +void Environment::ShowMessage(const char *msg) { + cout << msg << endl; + msg_state.SetMessage(msg); + state.Push(&msg_state); +} + Runtime::Runtime() noexcept : name("blank") @@ -96,6 +170,13 @@ Runtime::Runtime() noexcept } +void Runtime::Initialize(int argc, const char *const *argv) { + ReadArgs(argc, argv); + if (mode == ERROR) return; + ReadPreferences(); + ReadArgs(argc, argv); +} + void Runtime::ReadArgs(int argc, const char *const *argv) { if (argc <= 0) return; name = argv[0]; @@ -120,15 +201,15 @@ void Runtime::ReadArgs(int argc, const char *const *argv) { const char *param = arg + 2; // long option if (strcmp(param, "no-vsync") == 0) { - config.vsync = false; + config.game.video.vsync = false; } else if (strcmp(param, "no-keyboard") == 0) { - config.interface.keyboard_disabled = true; + config.game.input.keyboard = false; } else if (strcmp(param, "no-mouse") == 0) { - config.interface.mouse_disabled = true; + config.game.input.mouse = false; } else if (strcmp(param, "no-hud") == 0) { - config.interface.visual_disabled = true; + config.game.video.hud = false; } else if (strcmp(param, "no-audio") == 0) { - config.interface.audio_disabled = true; + config.game.audio.enabled = false; } else if (strcmp(param, "standalone") == 0) { target = STANDALONE; } else if (strcmp(param, "server") == 0) { @@ -149,7 +230,7 @@ void Runtime::ReadArgs(int argc, const char *const *argv) { cerr << "missing argument to --host" << endl; error = true; } else { - config.client.host = argv[i]; + config.game.net.host = argv[i]; } } else if (strcmp(param, "port") == 0) { ++i; @@ -157,8 +238,7 @@ void Runtime::ReadArgs(int argc, const char *const *argv) { cerr << "missing argument to --port" << endl; error = true; } else { - config.server.port = strtoul(argv[i], nullptr, 10); - config.client.port = config.server.port; + config.game.net.port = strtoul(argv[i], nullptr, 10); } } else if (strcmp(param, "player-name") == 0) { ++i; @@ -166,7 +246,7 @@ void Runtime::ReadArgs(int argc, const char *const *argv) { cerr << "missing argument to --player-name" << endl; error = true; } else { - config.interface.player_name = argv[i]; + config.game.player.name = argv[i]; } } else if (strcmp(param, "save-path") == 0) { ++i; @@ -194,7 +274,7 @@ void Runtime::ReadArgs(int argc, const char *const *argv) { for (int j = 1; arg[j] != '\0'; ++j) { switch (arg[j]) { case 'd': - config.doublebuf = false; + config.game.video.dblbuf = false; break; case 'm': ++i; @@ -202,7 +282,7 @@ void Runtime::ReadArgs(int argc, const char *const *argv) { cerr << "missing argument to -m" << endl; error = true; } else { - config.multisampling = strtoul(argv[i], nullptr, 10); + config.game.video.msaa = strtoul(argv[i], nullptr, 10); } break; case 'n': @@ -220,7 +300,7 @@ void Runtime::ReadArgs(int argc, const char *const *argv) { cerr << "missing argument to -s" << endl; error = true; } else { - config.world.gen.seed = strtoul(argv[i], nullptr, 10); + config.gen.seed = strtoul(argv[i], nullptr, 10); } break; case 't': @@ -252,9 +332,20 @@ void Runtime::ReadArgs(int argc, const char *const *argv) { if (error) { mode = ERROR; - return; + } else if (n > 0) { + if (t > 0) { + mode = FIXED_FRAME_LIMIT; + } else { + mode = FRAME_LIMIT; + } + } else if (t > 0) { + mode = TIME_LIMIT; + } else { + mode = NORMAL; } +} +void Runtime::ReadPreferences() { if (config.env.asset_path.empty()) { config.env.asset_path = default_asset_path(); } else if ( @@ -272,16 +363,14 @@ void Runtime::ReadArgs(int argc, const char *const *argv) { config.env.save_path += '/'; } - if (n > 0) { - if (t > 0) { - mode = FIXED_FRAME_LIMIT; - } else { - mode = FRAME_LIMIT; - } - } else if (t > 0) { - mode = TIME_LIMIT; + string prefs_path = config.env.save_path + "prefs.conf"; + if (is_file(prefs_path)) { + ifstream file(prefs_path); + config.game.Load(file); } else { - mode = NORMAL; + make_dirs(config.env.save_path); + ofstream file(prefs_path); + config.game.Save(file); } } @@ -309,20 +398,22 @@ int Runtime::Execute() { } void Runtime::RunStandalone() { - Init init(config.doublebuf, config.multisampling); + Init init(config.game.video.dblbuf, config.game.video.msaa); Environment env(init.window, config.env); - env.viewport.VSync(config.vsync); + env.viewport.VSync(config.game.video.vsync); WorldSave save(config.env.GetWorldPath(config.world.name)); if (save.Exists()) { save.Read(config.world); + save.Read(config.gen); } else { save.Write(config.world); + save.Write(config.gen); } Application app(env); - WorldState world_state(env, config.interface, config.world, save); + standalone::MasterState world_state(env, config.game, config.gen, config.world, save); app.PushState(&world_state); Run(app); } @@ -333,24 +424,26 @@ void Runtime::RunServer() { WorldSave save(config.env.GetWorldPath(config.world.name)); if (save.Exists()) { save.Read(config.world); + save.Read(config.gen); } else { save.Write(config.world); + save.Write(config.gen); } HeadlessApplication app(env); - ServerState server_state(env, config.world, save, config.server); + server::ServerState server_state(env, config.gen, config.world, save, config.game); app.PushState(&server_state); Run(app); } void Runtime::RunClient() { - Init init(config.doublebuf, config.multisampling); + Init init(config.game.video.dblbuf, config.game.video.msaa); Environment env(init.window, config.env); - env.viewport.VSync(config.vsync); + env.viewport.VSync(config.game.video.vsync); Application app(env); - client::MasterState client_state(env, config.world, config.interface, config.client); + client::MasterState client_state(env, config.game, config.world); app.PushState(&client_state); Run(app); }