mapgen: drop mapgen id from child mapgens.

[oweals/minetest.git] / src / mapgen / mapgen_valleys.h

diff --git a/src/mapgen/mapgen_valleys.h b/src/mapgen/mapgen_valleys.h
index c4d92239cd10f2541b9c7489eace32dc7338c57b..fd40b5bab03a0734844e81e5e06f0a6a71d38209 100644 (file)
--- a/src/mapgen/mapgen_valleys.h
+++ b/src/mapgen/mapgen_valleys.h
@@ -1,11 +1,11 @@
 /*
 Minetest
-Copyright (C) 2016-2018 Duane Robertson <duane@duanerobertson.com>
-Copyright (C) 2016-2018 paramat
+Copyright (C) 2016-2019 Duane Robertson <duane@duanerobertson.com>
+Copyright (C) 2016-2019 paramat
 
 Based on Valleys Mapgen by Gael de Sailly
 (https://forum.minetest.net/viewtopic.php?f=9&t=11430)
-and mapgen_v7 by kwolekr and paramat.
+and mapgen_v7, mapgen_flat by kwolekr and paramat.
 
 Licensing changed by permission of Gael de Sailly.
 
@@ -24,31 +24,28 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+
 #pragma once
 
 #include "mapgen.h"
 
-////////////// Mapgen Valleys flags
-#define MGVALLEYS_ALT_CHILL    0x01
-#define MGVALLEYS_HUMID_RIVERS 0x02
-
-// Feed only one variable into these.
-#define MYSQUARE(x) (x) * (x)
-#define MYCUBE(x) (x) * (x) * (x)
+#define MGVALLEYS_ALT_CHILL        0x01
+#define MGVALLEYS_HUMID_RIVERS     0x02
+#define MGVALLEYS_VARY_RIVER_DEPTH 0x04
+#define MGVALLEYS_ALT_DRY          0x08
 
 class BiomeManager;
 class BiomeGenOriginal;
 
-// Global profiler
-//class Profiler;
-//extern Profiler *mapgen_profiler;
+extern FlagDesc flagdesc_mapgen_valleys[];
 
 
 struct MapgenValleysParams : public MapgenParams {
-       u32 spflags = MGVALLEYS_HUMID_RIVERS | MGVALLEYS_ALT_CHILL;
-       u16 altitude_chill = 90; // The altitude at which temperature drops by 20C.
-       u16 river_depth = 4; // How deep to carve river channels.
-       u16 river_size = 5; // How wide to make rivers.
+       u32 spflags = MGVALLEYS_ALT_CHILL | MGVALLEYS_HUMID_RIVERS |
+               MGVALLEYS_VARY_RIVER_DEPTH | MGVALLEYS_ALT_DRY;
+       u16 altitude_chill = 90;
+       u16 river_depth = 4;
+       u16 river_size = 5;
 
        float cave_width = 0.09f;
        s16 large_cave_depth = -33;
@@ -57,7 +54,7 @@ struct MapgenValleysParams : public MapgenParams {
        s16 cavern_taper = 192;
        float cavern_threshold = 0.6f;
        s16 dungeon_ymin = -31000;
-       s16 dungeon_ymax = 63; // No higher than surface mapchunks
+       s16 dungeon_ymax = 63;
 
        NoiseParams np_filler_depth;
        NoiseParams np_inter_valley_fill;
@@ -78,21 +75,12 @@ struct MapgenValleysParams : public MapgenParams {
        void writeParams(Settings *settings) const;
 };
 
-struct TerrainNoise {
-       s16 x;
-       s16 z;
-       float terrain_height;
-       float *rivers;
-       float *valley;
-       float valley_profile;
-       float *slope;
-       float inter_valley_fill;
-};
 
 class MapgenValleys : public MapgenBasic {
 public:
 
-       MapgenValleys(int mapgenid, MapgenValleysParams *params, EmergeManager *emerge);
+       MapgenValleys(MapgenValleysParams *params,
+               EmergeManager *emerge);
        ~MapgenValleys();
 
        virtual MapgenType getType() const { return MAPGEN_VALLEYS; }
@@ -104,9 +92,6 @@ private:
        BiomeGenOriginal *m_bgen;
 
        float altitude_chill;
-       bool humid_rivers;
-       bool use_altitude_chill;
-       float humidity_adjust;
        float river_depth_bed;
        float river_size_factor;
 
@@ -121,11 +106,5 @@ private:
        Noise *noise_valley_depth;
        Noise *noise_valley_profile;
 
-       float terrainLevelAtPoint(s16 x, s16 z);
-
-       void calculateNoise();
-
        virtual int generateTerrain();
-       float terrainLevelFromNoise(TerrainNoise *tn);
-       float adjustedTerrainLevelFromNoise(TerrainNoise *tn);
 };