some outline improvements

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

diff --git a/src/world/World.hpp b/src/world/World.hpp
index ae704946dc4403079ebae724c54c828b0cc82fd8..a1385138edd5fa135d84dba21025b2f4253f9e8b 100644 (file)
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -5,23 +5,26 @@
 #include "ChunkLoader.hpp"
 #include "Entity.hpp"
 #include "Generator.hpp"
-#include "../model/shapes.hpp"
+#include "../graphics/ArrayTexture.hpp"
 
 #include <list>
+#include <vector>
 #include <glm/glm.hpp>
 
 
 namespace blank {
 
-class BlockLighting;
-class DirectionalLighting;
+class Assets;
+class EntityCollision;
+class Viewport;
+class WorldCollision;
 
 class World {
 
 public:
        struct Config {
                // initial player position
-               glm::vec3 spawn = { 4.0f, 4.0f, 4.0f };
+               glm::vec3 spawn = { 0.0f, 0.0f, 0.0f };
                // direction facing towards(!) the light
                glm::vec3 light_direction = { -1.0f, -3.0f, -2.0f };
                // fade out reaches 1/e (0.3679) at 1/fog_density,
@@ -34,33 +37,43 @@ public:
                ChunkLoader::Config load = ChunkLoader::Config();
        };
 
-       explicit World(const Config &);
+       World(const Assets &, const Config &, const WorldSave &);
 
+       /// check if this ray hits a block
+       /// depth in the collision is the distance between the ray's
+       /// origin and the intersection point
        bool Intersection(
                const Ray &,
                const glm::mat4 &M,
-               Chunk **chunk = nullptr,
-               int *blkid = nullptr,
-               float *dist = nullptr,
-               glm::vec3 *normal = nullptr);
+               WorldCollision &);
 
-       BlockTypeRegistry &BlockTypes() { return blockType; }
+       /// check if this ray hits an entity
+       bool Intersection(
+               const Ray &,
+               const glm::mat4 &M,
+               EntityCollision &);
+
+       /// check if given entity intersects with the world
+       bool Intersection(const Entity &e, std::vector<WorldCollision> &);
+       void Resolve(Entity &e, std::vector<WorldCollision> &);
+
+       BlockTypeRegistry &BlockTypes() noexcept { return block_type; }
+       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;
-       CuboidShape blockShape;
-       StairShape stairShape;
-       CuboidShape slabShape;
+       BlockTypeRegistry block_type;
+
+       ArrayTexture block_tex;
 
        Generator generate;
        ChunkLoader chunks;