X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fmapgen_fractal.h;h=3331848bcfeb08a9b76278d687c76231b5767145;hb=e70e15134c95d37241bb6f6124105c0f1c08ab8a;hp=8c21a8a4ed5f247a32abd6b7570c3338837a02a9;hpb=465bb6f5d13803819f329e4920bceb25a3887c6f;p=oweals%2Fminetest.git

diff --git a/src/mapgen_fractal.h b/src/mapgen_fractal.h
index 8c21a8a4e..3331848bc 100644
--- a/src/mapgen_fractal.h
+++ b/src/mapgen_fractal.h
@@ -33,20 +33,18 @@ class BiomeManager;
 extern FlagDesc flagdesc_mapgen_fractal[];
 
 
-struct MapgenFractalParams : public MapgenSpecificParams {
+struct MapgenFractalParams : public MapgenParams {
 	u32 spflags;
-
+	float cave_width;
 	u16 fractal;
 	u16 iterations;
 	v3f scale;
 	v3f offset;
 	float slice_w;
-
 	float julia_x;
 	float julia_y;
 	float julia_z;
 	float julia_w;
-
 	NoiseParams np_seabed;
 	NoiseParams np_filler_depth;
 	NoiseParams np_cave1;
@@ -59,80 +57,32 @@ struct MapgenFractalParams : public MapgenSpecificParams {
 	void writeParams(Settings *settings) const;
 };
 
-class MapgenFractal : public Mapgen {
+class MapgenFractal : public MapgenBasic {
 public:
-	EmergeManager *m_emerge;
-	BiomeManager *bmgr;
+	MapgenFractal(int mapgenid, MapgenFractalParams *params, EmergeManager *emerge);
+	~MapgenFractal();
 
-	int ystride;
-	int zstride_1d;
-	u16 formula;
-	bool julia;
+	virtual MapgenType getType() const { return MAPGEN_FRACTAL; }
 
-	v3s16 node_min;
-	v3s16 node_max;
-	v3s16 full_node_min;
-	v3s16 full_node_max;
+	virtual void makeChunk(BlockMakeData *data);
+	int getSpawnLevelAtPoint(v2s16 p);
+	bool getFractalAtPoint(s16 x, s16 y, s16 z);
+	s16 generateTerrain();
 
-	u32 spflags;
+private:
+	u16 formula;
+	bool julia;
 
 	u16 fractal;
 	u16 iterations;
 	v3f scale;
 	v3f offset;
 	float slice_w;
-
 	float julia_x;
 	float julia_y;
 	float julia_z;
 	float julia_w;
-
 	Noise *noise_seabed;
-	Noise *noise_filler_depth;
-	Noise *noise_cave1;
-	Noise *noise_cave2;
-
-	Noise *noise_heat;
-	Noise *noise_humidity;
-	Noise *noise_heat_blend;
-	Noise *noise_humidity_blend;
-
-	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;
-	content_t c_mossycobble;
-	content_t c_sandstonebrick;
-	content_t c_stair_sandstonebrick;
-
-	MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager *emerge);
-	~MapgenFractal();
-
-	virtual void makeChunk(BlockMakeData *data);
-	int getSpawnLevelAtPoint(v2s16 p);
-	void calculateNoise();
-	bool getFractalAtPoint(s16 x, s16 y, s16 z);
-	s16 generateTerrain();
-	MgStoneType generateBiomes(float *heat_map, float *humidity_map);
-	void dustTopNodes();
-	void generateCaves(s16 max_stone_y);
-};
-
-struct MapgenFactoryFractal : public MapgenFactory {
-	Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge)
-	{
-		return new MapgenFractal(mgid, params, emerge);
-	};
-
-	MapgenSpecificParams *createMapgenParams()
-	{
-		return new MapgenFractalParams();
-	};
 };
 
 #endif