sped up chunk generation a little

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

diff --git a/src/world/Chunk.hpp b/src/world/Chunk.hpp
index 0440f9c7bb8a97aa10a639cefed469b304df0a7b..cc0ae8e0a9508b9e0369288f4b26dc9f5c624eed 100644 (file)
--- a/src/world/Chunk.hpp
+++ b/src/world/Chunk.hpp
@@ -99,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)
@@ -157,7 +156,16 @@ public:
 
        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); }
+       static constexpr std::size_t BlockSize() noexcept { return offsetof(Chunk, position) - offsetof(Chunk, blocks); }
+
+       bool Generated() const noexcept { return generated; }
+       void SetGenerated() noexcept { generated = true; }
+       bool Lighted() const noexcept { return lighted; }
+       void ScanLights();
+
+       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; }
@@ -171,9 +179,14 @@ public:
 private:
        const BlockTypeRegistry *types;
        Chunk *neighbor[Block::FACE_COUNT];
+
        Block blocks[size];
        unsigned char light[size];
+       bool generated;
+       bool lighted;
+
        Pos position;
+       int ref_count;
        bool dirty_model;
        bool dirty_save;