mapgen: drop mapgen id from child mapgens.

[oweals/minetest.git] / src / mapgen / mapgen.cpp

diff --git a/src/mapgen/mapgen.cpp b/src/mapgen/mapgen.cpp
index 9aaead79d23c36b5b57f2647be19e5614ca41cad..c46ff7c83d8dcfd747035e1d67a05d24f7ff77b3 100644 (file)
--- a/src/mapgen/mapgen.cpp
+++ b/src/mapgen/mapgen.cpp
@@ -56,7 +56,8 @@ FlagDesc flagdesc_mapgen[] = {
        {"dungeons",    MG_DUNGEONS},
        {"light",       MG_LIGHT},
        {"decorations", MG_DECORATIONS},
-       {NULL,       0}
+       {"biomes",      MG_BIOMES},
+       {NULL,          0}
 };
 
 FlagDesc flagdesc_gennotify[] = {
@@ -152,23 +153,23 @@ Mapgen *Mapgen::createMapgen(MapgenType mgtype, int mgid,
 {
        switch (mgtype) {
        case MAPGEN_CARPATHIAN:
-               return new MapgenCarpathian(mgid, (MapgenCarpathianParams *)params, emerge);
+               return new MapgenCarpathian((MapgenCarpathianParams *)params, emerge);
        case MAPGEN_FLAT:
-               return new MapgenFlat(mgid, (MapgenFlatParams *)params, emerge);
+               return new MapgenFlat((MapgenFlatParams *)params, emerge);
        case MAPGEN_FRACTAL:
-               return new MapgenFractal(mgid, (MapgenFractalParams *)params, emerge);
+               return new MapgenFractal((MapgenFractalParams *)params, emerge);
        case MAPGEN_SINGLENODE:
-               return new MapgenSinglenode(mgid, (MapgenSinglenodeParams *)params, emerge);
+               return new MapgenSinglenode((MapgenSinglenodeParams *)params, emerge);
        case MAPGEN_V5:
-               return new MapgenV5(mgid, (MapgenV5Params *)params, emerge);
+               return new MapgenV5((MapgenV5Params *)params, emerge);
        case MAPGEN_V6:
-               return new MapgenV6(mgid, (MapgenV6Params *)params, emerge);
+               return new MapgenV6((MapgenV6Params *)params, emerge);
        case MAPGEN_V7:
-               return new MapgenV7(mgid, (MapgenV7Params *)params, emerge);
+               return new MapgenV7((MapgenV7Params *)params, emerge);
        case MAPGEN_VALLEYS:
-               return new MapgenValleys(mgid, (MapgenValleysParams *)params, emerge);
+               return new MapgenValleys((MapgenValleysParams *)params, emerge);
        default:
-               return NULL;
+               return nullptr;
        }
 }
 
@@ -193,7 +194,7 @@ MapgenParams *Mapgen::createMapgenParams(MapgenType mgtype)
        case MAPGEN_VALLEYS:
                return new MapgenValleysParams;
        default:
-               return NULL;
+               return nullptr;
        }
 }
 
@@ -654,6 +655,7 @@ void MapgenBasic::generateBiomes()
        for (s16 z = node_min.Z; z <= node_max.Z; z++)
        for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
                Biome *biome = NULL;
+               biome_t water_biome_index = 0;
                u16 depth_top = 0;
                u16 base_filler = 0;
                u16 depth_water_top = 0;
@@ -692,9 +694,15 @@ void MapgenBasic::generateBiomes()
                                // (Re)calculate biome
                                biome = biomegen->getBiomeAtIndex(index, v3s16(x, y, z));
 
+                               // Add biome to biomemap at first stone surface detected
                                if (biomemap[index] == BIOME_NONE && is_stone_surface)
                                        biomemap[index] = biome->index;
 
+                               // Store biome of first water surface detected, as a fallback
+                               // entry for the biomemap.
+                               if (water_biome_index == 0 && is_water_surface)
+                                       water_biome_index = biome->index;
+
                                depth_top = biome->depth_top;
                                base_filler = MYMAX(depth_top +
                                        biome->depth_filler +
@@ -761,6 +769,11 @@ void MapgenBasic::generateBiomes()
 
                        VoxelArea::add_y(em, vi, -1);
                }
+               // If no stone surface detected in mapchunk column and a water surface
+               // biome fallback exists, add it to the biomemap. This avoids water
+               // surface decorations failing in deep water.
+               if (biomemap[index] == BIOME_NONE && water_biome_index != 0)
+                       biomemap[index] = water_biome_index;
        }
 }
 
@@ -780,6 +793,10 @@ void MapgenBasic::dustTopNodes()
                if (biome->c_dust == CONTENT_IGNORE)
                        continue;
 
+               // Check if mapchunk above has generated, if so, drop dust from 16 nodes
+               // above current mapchunk top, above decorations that will extend above
+               // the current mapchunk. If the mapchunk above has not generated, it
+               // will provide this required dust when it does.
                u32 vi = vm->m_area.index(x, full_node_max.Y, z);
                content_t c_full_max = vm->m_data[vi].getContent();
                s16 y_start;
@@ -808,14 +825,15 @@ void MapgenBasic::dustTopNodes()
 
                content_t c = vm->m_data[vi].getContent();
                NodeDrawType dtype = ndef->get(c).drawtype;
-               // Only place on walkable cubic non-liquid nodes
-               // Dust check needed due to vertical overgeneration
+               // Only place on cubic, walkable, non-dust nodes.
+               // Dust check needed due to avoid double layer of dust caused by
+               // dropping dust from 16 nodes above mapchunk top.
                if ((dtype == NDT_NORMAL ||
+                               dtype == NDT_ALLFACES ||
                                dtype == NDT_ALLFACES_OPTIONAL ||
-                               dtype == NDT_GLASSLIKE_FRAMED_OPTIONAL ||
                                dtype == NDT_GLASSLIKE ||
                                dtype == NDT_GLASSLIKE_FRAMED ||
-                               dtype == NDT_ALLFACES) &&
+                               dtype == NDT_GLASSLIKE_FRAMED_OPTIONAL) &&
                                ndef->get(c).walkable && c != biome->c_dust) {
                        VoxelArea::add_y(em, vi, 1);
                        vm->m_data[vi] = MapNode(biome->c_dust);
@@ -824,21 +842,26 @@ void MapgenBasic::dustTopNodes()
 }
 
 
-void MapgenBasic::generateCaves(s16 max_stone_y, s16 large_cave_depth)
+void MapgenBasic::generateCavesNoiseIntersection(s16 max_stone_y)
 {
-       if (max_stone_y < node_min.Y)
+       if (node_min.Y > max_stone_y)
                return;
 
        CavesNoiseIntersection caves_noise(ndef, m_bmgr, csize,
                &np_cave1, &np_cave2, seed, cave_width);
 
        caves_noise.generateCaves(vm, node_min, node_max, biomemap);
+}
 
-       if (node_max.Y > large_cave_depth)
+
+void MapgenBasic::generateCavesRandomWalk(s16 max_stone_y, s16 large_cave_depth)
+{
+       if (node_min.Y > max_stone_y || node_max.Y > large_cave_depth)
                return;
 
        PseudoRandom ps(blockseed + 21343);
        u32 bruises_count = ps.range(0, 2);
+
        for (u32 i = 0; i < bruises_count; i++) {
                CavesRandomWalk cave(ndef, &gennotify, seed, water_level,
                        c_water_source, c_lava_source, lava_depth, biomegen);
@@ -849,7 +872,7 @@ void MapgenBasic::generateCaves(s16 max_stone_y, s16 large_cave_depth)
 }
 
 
-bool MapgenBasic::generateCaverns(s16 max_stone_y)
+bool MapgenBasic::generateCavernsNoise(s16 max_stone_y)
 {
        if (node_min.Y > max_stone_y || node_min.Y > cavern_limit)
                return false;
@@ -878,8 +901,6 @@ void MapgenBasic::generateDungeons(s16 max_stone_y)
        dp.corridor_len_max = 13;
        dp.rooms_min        = 2;
        dp.rooms_max        = 16;
-       dp.y_min            = -MAX_MAP_GENERATION_LIMIT;
-       dp.y_max            = MAX_MAP_GENERATION_LIMIT;
 
        dp.np_density       = nparams_dungeon_density;
        dp.np_alt_wall      = nparams_dungeon_alt_wall;