X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FWorld.hpp;h=6bd8128dc9fb41073748952702ee071546306369;hb=39df551265bff648c1ac166043bb4b046122cc8d;hp=b98efca544ef0969af3f056075b43f039986e80f;hpb=549646ac3e5bede5e77031f773649edf8de83608;p=blank.git diff --git a/src/world/World.hpp b/src/world/World.hpp index b98efca..6bd8128 100644 --- a/src/world/World.hpp +++ b/src/world/World.hpp @@ -5,6 +5,7 @@ #include "ChunkLoader.hpp" #include "Entity.hpp" #include "Generator.hpp" +#include "../graphics/ArrayTexture.hpp" #include "../model/shapes.hpp" #include @@ -14,6 +15,7 @@ namespace blank { +class Assets; class Viewport; class WorldCollision; @@ -35,7 +37,7 @@ public: ChunkLoader::Config load = ChunkLoader::Config(); }; - explicit World(const Config &); + World(const Assets &, const Config &); bool Intersection( const Ray &, @@ -67,6 +69,8 @@ private: StairShape stairShape; CuboidShape slabShape; + ArrayTexture block_tex; + Generator generate; ChunkLoader chunks;