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

diff --git a/src/world/chunk.cpp b/src/world/chunk.cpp
index 7591266..75f9c4f 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>
@@ -185,6 +186,26 @@ void Chunk::SetBlock(int index, const Block &block) noexcept {
 	}
 }
 
+namespace {
+
+// propagate light from a's edge to b
+void edge_light(
+	Chunk &a, const Chunk::Pos &a_pos,
+	Chunk &b, const Chunk::Pos &b_pos
+) noexcept {
+	if (a.GetLight(a_pos) > 1) {
+		const BlockType &b_type = b.Type(Chunk::ToIndex(b_pos));
+		if (!b_type.block_light) {
+			light_queue.emplace(&a, a_pos);
+		}
+		if (b_type.visible) {
+			b.Invalidate();
+		}
+	}
+}
+
+}
+
 void Chunk::SetNeighbor(Chunk &other) noexcept {
 	if (other.position == position + Pos(-1, 0, 0)) {
 		if (neighbor[Block::FACE_LEFT] != &other) {
@@ -194,12 +215,8 @@ void Chunk::SetNeighbor(Chunk &other) noexcept {
 				for (int y = 0; y < height; ++y) {
 					Pos my_pos(0, y, z);
 					Pos other_pos(width - 1, y, z);
-					if (GetLight(my_pos) > 0) {
-						light_queue.emplace(this, my_pos);
-					}
-					if (other.GetLight(other_pos) > 0) {
-						light_queue.emplace(&other, other_pos);
-					}
+					edge_light(*this, my_pos, other, other_pos);
+					edge_light(other, other_pos, *this, my_pos);
 				}
 			}
 			work_light();
@@ -212,12 +229,8 @@ void Chunk::SetNeighbor(Chunk &other) noexcept {
 				for (int y = 0; y < height; ++y) {
 					Pos my_pos(width - 1, y, z);
 					Pos other_pos(0, y, z);
-					if (GetLight(my_pos) > 0) {
-						light_queue.emplace(this, my_pos);
-					}
-					if (other.GetLight(other_pos) > 0) {
-						light_queue.emplace(&other, other_pos);
-					}
+					edge_light(*this, my_pos, other, other_pos);
+					edge_light(other, other_pos, *this, my_pos);
 				}
 			}
 			work_light();
@@ -230,12 +243,8 @@ void Chunk::SetNeighbor(Chunk &other) noexcept {
 				for (int x = 0; x < width; ++x) {
 					Pos my_pos(x, 0, z);
 					Pos other_pos(x, height - 1, z);
-					if (GetLight(my_pos) > 0) {
-						light_queue.emplace(this, my_pos);
-					}
-					if (other.GetLight(other_pos) > 0) {
-						light_queue.emplace(&other, other_pos);
-					}
+					edge_light(*this, my_pos, other, other_pos);
+					edge_light(other, other_pos, *this, my_pos);
 				}
 			}
 			work_light();
@@ -248,12 +257,8 @@ void Chunk::SetNeighbor(Chunk &other) noexcept {
 				for (int x = 0; x < width; ++x) {
 					Pos my_pos(x, height - 1, z);
 					Pos other_pos(x, 0, z);
-					if (GetLight(my_pos) > 0) {
-						light_queue.emplace(this, my_pos);
-					}
-					if (other.GetLight(other_pos) > 0) {
-						light_queue.emplace(&other, other_pos);
-					}
+					edge_light(*this, my_pos, other, other_pos);
+					edge_light(other, other_pos, *this, my_pos);
 				}
 			}
 			work_light();
@@ -266,12 +271,8 @@ void Chunk::SetNeighbor(Chunk &other) noexcept {
 				for (int x = 0; x < width; ++x) {
 					Pos my_pos(x, y, 0);
 					Pos other_pos(x, y, depth - 1);
-					if (GetLight(my_pos) > 0) {
-						light_queue.emplace(this, my_pos);
-					}
-					if (other.GetLight(other_pos) > 0) {
-						light_queue.emplace(&other, other_pos);
-					}
+					edge_light(*this, my_pos, other, other_pos);
+					edge_light(other, other_pos, *this, my_pos);
 				}
 			}
 			work_light();
@@ -284,12 +285,8 @@ void Chunk::SetNeighbor(Chunk &other) noexcept {
 				for (int x = 0; x < width; ++x) {
 					Pos my_pos(x, y, depth - 1);
 					Pos other_pos(x, y, 0);
-					if (GetLight(my_pos) > 0) {
-						light_queue.emplace(this, my_pos);
-					}
-					if (other.GetLight(other_pos) > 0) {
-						light_queue.emplace(&other, other_pos);
-					}
+					edge_light(*this, my_pos, other, other_pos);
+					edge_light(other, other_pos, *this, my_pos);
 				}
 			}
 			work_light();
@@ -485,8 +482,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;
 
@@ -497,16 +496,17 @@ bool Chunk::Intersection(
 		for (int y = 0; y < height; ++y) {
 			for (int x = 0; x < width; ++x, ++idx) {
 				const BlockType &type = Type(idx);
-				if (!type.visible) {
+				if (!type.collision) {
 					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;
 }