use collision structures for ray tests

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

diff --git a/src/world/World.hpp b/src/world/World.hpp
index 6bd8128dc9fb41073748952702ee071546306369..a1385138edd5fa135d84dba21025b2f4253f9e8b 100644 (file)
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -6,7 +6,6 @@
 #include "Entity.hpp"
 #include "Generator.hpp"
 #include "../graphics/ArrayTexture.hpp"
-#include "../model/shapes.hpp"
 
 #include <list>
 #include <vector>
@@ -16,6 +15,7 @@
 namespace blank {
 
 class Assets;
+class EntityCollision;
 class Viewport;
 class WorldCollision;
 
@@ -37,20 +37,27 @@ public:
                ChunkLoader::Config load = ChunkLoader::Config();
        };
 
-       World(const Assets &, 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,
-               int &blkid,
-               float &dist,
-               glm::vec3 &normal);
+               WorldCollision &);
 
+       /// 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 blockType; }
+       BlockTypeRegistry &BlockTypes() noexcept { return block_type; }
        ChunkLoader &Loader() noexcept { return chunks; }
 
        Entity &Player() { return *player; }
@@ -64,10 +71,7 @@ public:
        void Render(Viewport &);
 
 private:
-       BlockTypeRegistry blockType;
-       CuboidShape blockShape;
-       StairShape stairShape;
-       CuboidShape slabShape;
+       BlockTypeRegistry block_type;
 
        ArrayTexture block_tex;