From 8cb7badd632200e06004577f351b9c845c174e29 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Fri, 27 Jan 2012 14:10:10 +0200
Subject: Do post-mapgen lighting using the VoxelManipulator-based functions
 (causes glitches currently)

---
 src/map.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/map.cpp')

diff --git a/src/map.cpp b/src/map.cpp
index 1ab2b32ae..2625cbad5 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -2076,10 +2076,13 @@ void ServerMap::initBlockMake(mapgen::BlockMakeData *data, v3s16 blockpos)
 				<<"("<<blockpos.X<<","<<blockpos.Y<<","<<blockpos.Z<<")"
 				<<std::endl;
 	
-	s16 chunksize = 2;
-	v3s16 blockpos_div = getContainerPos(blockpos, chunksize);
+	s16 chunksize = 3;
+	v3s16 chunk_offset(-1,-1,-1);
+	v3s16 blockpos_div = getContainerPos(blockpos - chunk_offset, chunksize);
 	v3s16 blockpos_min = blockpos_div * chunksize;
 	v3s16 blockpos_max = blockpos_div * chunksize + v3s16(1,1,1)*(chunksize-1);
+	blockpos_min += chunk_offset;
+	blockpos_max += chunk_offset;
 	
 	// Do nothing if not inside limits (+-1 because of neighbors)
 	if(blockpos_over_limit(blockpos_min - v3s16(1,1,1)) ||
@@ -2223,6 +2226,7 @@ MapBlock* ServerMap::finishBlockMake(mapgen::BlockMakeData *data,
 		Update lighting
 	*/
 	{
+#if 0
 		TimeTaker t("finishBlockMake lighting update");
 
 		core::map<v3s16, MapBlock*> lighting_update_blocks;
@@ -2239,6 +2243,7 @@ MapBlock* ServerMap::finishBlockMake(mapgen::BlockMakeData *data,
 		}
 
 		updateLighting(lighting_update_blocks, changed_blocks);
+#endif
 		
 		/*
 			Set lighting to non-expired state in all of them.
@@ -2253,8 +2258,10 @@ MapBlock* ServerMap::finishBlockMake(mapgen::BlockMakeData *data,
 			getBlockNoCreateNoEx(p)->setLightingExpired(false);
 		}
 
+#if 0
 		if(enable_mapgen_debug_info == false)
 			t.stop(true); // Hide output
+#endif
 	}
 
 	// Center blocks
-- 
cgit v1.2.3