X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fchunk.hpp;h=7e720bd84c5b49945f7dc7a45e6b2f0f1af9d699;hb=3072e2cd49ad1614100d1a1c73afe6a4888fb875;hp=e27cf5ed09d5b3e6a9b018e5bd1b4ca927450a47;hpb=a58c4558e7d4934f4d0ee621520acfe1c8258c93;p=blank.git

diff --git a/src/chunk.hpp b/src/chunk.hpp
index e27cf5e..7e720bd 100644
--- a/src/chunk.hpp
+++ b/src/chunk.hpp
@@ -32,14 +32,20 @@ public:
 
 	static AABB Bounds() { return AABB{ { 0, 0, 0 }, Extent() }; }
 
-	static constexpr bool InBounds(const glm::vec3 &pos) {
+	static constexpr bool InBounds(const Block::Pos &pos) {
 		return
 			pos.x >= 0 && pos.x < Width() &&
 			pos.y >= 0 && pos.y < Height() &&
 			pos.z >= 0 && pos.z < Depth();
 	}
-	static constexpr int ToIndex(const glm::vec3 &pos) {
-		return int(pos.x) + int(pos.y) * Width() + int(pos.z) * Width() * Height();
+	static constexpr bool InBounds(const Pos &pos) {
+		return
+			pos.x >= 0 && pos.x < Width() &&
+			pos.y >= 0 && pos.y < Height() &&
+			pos.z >= 0 && pos.z < Depth();
+	}
+	static constexpr int ToIndex(const Pos &pos) {
+		return pos.x + pos.y * Width() + pos.z * Width() * Height();
 	}
 	static constexpr bool InBounds(int idx) {
 		return idx >= 0 && idx < Size();
@@ -51,34 +57,75 @@ public:
 			0.5f + (idx / (Width() * Height()))
 		);
 	}
+	static Pos ToPos(int idx) {
+		return Pos(
+			(idx % Width()),
+			((idx / Width()) % Height()),
+			(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;
+			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
 	}
 
+	void SetNeighbor(Chunk &);
+	bool HasNeighbor(Block::Face f) const { return neighbor[f]; }
+	Chunk &GetNeighbor(Block::Face f) { return *neighbor[f]; }
+	const Chunk &GetNeighbor(Block::Face f) const { return *neighbor[f]; }
+	void ClearNeighbors();
+	void Unlink();
+	void Relink();
+
 	// 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]; }
+	void SetBlock(int index, const Block &);
+	void SetBlock(const Block::Pos &pos, const Block &block) { SetBlock(ToIndex(pos), block); }
+	void SetBlock(const Pos &pos, const Block &block) { SetBlock(ToIndex(pos), block); }
+
 	const Block &BlockAt(int index) const { return blocks[index]; }
-	Block &BlockAt(const Block::Pos &pos) { return BlockAt(ToIndex(pos)); }
 	const Block &BlockAt(const Block::Pos &pos) const { return BlockAt(ToIndex(pos)); }
+	const Block &BlockAt(const Pos &pos) const { return BlockAt(ToIndex(pos)); }
+
+	const Block *FindNext(const Pos &pos, Block::Face face) const;
+	const Block *FindNext(const Block::Pos &pos, Block::Face face) const { return FindNext(Pos(pos), face); }
+	const Block *FindNext(int index, Block::Face face) const { return FindNext(ToPos(index), face); }
 
 	const BlockType &Type(const Block &b) const { return *types->Get(b.type); }
 
+	void SetLight(int index, int level);
+	void SetLight(const Pos &pos, int level) { SetLight(ToIndex(pos), level); }
+	void SetLight(const Block::Pos &pos, int level) { SetLight(ToIndex(pos), level); }
+
+	int GetLight(int index) const;
+	int GetLight(const Pos &pos) const { return GetLight(ToIndex(pos)); }
+	int GetLight(const Block::Pos &pos) const { return GetLight(ToIndex(pos)); }
+
+	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; }
@@ -92,7 +139,9 @@ private:
 
 private:
 	const BlockTypeRegistry *types;
+	Chunk *neighbor[Block::FACE_COUNT];
 	std::vector<Block> blocks;
+	std::vector<unsigned char> light;
 	Model model;
 	Pos position;
 	bool dirty;
@@ -119,6 +168,11 @@ public:
 	void Rebase(const Chunk::Pos &);
 	void Update();
 
+private:
+	Chunk &Generate(const Chunk::Pos &pos);
+	void Insert(Chunk &);
+	void Remove(Chunk &);
+
 private:
 	Chunk::Pos base;