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

diff --git a/src/chunk.hpp b/src/chunk.hpp
index 255d73b..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)
@@ -74,12 +76,20 @@ public:
 
 	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; }