X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fchunk.hpp;h=19f5c07ea31f453b0b10573342c8bebe7f44dc04;hb=950adaa5bdb9bf758400f2c00df623865b6bff1d;hp=3c301803495038beeb99f59db847db5ffa6d1498;hpb=eca1fdcc8e34a4918418b2de122c6200aeb7ceaf;p=blank.git

diff --git a/src/chunk.hpp b/src/chunk.hpp
index 3c30180..19f5c07 100644
--- a/src/chunk.hpp
+++ b/src/chunk.hpp
@@ -5,6 +5,7 @@
 #include "geometry.hpp"
 #include "model.hpp"
 
+#include <list>
 #include <vector>
 #include <glm/glm.hpp>
 
@@ -18,7 +19,7 @@ public:
 	using Pos = glm::tvec3<int>;
 
 public:
-	Chunk();
+	explicit Chunk(const BlockTypeRegistry &);
 
 	Chunk(Chunk &&);
 	Chunk &operator =(Chunk &&);
@@ -50,6 +51,18 @@ public:
 			0.5f + (idx / (Width() * Height()))
 		);
 	}
+	glm::mat4 ToTransform(int idx) const;
+
+	static constexpr bool IsBorder(int idx) {
+		return
+			idx < Width() * Height() ||
+			(idx / Width()) % Height() == 0 ||
+			(idx / Width()) % Height() == Height() - 1 ||
+			(idx / (Width() * Height())) == Depth() - 1;
+	}
+
+	// check if block at given index is completely enclosed (and therefore invisible)
+	bool Obstructed(int idx) const;
 
 	void Allocate();
 	void Invalidate() { dirty = true; }
@@ -59,24 +72,35 @@ public:
 	Block &BlockAt(const Block::Pos &pos) { return BlockAt(ToIndex(pos)); }
 	const Block &BlockAt(const Block::Pos &pos) const { return BlockAt(ToIndex(pos)); }
 
+	const BlockType &Type(const Block &b) const { return *types->Get(b.type); }
+
+	bool Intersection(
+		const Ray &ray,
+		const glm::mat4 &M,
+		float &dist
+	) const {
+		return blank::Intersection(ray, Bounds(), M, &dist);
+	}
+
 	bool Intersection(
 		const Ray &,
 		const glm::mat4 &M,
-		int *blkid = nullptr,
-		float *dist = nullptr,
-		glm::vec3 *normal = nullptr) const;
+		int &blkid,
+		float &dist,
+		glm::vec3 &normal) const;
 
 	void Position(const Pos &);
 	const Pos &Position() const { return position; }
 	glm::mat4 Transform(const Pos &offset) const;
 
+	void CheckUpdate();
 	void Draw();
 
 private:
-	int VertexCount() const;
 	void Update();
 
 private:
+	const BlockTypeRegistry *types;
 	std::vector<Block> blocks;
 	Model model;
 	Pos position;
@@ -84,6 +108,41 @@ private:
 
 };
 
+
+class Generator;
+
+class ChunkLoader {
+
+public:
+	ChunkLoader(const BlockTypeRegistry &, const Generator &);
+
+	void Generate(const Chunk::Pos &from, const Chunk::Pos &to);
+
+	std::list<Chunk> &Loaded() { return loaded; }
+
+	Chunk *Loaded(const Chunk::Pos &);
+	bool Queued(const Chunk::Pos &);
+	bool Known(const Chunk::Pos &);
+	Chunk &ForceLoad(const Chunk::Pos &);
+
+	void Rebase(const Chunk::Pos &);
+	void Update();
+
+private:
+	Chunk::Pos base;
+
+	const BlockTypeRegistry &reg;
+	const Generator &gen;
+
+	std::list<Chunk> loaded;
+	std::list<Chunk::Pos> to_generate;
+	std::list<Chunk> to_free;
+
+	int load_dist;
+	int unload_dist;
+
+};
+
 }
 
 #endif