group entity updates in as few packets as possible

[blank.git] / src / app / Environment.hpp

diff --git a/src/app/Environment.hpp b/src/app/Environment.hpp
index 4c935d815e2f4a13483452e791a203dcfce31db7..97f4a7ec54434e839dfaba76c66095a80bb17cf7 100644 (file)
--- a/src/app/Environment.hpp
+++ b/src/app/Environment.hpp
@@ -15,20 +15,46 @@ namespace blank {
 
 class Window;
 
-struct Environment {
+struct HeadlessEnvironment {
+
+       struct Config {
+               std::string asset_path;
+               std::string save_path;
+
+               std::string GetWorldPath(
+                       const std::string &world_name
+               ) const;
+               std::string GetWorldPath(
+                       const std::string &world_name,
+                       const std::string &hostname
+               ) const;
+       } config;
+
+       AssetLoader loader;
+
+       FrameCounter counter;
+
+       StateControl state;
+
+
+       explicit HeadlessEnvironment(const Config &);
+
+};
+
+
+struct Environment
+: public HeadlessEnvironment {
+
+       Assets assets;
 
        Audio audio;
        Viewport viewport;
        Window &window;
 
-       Assets assets;
        Keymap keymap;
-       FrameCounter counter;
-
-       StateControl state;
 
 
-       explicit Environment(Window &win, const std::string &asset_path);
+       Environment(Window &win, const Config &);
 
 };