split chunk stuff

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

diff --git a/src/world/Chunk.hpp b/src/world/Chunk.hpp
index 61ec83bd0aaad9f048fd50721a67e63eba0070f4..23ed869aa7ed17b08d91dd5bf57eff9b163cbf15 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>
@@ -100,11 +99,10 @@ public:
        bool IsSurface(const Block::Pos &pos) const noexcept { return IsSurface(Pos(pos)); }
        bool IsSurface(const Pos &pos) const noexcept;
 
-       void SetNeighbor(Chunk &) noexcept;
+       void SetNeighbor(Block::Face, Chunk &) noexcept;
        bool HasNeighbor(Block::Face f) const noexcept { return neighbor[f]; }
        Chunk &GetNeighbor(Block::Face f) noexcept { return *neighbor[f]; }
        const Chunk &GetNeighbor(Block::Face f) const noexcept { return *neighbor[f]; }
-       void ClearNeighbors() noexcept;
        void Unlink() noexcept;
 
        // check which faces of a block at given index are obstructed (and therefore invisible)
@@ -160,6 +158,10 @@ public:
        const void *BlockData() const noexcept { return &blocks[0]; }
        static constexpr std::size_t BlockSize() noexcept { return sizeof(blocks) + sizeof(light); }
 
+       void Ref() noexcept { ++ref_count; }
+       void UnRef() noexcept { --ref_count; }
+       bool Referenced() const noexcept { return ref_count > 0; }
+
        void Invalidate() noexcept { dirty_model = dirty_save = true; }
        void InvalidateModel() noexcept { dirty_model = true; }
        void ClearModel() noexcept { dirty_model = false; }
@@ -167,19 +169,15 @@ public:
        bool ShouldUpdateModel() const noexcept { return dirty_model; }
        bool ShouldUpdateSave() const noexcept { return dirty_save; }
 
-       void CheckUpdate() noexcept;
-       void Draw() noexcept;
-
-private:
-       void Update() noexcept;
+       void Update(BlockModel &) noexcept;
 
 private:
        const BlockTypeRegistry *types;
        Chunk *neighbor[Block::FACE_COUNT];
        Block blocks[size];
        unsigned char light[size];
-       BlockModel model;
        Pos position;
+       int ref_count;
        bool dirty_model;
        bool dirty_save;