#include "mapgen.h"
-/////////////////// Mapgen Valleys flags
-#define MG_VALLEYS_ALT_CHILL 0x01
-#define MG_VALLEYS_CLIFFS 0x02
-#define MG_VALLEYS_FAST 0x04
-#define MG_VALLEYS_HUMID_RIVERS 0x08
-#define MG_VALLEYS_RUGGED 0x10
+////////////// 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)
class BiomeManager;
+class BiomeGenOriginal;
// Global profiler
//class Profiler;
//extern Profiler *mapgen_profiler;
-struct MapgenValleysParams : public MapgenSpecificParams {
+struct MapgenValleysParams : public MapgenParams {
u32 spflags;
-
+ s16 large_cave_depth;
+ s16 massive_cave_depth;
u16 altitude_chill;
- s16 cave_water_max_height;
- s16 humidity;
- s16 humidity_break_point;
- s16 lava_max_height;
+ u16 lava_features;
u16 river_depth;
u16 river_size;
- s16 temperature;
u16 water_features;
-
- NoiseParams np_biome_heat;
- NoiseParams np_biome_heat_blend;
- NoiseParams np_biome_humidity;
- NoiseParams np_biome_humidity_blend;
- NoiseParams np_cliffs;
- NoiseParams np_corr;
+ float cave_width;
+ NoiseParams np_cave1;
+ NoiseParams np_cave2;
NoiseParams np_filler_depth;
NoiseParams np_inter_valley_fill;
NoiseParams np_inter_valley_slope;
NoiseParams np_rivers;
- NoiseParams np_simple_caves_1;
- NoiseParams np_simple_caves_2;
+ NoiseParams np_massive_caves;
NoiseParams np_terrain_height;
NoiseParams np_valley_depth;
NoiseParams np_valley_profile;
float valley_profile;
float *slope;
float inter_valley_fill;
- float cliffs;
- float corr;
};
-class MapgenValleys : public Mapgen {
+class MapgenValleys : public MapgenBasic {
public:
- MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager *emerge);
+ MapgenValleys(int mapgenid, MapgenValleysParams *params, EmergeManager *emerge);
~MapgenValleys();
+ virtual MapgenType getType() const { return MAPGEN_VALLEYS; }
+
virtual void makeChunk(BlockMakeData *data);
- int getGroundLevelAtPoint(v2s16 p);
+ int getSpawnLevelAtPoint(v2s16 p);
-private:
- EmergeManager *m_emerge;
- BiomeManager *bmgr;
+ s16 large_cave_depth;
- int ystride;
- int zstride;
+private:
+ BiomeGenOriginal *m_bgen;
- u32 spflags;
- bool cliff_terrain;
- bool fast_terrain;
- bool rugged_terrain;
bool humid_rivers;
bool use_altitude_chill;
+ float humidity_adjust;
+ s16 cave_water_max_height;
+ s16 lava_max_height;
- v3s16 node_min;
- v3s16 node_max;
- v3s16 full_node_min;
- v3s16 full_node_max;
-
- Noise *noise_filler_depth;
-
- Noise *noise_cliffs;
- Noise *noise_corr;
- Noise *noise_heat;
- Noise *noise_heat_blend;
- Noise *noise_humidity;
- Noise *noise_humidity_blend;
+ float altitude_chill;
+ s16 lava_features_lim;
+ s16 massive_cave_depth;
+ float river_depth_bed;
+ float river_size_factor;
+ float *tcave_cache;
+ s16 water_features_lim;
Noise *noise_inter_valley_fill;
Noise *noise_inter_valley_slope;
Noise *noise_rivers;
- Noise *noise_simple_caves_1;
- Noise *noise_simple_caves_2;
+ Noise *noise_cave1;
+ Noise *noise_cave2;
+ Noise *noise_massive_caves;
Noise *noise_terrain_height;
Noise *noise_valley_depth;
Noise *noise_valley_profile;
- float altitude_chill;
- float cave_water_max_height;
- float humidity_adjust;
- float humidity_break_point;
- float lava_max_height;
- float river_depth;
- float river_size;
- float temperature_adjust;
- s16 water_features;
-
- content_t c_cobble;
- content_t c_desert_stone;
- content_t c_dirt;
- content_t c_ice;
- content_t c_lava_source;
- content_t c_mossycobble;
- content_t c_river_water_source;
- content_t c_sand;
- content_t c_sandstone;
- content_t c_sandstonebrick;
- content_t c_stair_cobble;
- content_t c_stair_sandstonebrick;
- content_t c_stone;
- content_t c_water_source;
-
float terrainLevelAtPoint(s16 x, s16 z);
void calculateNoise();
float terrainLevelFromNoise(TerrainNoise *tn);
float adjustedTerrainLevelFromNoise(TerrainNoise *tn);
- float humidityByTerrain(float humidity_base, float mount, float rivers, float valley);
-
- MgStoneType generateBiomes(float *heat_map, float *humidity_map);
- void dustTopNodes();
-
- void generateSimpleCaves(s16 max_stone_y);
-};
-
-struct MapgenFactoryValleys : public MapgenFactory {
- Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge)
- {
- return new MapgenValleys(mgid, params, emerge);
- };
-
- MapgenSpecificParams *createMapgenParams()
- {
- return new MapgenValleysParams();
- };
+ virtual void generateCaves(s16 max_stone_y, s16 large_cave_depth);
};
#endif