X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2Fchunk.cpp;h=97ec3e353600d0efa79cb49c67aca250da142786;hb=242b87a5fb412f9006e4b7debc1408cf7ac83000;hp=6eb027a58f233173dc1026de7da64e4931ad7f59;hpb=1e93bfb5089737f6b6d8fdd2f17260944fca44b2;p=blank.git

diff --git a/src/world/chunk.cpp b/src/world/chunk.cpp
index 6eb027a..97ec3e3 100644
--- a/src/world/chunk.cpp
+++ b/src/world/chunk.cpp
@@ -415,9 +415,17 @@ bool Chunk::Intersection(
 				if (!type.collision || !type.shape) {
 					continue;
 				}
+				RoughLocation::Fine pos(x, y, z);
+
+				// center of the blok relative to the ray
+				glm::vec3 relative_center(glm::vec3((position - reference) * ExactLocation::Extent() + pos) + 0.5f);
+				if (ray.DistanceSquared(relative_center) > 3.0f) {
+					continue;
+				}
+
 				float cur_dist;
 				glm::vec3 cur_norm;
-				if (type.shape->Intersects(ray, ToTransform(reference, RoughLocation::Fine(x, y, z), idx), cur_dist, cur_norm)) {
+				if (type.shape->Intersects(ray, ToTransform(reference, pos, idx), cur_dist, cur_norm)) {
 					if (cur_dist < coll.depth) {
 						coll.block = idx;
 						coll.depth = cur_dist;
@@ -815,33 +823,21 @@ void ChunkRenderer::Render(Viewport &viewport) {
 	Frustum frustum(transpose(chunk_prog.GetVP()));
 	AABB box;
 
-	//std::cout << "V = " << chunk_prog.View() << std::endl;
-	//std::cout << "P = " << chunk_prog.Projection() << std::endl;
-	//std::cout << "VP = " << chunk_prog.GetVP() << std::endl;
-	//std::cout << "frustum = " << frustum << std::endl;
-
 	for (int i = 0; i < index.TotalChunks(); ++i) {
 		if (!index[i]) continue;
 		box.min = (index[i]->Position() - index.Base()) * ExactLocation::Extent();
 		box.max = box.min + ExactLocation::FExtent();
 
 		if (!CullTest(box, frustum)) {
-
-			//glm::mat4 m(index[i]->Transform(index.Base()));
-			//if (CullTest(Chunk::Bounds(), chunk_prog.GetVP() * m)) {
-			//	std::cout << "M = " << m << std::endl;
-			//	std::cout << "box = " << box.min << ", " << box.max << std::endl;
-			//	std::cout << "should've been culled" << std::endl;
-			//}
-
 			if (index[i]->ShouldUpdateMesh()) {
 				index[i]->Update(models[i]);
 			}
-			chunk_prog.SetM(index[i]->Transform(index.Base()));
-			models[i].Draw();
+			if (!models[i].Empty()) {
+				chunk_prog.SetM(index[i]->Transform(index.Base()));
+				models[i].Draw();
+			}
 		}
 	}
-	//std::cout << std::endl;
 }