X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2Fchunk.cpp;h=2c5e7ec4ebad297570c5ef71fd2799822e5e30cc;hb=32909aa3224ec0ed5656721178eb6ad31cd047df;hp=7591266be5433ecb6b7a0e6c200e1eb3026a68e7;hpb=419e33e565bffbaf0416ed4a5f80e9c81f62a479;p=blank.git

diff --git a/src/world/chunk.cpp b/src/world/chunk.cpp
index 7591266..2c5e7ec 100644
--- a/src/world/chunk.cpp
+++ b/src/world/chunk.cpp
@@ -3,6 +3,7 @@
 #include "ChunkLoader.hpp"
 
 #include "Generator.hpp"
+#include "WorldCollision.hpp"
 
 #include <algorithm>
 #include <iostream>
@@ -485,8 +486,10 @@ bool Chunk::Intersection(
 bool Chunk::Intersection(
 	const AABB &box,
 	const glm::mat4 &Mbox,
-	const glm::mat4 &Mchunk
+	const glm::mat4 &Mchunk,
+	std::vector<WorldCollision> &col
 ) const noexcept {
+	bool any = false;
 	float penetration;
 	glm::vec3 normal;
 
@@ -500,13 +503,14 @@ bool Chunk::Intersection(
 				if (!type.visible) {
 					continue;
 				}
-				if (type.shape->Intersects(Mchunk * ToTransform(Pos(x, y, z), idx), box, Mbox)) {
-					return true;
+				if (type.shape->Intersects(Mchunk * ToTransform(Pos(x, y, z), idx), box, Mbox, penetration, normal)) {
+					col.emplace_back(this, idx, penetration, normal);
+					any = true;
 				}
 			}
 		}
 	}
-	return false;
+	return any;
 }