special treatment for players

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

diff --git a/src/world/Chunk.hpp b/src/world/Chunk.hpp
index f4f0bf006300d0c68b40e88b6aed65210ce29e96..0440f9c7bb8a97aa10a639cefed469b304df0a7b 100644 (file)
--- a/src/world/Chunk.hpp
+++ b/src/world/Chunk.hpp
@@ -3,7 +3,6 @@
 
 #include "Block.hpp"
 #include "BlockTypeRegistry.hpp"
-#include "../model/BlockModel.hpp"
 #include "../model/geometry.hpp"
 
 #include <vector>
@@ -110,8 +109,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 +141,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,20 +155,27 @@ public:
                return glm::translate((position - offset) * Extent());
        }
 
-       void CheckUpdate() noexcept;
-       void Draw() noexcept;
+       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); }
 
-private:
-       void Update() noexcept;
+       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 Update(BlockModel &) noexcept;
 
 private:
        const BlockTypeRegistry *types;
        Chunk *neighbor[Block::FACE_COUNT];
        Block blocks[size];
        unsigned char light[size];
-       BlockModel model;
        Pos position;
-       bool dirty;
+       bool dirty_model;
+       bool dirty_save;
 
 };