X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2Fchunk.cpp;h=7f7b185dc91eaff3d9c71c0126ddcd414b3d02d2;hb=d2f4c8720ae2326fac4203fa4984d835e875b355;hp=b275315a5a8b7b0053d4b4ecbe5c5e4f9b21ba54;hpb=f5de855fbd4bf5b0df1cad950cbe9069e41369ca;p=blank.git

diff --git a/src/world/chunk.cpp b/src/world/chunk.cpp
index b275315..7f7b185 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 {
 
@@ -29,7 +32,7 @@ constexpr int Chunk::size;
 Chunk::Chunk(const BlockTypeRegistry &types) noexcept
 : types(&types)
 , neighbor{0}
-, blocks{}
+, gravity()
 , light{0}
 , generated(false)
 , lighted(false)
@@ -42,6 +45,7 @@ Chunk::Chunk(const BlockTypeRegistry &types) noexcept
 
 Chunk::Chunk(Chunk &&other) noexcept
 : types(other.types)
+, gravity(std::move(other.gravity))
 , generated(other.generated)
 , lighted(other.lighted)
 , position(other.position)
@@ -57,6 +61,7 @@ Chunk::Chunk(Chunk &&other) noexcept
 Chunk &Chunk::operator =(Chunk &&other) noexcept {
 	types = other.types;
 	std::copy(other.neighbor, other.neighbor + sizeof(neighbor), neighbor);
+	gravity = std::move(other.gravity);
 	std::copy(other.blocks, other.blocks + sizeof(blocks), blocks);
 	std::copy(other.light, other.light + sizeof(light), light);
 	generated = other.generated;
@@ -174,6 +179,12 @@ void Chunk::SetBlock(int index, const Block &block) noexcept {
 	blocks[index] = block;
 	Invalidate();
 
+	if (old_type.gravity && !new_type.gravity) {
+		gravity.erase(index);
+	} else if (new_type.gravity && !old_type.gravity) {
+		gravity.insert(index);
+	}
+
 	if (!lighted || &old_type == &new_type) return;
 
 	if (new_type.luminosity > old_type.luminosity) {
@@ -233,6 +244,15 @@ void Chunk::ScanLights() {
 	lighted = true;
 }
 
+void Chunk::ScanActive() {
+	gravity.clear();
+	for (int index = 0; index < size; ++index) {
+		if (Type(index).gravity) {
+			gravity.insert(gravity.end(), index);
+		}
+	}
+}
+
 void Chunk::SetNeighbor(Block::Face face, Chunk &other) noexcept {
 	neighbor[face] = &other;
 	other.neighbor[Block::Opposite(face)] = this;
@@ -349,6 +369,20 @@ float Chunk::GetVertexLight(const RoughLocation::Fine &pos, const BlockMesh::Pos
 }
 
 
+glm::vec3 Chunk::GravityAt(const ExactLocation &coords) const noexcept {
+	glm::vec3 grav(0.0f);
+	for (int index : gravity) {
+		RoughLocation::Fine block_pos(ToPos(index));
+		ExactLocation block_coords(position, ToCoords(block_pos));
+		// trust that block type hasn't changed
+		grav += Type(index).gravity->GetGravity(
+			coords.Difference(block_coords).Absolute(),
+			ToTransform(block_pos, index));
+	}
+	return grav;
+}
+
+
 bool Chunk::IsSurface(const RoughLocation::Fine &pos) const noexcept {
 	const Block &block = BlockAt(pos);
 	if (!Type(block).visible) {
@@ -380,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;
@@ -777,16 +819,22 @@ void ChunkRenderer::Render(Viewport &viewport) {
 	chunk_prog.SetTexture(block_tex);
 	chunk_prog.SetFogDensity(fog_density);
 
+	Frustum frustum(transpose(chunk_prog.GetVP()));
+	AABB box;
+
 	for (int i = 0; i < index.TotalChunks(); ++i) {
 		if (!index[i]) continue;
-		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();
+			}
 		}
 	}
 }
@@ -1042,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) {
@@ -1052,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) {