X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2Fchunk.cpp;h=3374e996f74bfae6c9a3c1a36d0d9b972ce69f7b;hb=dcd54cacda98c2c0f7cf0c7a9131fb858d8ee10a;hp=e93966e959ce13d4678dfaa3f5870ffcade50e17;hpb=ed3bdc028edc0ecb5835d1c0bf18dbc59b342daf;p=blank.git

diff --git a/src/world/chunk.cpp b/src/world/chunk.cpp
index e93966e..3374e99 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 {
 
@@ -30,7 +33,6 @@ Chunk::Chunk(const BlockTypeRegistry &types) noexcept
 : types(&types)
 , neighbor{0}
 , gravity()
-, blocks{}
 , light{0}
 , generated(false)
 , lighted(false)
@@ -368,7 +370,7 @@ float Chunk::GetVertexLight(const RoughLocation::Fine &pos, const BlockMesh::Pos
 
 
 glm::vec3 Chunk::GravityAt(const ExactLocation &coords) const noexcept {
-	glm::vec3 grav;
+	glm::vec3 grav(0.0f);
 	for (int index : gravity) {
 		RoughLocation::Fine block_pos(ToPos(index));
 		ExactLocation block_coords(position, ToCoords(block_pos));
@@ -412,9 +414,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;
@@ -455,13 +465,13 @@ bool Chunk::Intersection(
 	constexpr float block_rad = 2.0f;
 	const float bb_radius = box_rad + block_rad;
 
-	const RoughLocation::Fine begin(max(
+	const RoughLocation::Fine begin(glm::max(
 		RoughLocation::Fine(0),
-		RoughLocation::Fine(floor(box_coords - bb_radius))
+		RoughLocation::Fine(glm::floor(box_coords - bb_radius))
 	));
-	const RoughLocation::Fine end(min(
+	const RoughLocation::Fine end(glm::min(
 		RoughLocation::Fine(side - 1),
-		RoughLocation::Fine(ceil(box_coords + bb_radius))
+		RoughLocation::Fine(glm::ceil(box_coords + bb_radius))
 	) - 1);
 
 	for (RoughLocation::Fine pos(begin); pos.z < end.y; ++pos.z) {
@@ -492,7 +502,7 @@ bool Chunk::Intersection(
 	const glm::vec3 entity_coords(Mentity[3] - Mchunk[3]);
 	const float ec_radius = entity.Radius() + Radius();
 
-	if (distance2(entity_coords, Center()) > ec_radius * ec_radius) {
+	if (glm::distance2(entity_coords, Center()) > ec_radius * ec_radius) {
 		return false;
 	}
 
@@ -504,13 +514,13 @@ bool Chunk::Intersection(
 	constexpr float block_rad = 2.0f;
 	const float eb_radius = entity.Radius() + block_rad;
 
-	const RoughLocation::Fine begin(max(
+	const RoughLocation::Fine begin(glm::max(
 		RoughLocation::Fine(0),
-		RoughLocation::Fine(floor(entity_coords - eb_radius))
+		RoughLocation::Fine(glm::floor(entity_coords - eb_radius))
 	));
-	const RoughLocation::Fine end(min(
+	const RoughLocation::Fine end(glm::min(
 		RoughLocation::Fine(side),
-		RoughLocation::Fine(ceil(entity_coords + eb_radius))
+		RoughLocation::Fine(glm::ceil(entity_coords + eb_radius))
 	));
 
 	for (RoughLocation::Fine pos(begin); pos.z < end.z; ++pos.z) {
@@ -809,17 +819,22 @@ void ChunkRenderer::Render(Viewport &viewport) {
 	chunk_prog.SetTexture(block_tex);
 	chunk_prog.SetFogDensity(fog_density);
 
+	Frustum frustum(glm::transpose(chunk_prog.GetVP()));
+	AABB box;
+
 	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)) {
 			if (index[i]->ShouldUpdateMesh()) {
 				index[i]->Update(models[i]);
 			}
-			chunk_prog.SetM(m);
-			models[i].Draw();
+			if (!models[i].Empty()) {
+				chunk_prog.SetM(index[i]->Transform(index.Base()));
+				models[i].Draw();
+			}
 		}
 	}
 }
@@ -1075,7 +1090,7 @@ ChunkIndex *ChunkStore::ClosestIndex(const ExactLocation::Coarse &pos) {
 	return closest_index;
 }
 
-Chunk *ChunkStore::Get(const ExactLocation::Coarse &pos) {
+Chunk *ChunkStore::Get(const ExactLocation::Coarse &pos) noexcept {
 	for (ChunkIndex &index : indices) {
 		Chunk *chunk = index.Get(pos);
 		if (chunk) {
@@ -1085,6 +1100,16 @@ Chunk *ChunkStore::Get(const ExactLocation::Coarse &pos) {
 	return nullptr;
 }
 
+const Chunk *ChunkStore::Get(const ExactLocation::Coarse &pos) const noexcept {
+	for (const ChunkIndex &index : indices) {
+		const Chunk *chunk = index.Get(pos);
+		if (chunk) {
+			return chunk;
+		}
+	}
+	return nullptr;
+}
+
 Chunk *ChunkStore::Allocate(const ExactLocation::Coarse &pos) {
 	Chunk *chunk = Get(pos);
 	if (chunk) {