X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FChunk.hpp;h=23ed869aa7ed17b08d91dd5bf57eff9b163cbf15;hb=13e676a6e49128ebc6c63b8dd08bef51d360e8e9;hp=02f146e12de2870793bf35f0a3275d8480b07e90;hpb=32909aa3224ec0ed5656721178eb6ad31cd047df;p=blank.git

diff --git a/src/world/Chunk.hpp b/src/world/Chunk.hpp
index 02f146e..23ed869 100644
--- 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>
@@ -20,7 +19,7 @@ class WorldCollision;
 class Chunk {
 
 public:
-	using Pos = glm::tvec3<int>;
+	using Pos = glm::ivec3;
 
 public:
 	explicit Chunk(const BlockTypeRegistry &) noexcept;
@@ -73,6 +72,10 @@ public:
 	}
 	glm::mat4 ToTransform(const Pos &pos, int idx) const noexcept;
 
+	Block::Pos ToSceneCoords(const Pos &base, const Block::Pos &pos) const noexcept {
+		return Block::Pos((position - base) * Extent()) + pos;
+	}
+
 	static bool IsBorder(const Pos &pos) noexcept {
 		return
 			pos.x == 0 ||
@@ -96,19 +99,15 @@ 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;
-	void Relink() noexcept;
 
 	// 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); }
@@ -128,7 +127,7 @@ public:
 	int GetLight(const Pos &pos) const noexcept { return GetLight(ToIndex(pos)); }
 	int GetLight(const Block::Pos &pos) const noexcept { return GetLight(ToIndex(pos)); }
 
-	float GetVertexLight(const Pos &, const BlockModel::Position &, const Model::Normal &) const noexcept;
+	float GetVertexLight(const Pos &, const BlockModel::Position &, const EntityModel::Normal &) const noexcept;
 
 	bool Intersection(
 		const Ray &ray,
@@ -141,15 +140,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; }
@@ -157,20 +154,32 @@ 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 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; }
+	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;
+	int ref_count;
+	bool dirty_model;
+	bool dirty_save;
 
 };