From: kwolekr <kwolekr@minetest.net>
Date: Sun, 7 Apr 2013 06:26:46 +0000 (-0400)
Subject: Fix black tree leaves, reduce above-ground cave shadows
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=96e2931c5c154262566359495d4a0b8515376947;p=zefram%2Fminetest%2Fminetest_engine.git

Fix black tree leaves, reduce above-ground cave shadows
---

diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index b7711b01..22488bc4 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -241,8 +241,7 @@ void Mapgen::updateLiquid(UniqueQueue<v3s16> *trans_liquid, v3s16 nmin, v3s16 nm
 
 void Mapgen::setLighting(v3s16 nmin, v3s16 nmax, u8 light) {
 	ScopeProfiler sp(g_profiler, "EmergeThread: mapgen lighting update", SPT_AVG);
-	VoxelArea a(nmin - v3s16(1,0,1) * MAP_BLOCKSIZE,
-				nmax + v3s16(1,0,1) * MAP_BLOCKSIZE);
+	VoxelArea a(nmin, nmax);
 
 	for (int z = a.MinEdge.Z; z <= a.MaxEdge.Z; z++) {
 		for (int y = a.MinEdge.Y; y <= a.MaxEdge.Y; y++) {
@@ -278,8 +277,7 @@ void Mapgen::lightSpread(VoxelArea &a, v3s16 p, u8 light) {
 
 
 void Mapgen::calcLighting(v3s16 nmin, v3s16 nmax) {
-	VoxelArea a(nmin - v3s16(1,0,1) * MAP_BLOCKSIZE,
-				nmax + v3s16(1,0,1) * MAP_BLOCKSIZE);
+	VoxelArea a(nmin, nmax);
 	bool block_is_underground = (water_level >= nmax.Y);
 
 	ScopeProfiler sp(g_profiler, "EmergeThread: mapgen lighting update", SPT_AVG);
@@ -342,9 +340,7 @@ void Mapgen::calcLighting(v3s16 nmin, v3s16 nmax) {
 
 void Mapgen::calcLightingOld(v3s16 nmin, v3s16 nmax) {
 	enum LightBank banks[2] = {LIGHTBANK_DAY, LIGHTBANK_NIGHT};
-
-	VoxelArea a(nmin - v3s16(1,0,1) * MAP_BLOCKSIZE,
-				nmax + v3s16(1,0,1) * MAP_BLOCKSIZE);
+	VoxelArea a(nmin, nmax);
 	bool block_is_underground = (water_level > nmax.Y);
 	bool sunlight = !block_is_underground;
 
diff --git a/src/mapgen_singlenode.cpp b/src/mapgen_singlenode.cpp
index 22b756ab..f05ddd2f 100644
--- a/src/mapgen_singlenode.cpp
+++ b/src/mapgen_singlenode.cpp
@@ -91,7 +91,8 @@ void MapgenSinglenode::makeChunk(BlockMakeData *data) {
 	updateLiquid(&data->transforming_liquid, node_min, node_max);
 
 	// Calculate lighting
-	calcLighting(node_min, node_max);
+	calcLighting(node_min - v3s16(1, 0, 1) * MAP_BLOCKSIZE,
+				 node_max + v3s16(1, 0, 1) * MAP_BLOCKSIZE);
 	
 	this->generating = false;
 }
diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp
index 275d4b78..4a037bb8 100644
--- a/src/mapgen_v6.cpp
+++ b/src/mapgen_v6.cpp
@@ -471,7 +471,8 @@ void MapgenV6::makeChunk(BlockMakeData *data) {
 	}
 
 	// Calculate lighting
-	calcLighting(node_min, node_max);
+	calcLighting(node_min - v3s16(1, 1, 1) * MAP_BLOCKSIZE,
+				 node_max + v3s16(1, 0, 1) * MAP_BLOCKSIZE);
 	
 	this->generating = false;
 }
diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
index af453c2e..6aecfe31 100644
--- a/src/mapgen_v7.cpp
+++ b/src/mapgen_v7.cpp
@@ -186,7 +186,9 @@ void MapgenV7::makeChunk(BlockMakeData *data) {
 	//printf("makeChunk: %dms\n", t.stop());
 	
 	updateLiquid(&data->transforming_liquid, full_node_min, full_node_max);
-	calcLighting(node_min, node_max);
+	
+	calcLighting(node_min - v3s16(1, 0, 1) * MAP_BLOCKSIZE,
+				 node_max + v3s16(1, 0, 1) * MAP_BLOCKSIZE);
 	//setLighting(node_min, node_max, 0xFF);
 
 	this->generating = false;