diff options
| author | kwolekr <kwolekr@minetest.net> | 2016-05-02 02:24:57 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2016-05-27 23:23:58 -0400 |
| commit | 87bc39dca733a2cc805bc1071794c4d5d7937115 (patch) | |
| tree | 127a2f902e36cb10b399cfbe276fae3b452ebce1 /src/mapgen_fractal.h | |
| parent | 76f485647983ebd7eb4c3abbca0869d13f76920b (diff) | |
| download | minetest-87bc39dca733a2cc805bc1071794c4d5d7937115.tar.gz minetest-87bc39dca733a2cc805bc1071794c4d5d7937115.tar.bz2 minetest-87bc39dca733a2cc805bc1071794c4d5d7937115.zip | |
Mapgen: Combine generateBiomes, dustTopNodes, and generateCaves
This commit condenses the above methods into a single implementation used by
V7, V5, Flat, Fractal, and Valleys mapgens and introduces MapgenBasic.
Diffstat (limited to 'src/mapgen_fractal.h')
| -rw-r--r-- | src/mapgen_fractal.h | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/src/mapgen_fractal.h b/src/mapgen_fractal.h index a0e51b2c6..176885d46 100644 --- a/src/mapgen_fractal.h +++ b/src/mapgen_fractal.h @@ -57,23 +57,12 @@ struct MapgenFractalParams : public MapgenSpecificParams { void writeParams(Settings *settings) const; }; -class MapgenFractal : public Mapgen { +class MapgenFractal : public MapgenBasic { public: - EmergeManager *m_emerge; - BiomeManager *bmgr; - - int ystride; - int zstride_1d; u16 formula; bool julia; - v3s16 node_min; - v3s16 node_max; - v3s16 full_node_min; - v3s16 full_node_max; - u32 spflags; - float cave_width; u16 fractal; u16 iterations; v3f scale; @@ -84,16 +73,9 @@ public: float julia_z; float julia_w; Noise *noise_seabed; - Noise *noise_filler_depth; - Noise *noise_cave1; - Noise *noise_cave2; - content_t c_stone; - content_t c_water_source; content_t c_lava_source; - content_t c_desert_stone; content_t c_ice; - content_t c_sandstone; content_t c_cobble; content_t c_stair_cobble; @@ -109,9 +91,6 @@ public: void calculateNoise(); bool getFractalAtPoint(s16 x, s16 y, s16 z); s16 generateTerrain(); - MgStoneType generateBiomes(); - void dustTopNodes(); - void generateCaves(s16 max_stone_y); }; struct MapgenFactoryFractal : public MapgenFactory { |