fix this whole sky box mess

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

diff --git a/src/app/WorldState.hpp b/src/app/WorldState.hpp
index c0b4ce10a23829f8012d9a4c144d3d2e2a971ba4..b48d1b9c0e71285012d7dc7bfbdde978a96ca38e 100644 (file)
--- a/src/app/WorldState.hpp
+++ b/src/app/WorldState.hpp
@@ -5,10 +5,13 @@
 #include "State.hpp"
 #include "UnloadState.hpp"
 #include "../ai/Spawner.hpp"
+#include "../graphics/SkyBox.hpp"
 #include "../model/Skeletons.hpp"
 #include "../ui/Interface.hpp"
 #include "../world/BlockTypeRegistry.hpp"
+#include "../world/ChunkLoader.hpp"
 #include "../world/ChunkRenderer.hpp"
+#include "../world/Generator.hpp"
 #include "../world/World.hpp"
 
 
@@ -22,6 +25,7 @@ class WorldState
 public:
        WorldState(
                Environment &,
+               const Generator::Config &,
                const Interface::Config &,
                const World::Config &,
                const WorldSave &
@@ -40,10 +44,14 @@ private:
        Environment &env;
        BlockTypeRegistry block_types;
        World world;
+       Interface interface;
+       Generator generator;
+       ChunkLoader chunk_loader;
        ChunkRenderer chunk_renderer;
        Skeletons skeletons;
        Spawner spawner;
-       Interface interface;
+
+       SkyBox sky;
 
        PreloadState preload;
        UnloadState unload;