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

diff --git a/src/world/chunk.cpp b/src/world/chunk.cpp
index d124eb7..6eb027a 100644
--- a/src/world/chunk.cpp
+++ b/src/world/chunk.cpp
@@ -19,6 +19,9 @@
 #include <ostream>
 #include <queue>
 
+#include <iostream>
+#include <glm/gtx/io.hpp>
+
 
 namespace blank {
 
@@ -809,19 +812,36 @@ void ChunkRenderer::Render(Viewport &viewport) {
 	chunk_prog.SetTexture(block_tex);
 	chunk_prog.SetFogDensity(fog_density);
 
+	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;
-		// TODO: optimize chunk culling, shoudn't be that hard
-		glm::mat4 m(index[i]->Transform(index.Base()));
-		glm::mat4 mvp(chunk_prog.GetVP() * m);
-		if (!CullTest(Chunk::Bounds(), mvp)) {
+		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(m);
+			chunk_prog.SetM(index[i]->Transform(index.Base()));
 			models[i].Draw();
 		}
 	}
+	//std::cout << std::endl;
 }