X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmapgen_v7.h;h=3a6bc0801c86238a9bb7cab7d4ff08bcafb6b350;hb=ad4bf2ccf966ac21b94f1778a017ac98f8957ab6;hp=82f89387b1aa79ec5adc21ecdb2ea7497a626de6;hpb=4adbd69a3701608876b50665ed3f7a150750d26e;p=minetest.git

diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index 82f89387b..3a6bc0801 100644
--- a/src/mapgen_v7.h
+++ b/src/mapgen_v7.h
@@ -32,8 +32,9 @@ class BiomeManager;
 extern FlagDesc flagdesc_mapgen_v7[];
 
 
-struct MapgenV7Params : public MapgenSpecificParams {
+struct MapgenV7Params : public MapgenParams {
 	u32 spflags;
+	float cave_width;
 	NoiseParams np_terrain_base;
 	NoiseParams np_terrain_alt;
 	NoiseParams np_terrain_persist;
@@ -53,89 +54,32 @@ struct MapgenV7Params : public MapgenSpecificParams {
 	void writeParams(Settings *settings) const;
 };
 
-class MapgenV7 : public Mapgen {
+class MapgenV7 : public MapgenBasic {
 public:
-	EmergeManager *m_emerge;
-	BiomeManager *bmgr;
+	MapgenV7(int mapgenid, MapgenV7Params *params, EmergeManager *emerge);
+	~MapgenV7();
 
-	int ystride;
-	int zstride;
-	u32 spflags;
+	virtual MapgenType getType() const { return MAPGEN_V7; }
 
-	v3s16 node_min;
-	v3s16 node_max;
-	v3s16 full_node_min;
-	v3s16 full_node_max;
+	virtual void makeChunk(BlockMakeData *data);
+	int getSpawnLevelAtPoint(v2s16 p);
 
-	s16 *ridge_heightmap;
+	float baseTerrainLevelAtPoint(s16 x, s16 z);
+	float baseTerrainLevelFromMap(int index);
+	bool getMountainTerrainAtPoint(s16 x, s16 y, s16 z);
+	bool getMountainTerrainFromMap(int idx_xyz, int idx_xz, s16 y);
+	int generateTerrain();
+	void generateRidgeTerrain();
 
+private:
 	Noise *noise_terrain_base;
 	Noise *noise_terrain_alt;
 	Noise *noise_terrain_persist;
 	Noise *noise_height_select;
-	Noise *noise_filler_depth;
 	Noise *noise_mount_height;
 	Noise *noise_ridge_uwater;
 	Noise *noise_mountain;
 	Noise *noise_ridge;
-	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;
-
-	MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge);
-	~MapgenV7();
-
-	virtual void makeChunk(BlockMakeData *data);
-	int getSpawnLevelAtPoint(v2s16 p);
-	Biome *getBiomeAtPoint(v3s16 p);
-
-	float baseTerrainLevelAtPoint(s16 x, s16 z);
-	float baseTerrainLevelFromMap(int index);
-	bool getMountainTerrainAtPoint(s16 x, s16 y, s16 z);
-	bool getMountainTerrainFromMap(int idx_xyz, int idx_xz, s16 y);
-
-	void calculateNoise();
-
-	virtual int generateTerrain();
-	void generateBaseTerrain(s16 *stone_surface_min_y, s16 *stone_surface_max_y);
-	int generateMountainTerrain(s16 ymax);
-	void generateRidgeTerrain();
-
-	MgStoneType generateBiomes(float *heat_map, float *humidity_map);
-	void dustTopNodes();
-
-	//void addTopNodes();
-
-	void generateCaves(s16 max_stone_y);
-};
-
-struct MapgenFactoryV7 : public MapgenFactory {
-	Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge)
-	{
-		return new MapgenV7(mgid, params, emerge);
-	};
-
-	MapgenSpecificParams *createMapgenParams()
-	{
-		return new MapgenV7Params();
-	};
 };
 
 #endif