X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fchunk.hpp;h=ae773657ad3a6925f20556c7b922bf5428bde770;hb=1b022dd17364c9e3344afd86572f2ead14973cde;hp=185b3eabefd5deb1076b77f36dd8a45950257900;hpb=b35ce3a6423c554b34b37362c5550bd705e63a1d;p=blank.git

diff --git a/src/chunk.hpp b/src/chunk.hpp
index 185b3ea..ae77365 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>
 
@@ -15,7 +16,10 @@ namespace blank {
 class Chunk {
 
 public:
-	Chunk();
+	using Pos = glm::tvec3<int>;
+
+public:
+	explicit Chunk(const BlockTypeRegistry &);
 
 	Chunk(Chunk &&);
 	Chunk &operator =(Chunk &&);
@@ -23,9 +27,11 @@ public:
 	static constexpr int Width() { return 16; }
 	static constexpr int Height() { return 16; }
 	static constexpr int Depth() { return 16; }
-	static glm::vec3 Extent() { return glm::vec3(Width(), Height(), Depth()); }
+	static Pos Extent() { return { Width(), Height(), Depth() }; }
 	static constexpr int Size() { return Width() * Height() * Depth(); }
 
+	static AABB Bounds() { return AABB{ { 0, 0, 0 }, Extent() }; }
+
 	static constexpr bool InBounds(const glm::vec3 &pos) {
 		return
 			pos.x >= 0 && pos.x < Width() &&
@@ -38,46 +44,107 @@ public:
 	static constexpr bool InBounds(int idx) {
 		return idx >= 0 && idx < Size();
 	}
-	static glm::vec3 ToCoords(int idx) {
-		return glm::vec3(
-			0.5f + idx % Width(),
-			0.5f + (idx / Width()) % Height(),
-			0.5f + idx / (Width() * Height())
+	static Block::Pos ToCoords(int idx) {
+		return Block::Pos(
+			0.5f + (idx % Width()),
+			0.5f + ((idx / Width()) % Height()),
+			0.5f + (idx / (Width() * Height()))
 		);
 	}
+	glm::mat4 ToTransform(int idx) const;
+
+	static constexpr bool IsBorder(int idx) {
+		return
+			idx < Width() * Height() ||                    // low Z plane
+			idx % Width() == 0 ||                          // low X plane
+			(idx / (Width() * Height())) == Depth() - 1 || // high Z plane
+			idx % Width() == Width() - 1 ||                // high X plane
+			(idx / Width()) % Height() == 0 ||             // low Y plane
+			(idx / Width()) % Height() == Height() - 1;    // high Y plane
+	}
 
+	// check if block at given index is completely enclosed (and therefore invisible)
+	bool Obstructed(int idx) const;
+
+	void Allocate();
 	void Invalidate() { dirty = true; }
 
 	Block &BlockAt(int index) { return blocks[index]; }
 	const Block &BlockAt(int index) const { return blocks[index]; }
-	Block &BlockAt(const glm::vec3 &pos) { return BlockAt(ToIndex(pos)); }
-	const Block &BlockAt(const glm::vec3 &pos) const { return BlockAt(ToIndex(pos)); }
+	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 glm::vec3 &);
-	const glm::vec3 &Position() const { return position; }
-	glm::mat4 Transform(const glm::vec3 &offset) 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;
-	glm::vec3 position;
+	Pos position;
 	bool dirty;
 
 };
 
+
+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