diff options
| author | kwolekr <kwolekr@minetest.net> | 2016-06-04 20:24:07 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2016-06-05 13:30:02 -0400 |
| commit | d4457ef42061435a1ccf6f5e056f37bac9b30c02 (patch) | |
| tree | 7c32b61ee798c0a62065934a687eb9d6accfb3d5 /src/mapgen.cpp | |
| parent | d24f3841740b471eff384c8bd6e8bbfdfd03a3e2 (diff) | |
| download | minetest-d4457ef42061435a1ccf6f5e056f37bac9b30c02.tar.gz minetest-d4457ef42061435a1ccf6f5e056f37bac9b30c02.tar.bz2 minetest-d4457ef42061435a1ccf6f5e056f37bac9b30c02.zip | |
Mapgen: Optimize biomemap creation by combining with generateBiomes
Diffstat (limited to 'src/mapgen.cpp')
| -rw-r--r-- | src/mapgen.cpp | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/mapgen.cpp b/src/mapgen.cpp index 66892a574..576fb219a 100644 --- a/src/mapgen.cpp +++ b/src/mapgen.cpp @@ -524,6 +524,10 @@ MapgenBasic::~MapgenBasic() MgStoneType MapgenBasic::generateBiomes() { + // can't generate biomes without a biome generator! + assert(biomegen); + assert(biomemap); + v3s16 em = vm->m_area.getExtent(); u32 index = 0; MgStoneType stone_type = MGSTONE_STONE; @@ -546,6 +550,8 @@ MgStoneType MapgenBasic::generateBiomes() bool river_water_above = c_above == c_river_water_source; bool water_above = c_above == c_water_source || river_water_above; + biomemap[index] = BIOME_NONE; + // If there is air or water above enable top/filler placement, otherwise force // nplaced to stone level by setting a number exceeding any possible filler depth. u16 nplaced = (air_above || water_above) ? 0 : U16_MAX; @@ -560,11 +566,19 @@ MgStoneType MapgenBasic::generateBiomes() // 1. At the surface of stone below air or water. // 2. At the surface of water below air. // 3. When stone or water is detected but biome has not yet been calculated. - if ((c == c_stone && (air_above || water_above || !biome)) - || ((c == c_water_source || c == c_river_water_source) - && (air_above || !biome))) { + bool is_stone_surface = (c == c_stone) && + (air_above || water_above || !biome); + + bool is_water_surface = + (c == c_water_source || c == c_river_water_source) && + (air_above || !biome); + + if (is_stone_surface || is_water_surface) { biome = biomegen->getBiomeAtIndex(index, y); + if (biomemap[index] == BIOME_NONE && is_stone_surface) + biomemap[index] = biome->index; + depth_top = biome->depth_top; base_filler = MYMAX(depth_top + biome->depth_filler + |