X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2Fchunk.cpp;h=b275315a5a8b7b0053d4b4ecbe5c5e4f9b21ba54;hb=f5de855fbd4bf5b0df1cad950cbe9069e41369ca;hp=9e95458ef45ac7b9b818cd40d32193bc52fc9f51;hpb=7354c74fb8f409336db3a6d70455fbc10232ae64;p=blank.git

diff --git a/src/world/chunk.cpp b/src/world/chunk.cpp
index 9e95458..b275315 100644
--- a/src/world/chunk.cpp
+++ b/src/world/chunk.cpp
@@ -84,6 +84,9 @@ struct SetNode {
 
 	const BlockType &GetType() const noexcept { return chunk->Type(Chunk::ToIndex(pos)); }
 
+	int EmitLevel() const noexcept { return GetType().luminosity; }
+	bool EmitsLight() const noexcept { return EmitLevel() > 0; }
+
 	bool HasNext(Block::Face face) noexcept {
 		const BlockType &type = GetType();
 		if (type.block_light && !type.luminosity) return false;
@@ -146,9 +149,13 @@ void work_dark() noexcept {
 		for (int face = 0; face < Block::FACE_COUNT; ++face) {
 			if (node.HasNext(Block::Face(face))) {
 				UnsetNode other = node.GetNext(Block::Face(face));
-				// TODO: if there a light source here with the same level this will err
 				if (other.Get() != 0 && other.Get() < node.level) {
-					other.Set(0);
+					if (other.EmitsLight()) {
+						other.Set(other.EmitLevel());
+						light_queue.emplace(other);
+					} else {
+						other.Set(0);
+					}
 					dark_queue.emplace(other);
 				} else {
 					light_queue.emplace(other);
@@ -453,7 +460,7 @@ bool Chunk::Intersection(
 	const glm::vec3 entity_coords(Mentity[3] - Mchunk[3]);
 	const float ec_radius = entity.Radius() + Radius();
 
-	if (distance_squared(entity_coords, Center()) > ec_radius * ec_radius) {
+	if (distance2(entity_coords, Center()) > ec_radius * ec_radius) {
 		return false;
 	}