use collision structures for ray tests

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

diff --git a/src/world/Chunk.hpp b/src/world/Chunk.hpp
index 7b84b6e9cd89a0aff3d4d9f1068bc8cb72b6c3f2..61ec83bd0aaad9f048fd50721a67e63eba0070f4 100644 (file)
--- a/src/world/Chunk.hpp
+++ b/src/world/Chunk.hpp
@@ -20,7 +20,7 @@ class WorldCollision;
 class Chunk {
 
 public:
-       using Pos = glm::tvec3<int>;
+       using Pos = glm::ivec3;
 
 public:
        explicit Chunk(const BlockTypeRegistry &) noexcept;
@@ -110,8 +110,6 @@ public:
        // check which faces of a block at given index are obstructed (and therefore invisible)
        Block::FaceSet Obstructed(const Pos &) const noexcept;
 
-       void Invalidate() noexcept { dirty = true; }
-
        void SetBlock(int index, const Block &) noexcept;
        void SetBlock(const Block::Pos &pos, const Block &block) noexcept { SetBlock(ToIndex(pos), block); }
        void SetBlock(const Pos &pos, const Block &block) noexcept { SetBlock(ToIndex(pos), block); }
@@ -144,15 +142,13 @@ public:
        bool Intersection(
                const Ray &,
                const glm::mat4 &M,
-               int &blkid,
-               float &dist,
-               glm::vec3 &normal) const noexcept;
+               WorldCollision &) noexcept;
 
        bool Intersection(
                const AABB &box,
                const glm::mat4 &Mbox,
                const glm::mat4 &Mchunk,
-               std::vector<WorldCollision> &) const noexcept;
+               std::vector<WorldCollision> &) noexcept;
 
        void Position(const Pos &pos) noexcept { position = pos; }
        const Pos &Position() const noexcept { return position; }
@@ -160,6 +156,17 @@ public:
                return glm::translate((position - offset) * Extent());
        }
 
+       void *BlockData() noexcept { return &blocks[0]; }
+       const void *BlockData() const noexcept { return &blocks[0]; }
+       static constexpr std::size_t BlockSize() noexcept { return sizeof(blocks) + sizeof(light); }
+
+       void Invalidate() noexcept { dirty_model = dirty_save = true; }
+       void InvalidateModel() noexcept { dirty_model = true; }
+       void ClearModel() noexcept { dirty_model = false; }
+       void ClearSave() noexcept { dirty_save = false; }
+       bool ShouldUpdateModel() const noexcept { return dirty_model; }
+       bool ShouldUpdateSave() const noexcept { return dirty_save; }
+
        void CheckUpdate() noexcept;
        void Draw() noexcept;
 
@@ -173,7 +180,8 @@ private:
        unsigned char light[size];
        BlockModel model;
        Pos position;
-       bool dirty;
+       bool dirty_model;
+       bool dirty_save;
 
 };