X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FChunk.hpp;h=97765677e021be36cc0f863af7ca882b973c6820;hb=04b035d837668eb6444ec34e59c018d0c25983fd;hp=7eceb980cb62d6c66918ae9b3eb7fa587416c2c3;hpb=ed3bdc028edc0ecb5835d1c0bf18dbc59b342daf;p=blank.git

diff --git a/src/world/Chunk.hpp b/src/world/Chunk.hpp
index 7eceb98..9776567 100644
--- a/src/world/Chunk.hpp
+++ b/src/world/Chunk.hpp
@@ -5,10 +5,10 @@
 #include "BlockTypeRegistry.hpp"
 #include "../geometry/Location.hpp"
 #include "../geometry/primitive.hpp"
+#include "../graphics/glm.hpp"
 
 #include <set>
 #include <vector>
-#include <glm/glm.hpp>
 #include <glm/gtx/transform.hpp>
 
 
@@ -35,6 +35,14 @@ public:
 	static glm::vec3 Center() noexcept { return glm::vec3(8.0f); }
 	static float Radius() noexcept { return 27.71281292110203669632f; /* 16 * √3 */ }
 
+	/// get bounding box relative to given reference chunk
+	AABB RelativeBounds(const ExactLocation::Coarse &ref) const noexcept {
+		AABB bounds;
+		bounds.min = (position - ref) * ExactLocation::Extent();
+		bounds.max = bounds.min + ExactLocation::FExtent();
+		return bounds;
+	}
+
 	static constexpr bool InBounds(const ExactLocation::Fine &pos) noexcept {
 		return
 			pos.x >= 0.0f && pos.x < fside &&
@@ -47,6 +55,9 @@ public:
 			pos.y >= 0 && pos.y < side &&
 			pos.z >= 0 && pos.z < side;
 	}
+	static int ToIndex(const ExactLocation::Fine &pos) noexcept {
+		return ToIndex(RoughLocation::Fine(pos));
+	}
 	static constexpr int ToIndex(const RoughLocation::Fine &pos) noexcept {
 		return pos.x + pos.y * side + pos.z * side * side;
 	}
@@ -136,21 +147,24 @@ public:
 	/// get gravity for one unit mass at given point
 	glm::vec3 GravityAt(const ExactLocation &) const noexcept;
 
+	/// check if given ray passes this chunk at all
+	/// given reference indicates the chunk offset of the ray in world space
 	bool Intersection(
 		const Ray &ray,
 		const ExactLocation::Coarse &reference,
 		float &dist
 	) const noexcept {
-		return blank::Intersection(ray, Bounds(), Transform(reference), &dist);
+		return blank::Intersection(ray, RelativeBounds(reference), dist);
 	}
 
 	/// check if given ray intersects any block of this chunk
-	/// given reference indicated the chunk offset of the ray in world space
+	/// given reference indicates the chunk offset of the ray in world space
 	bool Intersection(
 		const Ray &,
 		const ExactLocation::Coarse &reference,
 		WorldCollision &) noexcept;
 
+	/// get all blocks intersecting given box
 	bool Intersection(
 		const AABB &box,
 		const glm::mat4 &Mbox,
@@ -167,7 +181,7 @@ public:
 	const ExactLocation::Coarse &Position() const noexcept { return position; }
 
 	glm::mat4 Transform(const ExactLocation::Coarse &offset) const noexcept {
-		return glm::translate((position - offset) * ExactLocation::Extent());
+		return glm::translate(ExactLocation::Fine((position - offset) * ExactLocation::Extent()));
 	}
 
 	void *BlockData() noexcept { return &blocks[0]; }