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

diff --git a/src/chunk.hpp b/src/chunk.hpp
index 6c9eeff..7e720bd 100644
--- a/src/chunk.hpp
+++ b/src/chunk.hpp
@@ -38,13 +38,13 @@ public:
 			pos.y >= 0 && pos.y < Height() &&
 			pos.z >= 0 && pos.z < Depth();
 	}
-	static constexpr bool InBounds(const Chunk::Pos &pos) {
+	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 Chunk::Pos &pos) {
+	static constexpr int ToIndex(const Pos &pos) {
 		return pos.x + pos.y * Width() + pos.z * Width() * Height();
 	}
 	static constexpr bool InBounds(int idx) {
@@ -57,8 +57,8 @@ public:
 			0.5f + (idx / (Width() * Height()))
 		);
 	}
-	static Chunk::Pos ToPos(int idx) {
-		return Chunk::Pos(
+	static Pos ToPos(int idx) {
+		return Pos(
 			(idx % Width()),
 			((idx / Width()) % Height()),
 			(idx / (Width() * Height()))
@@ -90,15 +90,28 @@ public:
 	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)); }
-	Block &BlockAt(const Chunk::Pos &pos) { return BlockAt(ToIndex(pos)); }
-	const Block &BlockAt(const Chunk::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,
@@ -128,6 +141,7 @@ private:
 	const BlockTypeRegistry *types;
 	Chunk *neighbor[Block::FACE_COUNT];
 	std::vector<Block> blocks;
+	std::vector<unsigned char> light;
 	Model model;
 	Pos position;
 	bool dirty;