Add Valleys mapgen.

build/android/jni/Android.mk

@@ -179,6 +179,7 @@ LOCAL_SRC_FILES :=                                \
 		jni/src/mapgen_v5.cpp                     \
 		jni/src/mapgen_v6.cpp                     \
 		jni/src/mapgen_v7.cpp                     \
+		jni/src/mapgen_valleys.cpp                \
 		jni/src/mapnode.cpp                       \
 		jni/src/mapsector.cpp                     \
 		jni/src/mesh.cpp                          \

builtin/settingtypes.txt

@@ -1033,6 +1033,84 @@ mgfractal_np_filler_depth (Mapgen fractal filler depth noise parameters) noise_p
 mgfractal_np_cave1 (Mapgen fractal cave1 noise parameters) noise_params 0, 12, (128, 128, 128), 52534, 4, 0.5, 2.0
 mgfractal_np_cave2 (Mapgen fractal cave2 noise parameters) noise_params 0, 12, (128, 128, 128), 10325, 4, 0.5, 2.0
 
+# Mapgen Valleys parameters
+[***Mapgen Valleys]
+
+# General parameters
+[****General]
+
+#    Map generation attributes specific to Mapgen Valleys.
+#    Flags that are not specified in the flag string are not modified from the default.
+#    Flags starting with "no" are used to explicitly disable them.
+#    "altitude_chill" makes higher elevations colder, which may cause biome issues.
+#    "fast" produces softer terrain, more quickly
+#    "humid_rivers" modifies the humidity around rivers and in areas where water would tend to pool. It may interfere with delicately adjusted biomes.
+#    "rugged" and "cliffs" do nothing unless "fast" is enabled
+mg_valleys_spflags (Valleys C Flags) flags altitude_chill,cliffs,humid_rivers,nofast,rugged altitude_chill,noaltitude_chill,cliffs,nocliffs,fast,nofast,humid_rivers,nohumid_rivers,rugged,norugged
+
+# The altitude at which temperature drops by 20C
+mg_valleys_altitude_chill (Altitude Chill) int 90
+
+# Average humidity
+mg_valleys_humidity (Humidity) int 50
+
+# The highest humidity around rivers in otherwise dry areas
+mg_valleys_humidity_break_point (Humidity Break) int 65
+
+# Maximum altitude where lava can emerge
+mg_valleys_lava_max_height (Lava Height) int 0
+
+# Maximum altitude where water occurs in caves (and tends to fall out)
+mg_valleys_cave_water_max_height (Cave Water Height) int 31000
+
+# How deep to make rivers
+mg_valleys_river_depth (River Depth) int 4
+
+# How wide to make rivers
+mg_valleys_river_size (River Size) int 5
+
+# Average temperature
+mg_valleys_temperature (Temperature) int 50
+
+# How often water occurs in caves (0-10)
+mg_valleys_water_features (Water Features) int 3
+
+# Noise parameters
+[****Noises]
+
+# Cliff noise
+mg_valleys_np_cliffs (Cliffs) noise_params 0, 1, (750, 750, 750), 8445, 5, 1.0, 2.0
+
+# Mountain corrugation
+mg_valleys_np_corr (Corrugation) noise_params 0, 1, (40, 40, 40), -3536, 4, 1.0, 2.0
+
+# The depth of dirt or other filler
+mg_valleys_np_filler_depth (Filler Depth) noise_params 0, 1.2, (256, 256, 256), 1605, 3, 0.5, 2.0
+
+# River noise -- rivers occur close to zero
+mg_valleys_np_rivers (River Noise) noise_params 0, 1, (256, 256, 256), -6050, 5, 0.6, 2.0
+
+# Caves and tunnels form at the intersection of the two noises
+mg_valleys_np_simple_caves_1 (Simple Caves #1) noise_params 0, 1, v3f(64, 64, 64), -8402, 3, 0.5, 2.0
+
+# Caves and tunnels form at the intersection of the two noises
+mg_valleys_np_simple_caves_2 (Simple Caves #2) noise_params 0, 1, v3f(64, 64, 64), 3944, 3, 0.5, 2.0
+
+# Base terrain height
+mg_valleys_np_terrain_height (Terrain Height) noise_params -10, 50, (1024, 1024, 1024), 5202, 6, 0.4, 2.0
+
+# Raises terrain to make valleys around the rivers
+mg_valleys_np_valley_depth (Valley Depth) noise_params 5, 4, (512, 512, 512), -1914, 1, 1.0, 2.0
+
+# Slope and fill work together to modify the heights
+mg_valleys_np_inter_valley_fill (Valley Fill) noise_params 0, 1, (256, 512, 256), 1993, 6, 0.8, 2.0
+
+# Amplifies the valleys
+mg_valleys_np_valley_profile (Valley Profile) noise_params 0.6, 0.5, (512, 512, 512), 777, 1, 1.0, 2.0
+
+# Slope and fill work together to modify the heights
+mg_valleys_np_inter_valley_slope (Valley Slope) noise_params 0.5, 0.5, (128, 128, 128), 746, 1, 1.0, 2.0
+
 [*Security]
 
 #    Prevent mods from doing insecure things like running shell commands.

minetest.conf.example

@@ -1313,6 +1313,47 @@
 #    type: noise_params
 # mgfractal_np_cave2 = 0, 12, (128, 128, 128), 10325, 4, 0.5, 2.0
 
+#### Mapgen Valleys
+
+#mg_valleys_spflags = altitude_chill,cliffs,humid_rivers,nofast,rugged
+#    "altitude_chill" makes higher elevations colder, which may cause biome issues.
+#    "fast" produces softer terrain, more quickly
+#    "humid_rivers" modifies the humidity around rivers and in areas where water would tend to pool. It may interfere with delicately adjusted biomes.
+#    "rugged" and "cliffs" do nothing unless "fast" is enabled
+#
+#mg_valleys_altitude_chill = 90  # the altitude at which temperature drops by 20C
+#mg_valleys_cave_water_max_height = 31000   # max altitude of water in caves
+#mg_valleys_humidity = 50        # the average humidity
+#mg_valleys_humidity_break_point = 65        # The highest humidity around rivers in otherwise dry areas
+#mg_valleys_lava_max_height = 0  # maximum altitude of lava
+#mg_valleys_river_depth = 4      # how deep to make rivers
+#mg_valleys_river_size = 5       # how wide to make rivers
+#mg_valleys_temperature = 50     # the average temperature
+#mg_valleys_water_features = 3   # how often water occurs in caves (0-10)
+#
+#mg_valleys_np_cliffs = 0, 1, (750, 750, 750), 8445, 5, 1.0, 2.0
+#mg_valleys_np_corr = 0, 1, (40, 40, 40), -3536, 4, 1.0, 2.0
+#mg_valleys_np_filler_depth = 0, 1.2, (256, 256, 256), 1605, 3, 0.5, 2.0
+#
+# River noise -- rivers occur close to zero
+#mg_valleys_np_rivers = 0, 1, (256, 256, 256), -6050, 5, 0.6, 2.0
+#
+#mg_valleys_np_simple_caves_1 = 0, 1, v3f(64, 64, 64), -8402, 3, 0.5, 2.0
+#mg_valleys_np_simple_caves_2 = 0, 1, v3f(64, 64, 64), 3944, 3, 0.5, 2.0
+#
+# Base terrain height
+#mg_valleys_np_terrain_height = -10, 50, (1024, 1024, 1024), 5202, 6, 0.4, 2.0
+#
+# Raises terrain to make valleys around the rivers
+#mg_valleys_np_valley_depth = 5, 4, (512, 512, 512), -1914, 1, 1.0, 2.0
+#
+# Slope and fill work together to modify the heights
+#mg_valleys_np_inter_valley_fill = 0, 1, (256, 512, 256), 1993, 6, 0.8, 2.0
+#mg_valleys_np_inter_valley_slope = 0.5, 0.5, (128, 128, 128), 746, 1, 1.0, 2.0
+#
+# Amplifies the valleys
+#mg_valleys_np_valley_profile = 0.6, 0.5, (512, 512, 512), 777, 1, 1.0, 2.0
+
 ## Security
 
 #    Prevent mods from doing insecure things like running shell commands.

src/CMakeLists.txt

@@ -388,6 +388,7 @@ set(common_SRCS
 	mapgen_v5.cpp
 	mapgen_v6.cpp
 	mapgen_v7.cpp
+	mapgen_valleys.cpp
 	mapnode.cpp
 	mapsector.cpp
 	mg_biome.cpp

src/emerge.cpp

@@ -39,6 +39,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapgen_v5.h"
 #include "mapgen_v6.h"
 #include "mapgen_v7.h"
+#include "mapgen_valleys.h"
 #include "mapgen_singlenode.h"
 #include "mg_biome.h"
 #include "mg_ore.h"
@@ -108,6 +109,7 @@ MapgenDesc g_reg_mapgens[] = {
 	{"v7",         new MapgenFactoryV7,         true},
 	{"flat",       new MapgenFactoryFlat,       true},
 	{"fractal",    new MapgenFactoryFractal,    true},
+	{"valleys",    new MapgenFactoryValleys,    true},
 	{"singlenode", new MapgenFactorySinglenode, false},
 };
 

src/mapgen_valleys.h

+/*
+Minetest Valleys C
+Copyright (C) 2010-2015 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2010-2015 paramat, Matt Gregory
+Copyright (C) 2016 Duane Robertson <duane@duanerobertson.com>
+
+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.
+
+Licensing changed by permission of Gael de Sailly.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef MAPGEN_VALLEYS_HEADER
+#define MAPGEN_VALLEYS_HEADER
+
+#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
+
+class BiomeManager;
+
+// Global profiler
+//class Profiler;
+//extern Profiler *mapgen_profiler;
+
+
+struct MapgenValleysParams : public MapgenSpecificParams {
+	u32 spflags;
+
+	u16 altitude_chill;
+	s16 cave_water_max_height;
+	s16 humidity;
+	s16 humidity_break_point;
+	s16 lava_max_height;
+	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;
+	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_terrain_height;
+	NoiseParams np_valley_depth;
+	NoiseParams np_valley_profile;
+
+	MapgenValleysParams();
+	~MapgenValleysParams() {}
+
+	void readParams(const Settings *settings);
+	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; 
+	float cliffs; 
+	float corr;
+};
+
+class MapgenValleys : public Mapgen {
+public:
+
+	MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager *emerge);
+	~MapgenValleys();
+
+	virtual void makeChunk(BlockMakeData *data);
+	inline int getGroundLevelAtPoint(v2s16 p);
+
+private:
+	EmergeManager *m_emerge;
+	BiomeManager *bmgr;
+
+	int ystride;
+	int zstride;
+
+	u32 spflags;
+	bool cliff_terrain;
+	bool fast_terrain;
+	bool rugged_terrain;
+	bool humid_rivers;
+	bool use_altitude_chill;
+
+	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;
+	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_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();
+
+	virtual int generateTerrain();
+	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();
+	};
+};
+
+#endif