From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Fri, 13 Mar 2015 17:55:03 +0000 (+0100)
Subject: fix error in border block calculation
X-Git-Url: http://git.localhorst.tv/?a=commitdiff_plain;h=1b022dd17364c9e3344afd86572f2ead14973cde;p=blank.git

fix error in border block calculation
---

diff --git a/src/block.hpp b/src/block.hpp
index a142a96..3ccd74f 100644
--- a/src/block.hpp
+++ b/src/block.hpp
@@ -61,6 +61,7 @@ struct BlockType {
 
 	bool visible;
 
+	// FIXME: fill faces don't respect block orientation
 	struct Faces {
 		bool up;
 		bool down;
diff --git a/src/chunk.hpp b/src/chunk.hpp
index 19f5c07..ae77365 100644
--- a/src/chunk.hpp
+++ b/src/chunk.hpp
@@ -55,10 +55,12 @@ public:
 
 	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
 	}
 
 	// check if block at given index is completely enclosed (and therefore invisible)