X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FWorldState.hpp;h=b48d1b9c0e71285012d7dc7bfbdde978a96ca38e;hb=2e3774eb3f2d5d23a08731175b168566457e2192;hp=c0b4ce10a23829f8012d9a4c144d3d2e2a971ba4;hpb=43820582217f7e4b707d98f2e69d969eb77fc7c3;p=blank.git diff --git a/src/app/WorldState.hpp b/src/app/WorldState.hpp index c0b4ce1..b48d1b9 100644 --- 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;