]> git.localhorst.tv Git - blank.git/blobdiff - src/app/runtime.cpp
split chunk stuff
[blank.git] / src / app / runtime.cpp
index 30b15aeb4b0d105b713255fbba892837481d45a7..8ce7b5dd59562fa989487ae635cc266849939349 100644 (file)
@@ -1,14 +1,17 @@
 #include "Application.hpp"
 #include "Environment.hpp"
-#include "PreloadState.hpp"
 #include "Runtime.hpp"
+#include "ServerState.hpp"
 #include "WorldState.hpp"
 
 #include "init.hpp"
-#include "../world/WorldSave.hpp"
+#include "../client/MasterState.hpp"
+#include "../io/filesystem.hpp"
+#include "../io/WorldSave.hpp"
 
 #include <cctype>
 #include <cstdlib>
+#include <fstream>
 #include <iostream>
 #include <SDL.h>
 
@@ -44,19 +47,48 @@ string default_save_path() {
 
 namespace blank {
 
-Environment::Environment(Window &win, const string &asset_path)
-: audio()
+HeadlessEnvironment::HeadlessEnvironment(const Config &config)
+: config(config)
+, loader(config.asset_path)
+, counter()
+, state() {
+
+}
+
+string HeadlessEnvironment::Config::GetWorldPath(const string &world_name) const {
+       return save_path + "worlds/" + world_name + '/';
+}
+
+string HeadlessEnvironment::Config::GetWorldPath(const string &world_name, const string &host_name) const {
+       return save_path + "cache/" + host_name + '/' + world_name + '/';
+}
+
+Environment::Environment(Window &win, const Config &config)
+: HeadlessEnvironment(config)
+, assets(loader)
+, audio()
 , viewport()
 , window(win)
-, assets(asset_path)
-, counter() {
+, keymap() {
+       viewport.Clear();
+       window.Flip();
+       keymap.LoadDefault();
 
+       string keys_path = config.save_path + "keys.conf";
+       if (!is_file(keys_path)) {
+               std::ofstream file(keys_path);
+               keymap.Save(file);
+       } else {
+               std::ifstream file(keys_path);
+               keymap.Load(file);
+       }
 }
 
 
 Runtime::Runtime() noexcept
 : name("blank")
 , mode(NORMAL)
+, target(STANDALONE)
 , n(0)
 , t(0)
 , config() {
@@ -97,13 +129,44 @@ void Runtime::ReadArgs(int argc, const char *const *argv) {
                                                config.interface.visual_disabled = true;
                                        } else if (strcmp(param, "no-audio") == 0) {
                                                config.interface.audio_disabled = true;
+                                       } else if (strcmp(param, "standalone") == 0) {
+                                               target = STANDALONE;
+                                       } else if (strcmp(param, "server") == 0) {
+                                               target = SERVER;
+                                       } else if (strcmp(param, "client") == 0) {
+                                               target = CLIENT;
                                        } else if (strcmp(param, "asset-path") == 0) {
                                                ++i;
                                                if (i >= argc || argv[i] == nullptr || argv[i][0] == '\0') {
                                                        cerr << "missing argument to --asset-path" << endl;
                                                        error = true;
                                                } else {
-                                                       config.asset_path = argv[i];
+                                                       config.env.asset_path = argv[i];
+                                               }
+                                       } else if (strcmp(param, "host") == 0) {
+                                               ++i;
+                                               if (i >= argc || argv[i] == nullptr || argv[i][0] == '\0') {
+                                                       cerr << "missing argument to --host" << endl;
+                                                       error = true;
+                                               } else {
+                                                       config.client.host = argv[i];
+                                               }
+                                       } else if (strcmp(param, "port") == 0) {
+                                               ++i;
+                                               if (i >= argc || argv[i] == nullptr || argv[i][0] == '\0') {
+                                                       cerr << "missing argument to --port" << endl;
+                                                       error = true;
+                                               } else {
+                                                       config.server.port = strtoul(argv[i], nullptr, 10);
+                                                       config.client.port = config.server.port;
+                                               }
+                                       } else if (strcmp(param, "player-name") == 0) {
+                                               ++i;
+                                               if (i >= argc || argv[i] == nullptr || argv[i][0] == '\0') {
+                                                       cerr << "missing argument to --player-name" << endl;
+                                                       error = true;
+                                               } else {
+                                                       config.interface.player_name = argv[i];
                                                }
                                        } else if (strcmp(param, "save-path") == 0) {
                                                ++i;
@@ -111,7 +174,7 @@ void Runtime::ReadArgs(int argc, const char *const *argv) {
                                                        cerr << "missing argument to --save-path" << endl;
                                                        error = true;
                                                } else {
-                                                       config.save_path = argv[i];
+                                                       config.env.save_path = argv[i];
                                                }
                                        } else if (strcmp(param, "world-name") == 0) {
                                                ++i;
@@ -119,7 +182,7 @@ void Runtime::ReadArgs(int argc, const char *const *argv) {
                                                        cerr << "missing argument to --world-name" << endl;
                                                        error = true;
                                                } else {
-                                                       config.world_name = argv[i];
+                                                       config.world.name = argv[i];
                                                }
                                        } else {
                                                cerr << "unknown option " << arg << endl;
@@ -157,7 +220,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':
@@ -192,21 +255,21 @@ void Runtime::ReadArgs(int argc, const char *const *argv) {
                return;
        }
 
-       if (config.asset_path.empty()) {
-               config.asset_path = default_asset_path();
+       if (config.env.asset_path.empty()) {
+               config.env.asset_path = default_asset_path();
        } else if (
-               config.asset_path[config.asset_path.size() - 1] != '/' &&
-               config.asset_path[config.asset_path.size() - 1] != '\\'
+               config.env.asset_path[config.env.asset_path.size() - 1] != '/' &&
+               config.env.asset_path[config.env.asset_path.size() - 1] != '\\'
        ) {
-               config.asset_path += '/';
+               config.env.asset_path += '/';
        }
-       if (config.save_path.empty()) {
-               config.save_path = default_save_path();
+       if (config.env.save_path.empty()) {
+               config.env.save_path = default_save_path();
        } else if (
-               config.save_path[config.save_path.size() - 1] != '/' &&
-               config.save_path[config.save_path.size() - 1] != '\\'
+               config.env.save_path[config.env.save_path.size() - 1] != '/' &&
+               config.env.save_path[config.env.save_path.size() - 1] != '\\'
        ) {
-               config.save_path += '/';
+               config.env.save_path += '/';
        }
 
        if (n > 0) {
@@ -227,26 +290,76 @@ int Runtime::Execute() {
                return 1;
        }
 
+       InitHeadless init_headless;
+
+       switch (target) {
+               default:
+               case STANDALONE:
+                       RunStandalone();
+                       break;
+               case SERVER:
+                       RunServer();
+                       break;
+               case CLIENT:
+                       RunClient();
+                       break;
+       }
+
+       return 0;
+}
+
+void Runtime::RunStandalone() {
        Init init(config.doublebuf, config.multisampling);
 
-       Environment env(init.window, config.asset_path);
+       Environment env(init.window, config.env);
        env.viewport.VSync(config.vsync);
 
-       WorldSave save(config.save_path + config.world_name + '/');
+       WorldSave save(config.env.GetWorldPath(config.world.name));
        if (save.Exists()) {
                save.Read(config.world);
+               save.Read(config.gen);
        } else {
-               save.Create(config.world);
+               save.Write(config.world);
+               save.Write(config.gen);
        }
 
        Application app(env);
-
-       WorldState world_state(env, config.interface, config.world);
+       WorldState world_state(env, config.gen, config.interface, config.world, save);
        app.PushState(&world_state);
+       Run(app);
+}
+
+void Runtime::RunServer() {
+       HeadlessEnvironment env(config.env);
+
+       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);
+       }
 
-       PreloadState preloader(env, world_state.GetWorld().Loader());
-       app.PushState(&preloader);
+       HeadlessApplication app(env);
+       ServerState server_state(env, config.gen, config.world, save, config.server);
+       app.PushState(&server_state);
+       Run(app);
+}
 
+void Runtime::RunClient() {
+       Init init(config.doublebuf, config.multisampling);
+
+       Environment env(init.window, config.env);
+       env.viewport.VSync(config.vsync);
+
+       Application app(env);
+       client::MasterState client_state(env, config.world, config.interface, config.client);
+       app.PushState(&client_state);
+       Run(app);
+}
+
+void Runtime::Run(HeadlessApplication &app) {
        switch (mode) {
                default:
                case NORMAL:
@@ -262,8 +375,6 @@ int Runtime::Execute() {
                        app.RunS(n, t);
                        break;
        }
-
-       return 0;
 }
 
 }