configurable asset and save path

[blank.git] / src / world / World.hpp

diff --git a/src/world/World.hpp b/src/world/World.hpp
index 7f38942ea2e4d9b4389dc97e2a430a1458951ff3..6bd8128dc9fb41073748952702ee071546306369 100644 (file)
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -5,16 +5,19 @@
 #include "ChunkLoader.hpp"
 #include "Entity.hpp"
 #include "Generator.hpp"
+#include "../graphics/ArrayTexture.hpp"
 #include "../model/shapes.hpp"
 
 #include <list>
+#include <vector>
 #include <glm/glm.hpp>
 
 
 namespace blank {
 
-class BlockLighting;
-class DirectionalLighting;
+class Assets;
+class Viewport;
+class WorldCollision;
 
 class World {
 
@@ -34,7 +37,7 @@ public:
                ChunkLoader::Config load = ChunkLoader::Config();
        };
 
-       explicit World(const Config &);
+       World(const Assets &, const Config &);
 
        bool Intersection(
                const Ray &,
@@ -44,19 +47,21 @@ public:
                float &dist,
                glm::vec3 &normal);
 
-       bool Intersection(const Entity &e);
+       bool Intersection(const Entity &e, std::vector<WorldCollision> &);
+       void Resolve(Entity &e, std::vector<WorldCollision> &);
 
-       BlockTypeRegistry &BlockTypes() { return blockType; }
+       BlockTypeRegistry &BlockTypes() noexcept { return blockType; }
+       ChunkLoader &Loader() noexcept { return chunks; }
 
        Entity &Player() { return *player; }
        Entity &AddEntity() { entities.emplace_back(); return entities.back(); }
 
        Chunk &PlayerChunk();
-       Chunk &Next(const Chunk &to, const glm::tvec3<int> &dir);
+       Chunk &Next(const Chunk &to, const glm::ivec3 &dir);
 
        void Update(int dt);
 
-       void Render(BlockLighting &, DirectionalLighting &);
+       void Render(Viewport &);
 
 private:
        BlockTypeRegistry blockType;
@@ -64,6 +69,8 @@ private:
        StairShape stairShape;
        CuboidShape slabShape;
 
+       ArrayTexture block_tex;
+
        Generator generate;
        ChunkLoader chunks;