Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-12-25 07:32:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix black tree leaves, reduce above-ground cave shadows

Browse Source
This commit is contained in:
kwolekr 2013-04-07 02:26:46 -04:00
parent 5961106f9f
commit 96e2931c5c
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mapgen.cpp
View File

@ -241,8 +241,7 @@ void Mapgen::updateLiquid(UniqueQueue<v3s16> *trans_liquid, v3s16 nmin, v3s16 nm
void Mapgen::setLighting(v3s16 nmin, v3s16 nmax, u8 light) { void Mapgen::setLighting(v3s16 nmin, v3s16 nmax, u8 light) {
ScopeProfiler sp(g_profiler, "EmergeThread: mapgen lighting update", SPT_AVG); ScopeProfiler sp(g_profiler, "EmergeThread: mapgen lighting update", SPT_AVG);
VoxelArea a(nmin - v3s16(1,0,1) * MAP_BLOCKSIZE, VoxelArea a(nmin, nmax);
nmax + v3s16(1,0,1) * MAP_BLOCKSIZE);
for (int z = a.MinEdge.Z; z <= a.MaxEdge.Z; z++) { for (int z = a.MinEdge.Z; z <= a.MaxEdge.Z; z++) {
for (int y = a.MinEdge.Y; y <= a.MaxEdge.Y; y++) { 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) { void Mapgen::calcLighting(v3s16 nmin, v3s16 nmax) {
VoxelArea a(nmin - v3s16(1,0,1) * MAP_BLOCKSIZE, VoxelArea a(nmin, nmax);
nmax + v3s16(1,0,1) * MAP_BLOCKSIZE);
bool block_is_underground = (water_level >= nmax.Y); bool block_is_underground = (water_level >= nmax.Y);
ScopeProfiler sp(g_profiler, "EmergeThread: mapgen lighting update", SPT_AVG); 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) { void Mapgen::calcLightingOld(v3s16 nmin, v3s16 nmax) {
enum LightBank banks[2] = {LIGHTBANK_DAY, LIGHTBANK_NIGHT}; enum LightBank banks[2] = {LIGHTBANK_DAY, LIGHTBANK_NIGHT};
VoxelArea a(nmin, nmax);
VoxelArea a(nmin - v3s16(1,0,1) * MAP_BLOCKSIZE,
nmax + v3s16(1,0,1) * MAP_BLOCKSIZE);
bool block_is_underground = (water_level > nmax.Y); bool block_is_underground = (water_level > nmax.Y);
bool sunlight = !block_is_underground; bool sunlight = !block_is_underground;

3
src/mapgen_singlenode.cpp
View File

@ -91,7 +91,8 @@ void MapgenSinglenode::makeChunk(BlockMakeData *data) {
updateLiquid(&data->transforming_liquid, node_min, node_max); updateLiquid(&data->transforming_liquid, node_min, node_max);
// Calculate lighting // 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; this->generating = false;
} }

3
src/mapgen_v6.cpp
View File

@ -471,7 +471,8 @@ void MapgenV6::makeChunk(BlockMakeData *data) {
} }
// Calculate lighting // 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; this->generating = false;
} }

4
src/mapgen_v7.cpp
View File

@ -186,7 +186,9 @@ void MapgenV7::makeChunk(BlockMakeData *data) {
//printf("makeChunk: %dms\n", t.stop()); //printf("makeChunk: %dms\n", t.stop());
updateLiquid(&data->transforming_liquid, full_node_min, full_node_max); 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); //setLighting(node_min, node_max, 0xFF);
this->generating = false; this->generating = false;