X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2Fchunk.cpp;h=cc305cd56a4b293f8aa1df121e797033f6e261b0;hb=3b2fe22c33074664b0c4f24be374e4e6c1c0ed2f;hp=a6f1521eeeafc39bdacf7478475f21b725007104;hpb=ee920127d653b8a3cfbee1efefde909ffa177662;p=blank.git

diff --git a/src/world/chunk.cpp b/src/world/chunk.cpp
index a6f1521..cc305cd 100644
--- a/src/world/chunk.cpp
+++ b/src/world/chunk.cpp
@@ -400,11 +400,60 @@ bool Chunk::Intersection(
 	const glm::mat4 &Mchunk,
 	std::vector<WorldCollision> &col
 ) noexcept {
+	bool any = false;
+	float penetration;
+	glm::vec3 normal;
+
+	if (!blank::Intersection(box, Mbox, Bounds(), Mchunk, penetration, normal)) {
+		return false;
+	}
+
 	// box's origin relative to the chunk
 	const glm::vec3 box_coords(Mbox[3] - Mchunk[3]);
 	const float box_rad = box.OriginRadius();
 
-	if (distance_squared(box_coords, Center()) > (box_rad + Radius()) * (box_rad + Radius())) {
+	// assume a bounding radius of 2 for blocks
+	constexpr float block_rad = 2.0f;
+	const float bb_radius = box_rad + block_rad;
+
+	const RoughLocation::Fine begin(max(
+		RoughLocation::Fine(0),
+		RoughLocation::Fine(floor(box_coords - bb_radius))
+	));
+	const RoughLocation::Fine end(min(
+		RoughLocation::Fine(side - 1),
+		RoughLocation::Fine(ceil(box_coords + bb_radius))
+	) - 1);
+
+	for (RoughLocation::Fine pos(begin); pos.z < end.y; ++pos.z) {
+		for (pos.y = begin.y; pos.y < end.y; ++pos.y) {
+			for (pos.x = begin.x; pos.x < end.x; ++pos.x) {
+				int idx = ToIndex(pos);
+				const BlockType &type = Type(idx);
+				if (!type.collision || !type.shape) {
+					continue;
+				}
+				if (type.shape->Intersects(Mchunk * ToTransform(pos, idx), box, Mbox, penetration, normal)) {
+					col.emplace_back(this, idx, penetration, normal);
+					any = true;
+				}
+			}
+		}
+	}
+	return any;
+}
+
+bool Chunk::Intersection(
+	const Entity &entity,
+	const glm::mat4 &Mentity,
+	const glm::mat4 &Mchunk,
+	std::vector<WorldCollision> &col
+) noexcept {
+	// entity's origin relative to the chunk
+	const glm::vec3 entity_coords(Mentity[3] - Mchunk[3]);
+	const float ec_radius = entity.Radius() + Radius();
+
+	if (distance_squared(entity_coords, Center()) > ec_radius * ec_radius) {
 		return false;
 	}
 
@@ -414,18 +463,26 @@ bool Chunk::Intersection(
 
 	// assume a bounding radius of 2 for blocks
 	constexpr float block_rad = 2.0f;
-	for (int idx = 0, z = 0; z < side; ++z) {
-		for (int y = 0; y < side; ++y) {
-			for (int x = 0; x < side; ++x, ++idx) {
+	const float eb_radius = entity.Radius() + block_rad;
+
+	const RoughLocation::Fine begin(max(
+		RoughLocation::Fine(0),
+		RoughLocation::Fine(floor(entity_coords - eb_radius))
+	));
+	const RoughLocation::Fine end(min(
+		RoughLocation::Fine(side),
+		RoughLocation::Fine(ceil(entity_coords + eb_radius))
+	));
+
+	for (RoughLocation::Fine pos(begin); pos.z < end.z; ++pos.z) {
+		for (pos.y = begin.y; pos.y < end.y; ++pos.y) {
+			for (pos.x = begin.x; pos.x < end.x; ++pos.x) {
+				int idx = ToIndex(pos);
 				const BlockType &type = Type(idx);
 				if (!type.collision || !type.shape) {
 					continue;
 				}
-				const RoughLocation::Fine block_pos(x, y, z);
-				const ExactLocation::Fine block_coords(ToCoords(block_pos));
-				if (distance_squared(box_coords, block_coords) <= (box_rad + block_rad) * (box_rad + block_rad)
-					&& type.shape->Intersects(Mchunk * ToTransform(block_pos, idx), box, Mbox, penetration, normal)
-				) {
+				if (type.shape->Intersects(Mchunk * ToTransform(pos, idx), entity.Bounds(), Mentity, penetration, normal)) {
 					col.emplace_back(this, idx, penetration, normal);
 					any = true;
 				}