BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Mgv5/v7/fractal: Add 'large_cave_depth' parameter to replace fixed value

Browse Source 
The value cannot be fixed because we can shift terrain vertically.
This also makes these mapgens consistent with mgflat and mgvalleys which
have 'large_cave_depth' parameters.
This commit is contained in:
paramat 2017-06-20 04:55:32 +01:00 committed by paramat
parent e6a9e6066a
commit b8237099b2
8 changed files with 72 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builtin/settingtypes.txt
View File

@ -1028,6 +1028,9 @@ mgv5_spflags (Mapgen v5 specific flags) flags caverns caverns,nocaverns
# Controls width of tunnels, a smaller value creates wider tunnels. # Controls width of tunnels, a smaller value creates wider tunnels.
mgv5_cave_width (Cave width) float 0.125 mgv5_cave_width (Cave width) float 0.125
# Y of upper limit of large pseudorandom caves.
mgv5_large_cave_depth (Large cave depth) int -256
# Y-level of cavern upper limit. # Y-level of cavern upper limit.
mgv5_cavern_limit (Cavern limit) int -256 mgv5_cavern_limit (Cavern limit) int -256
@ -1134,6 +1137,9 @@ mgv7_spflags (Mapgen v7 specific flags) flags mountains,ridges,nofloatlands,cave
# Controls width of tunnels, a smaller value creates wider tunnels. # Controls width of tunnels, a smaller value creates wider tunnels.
mgv7_cave_width (Cave width) float 0.09 mgv7_cave_width (Cave width) float 0.09
# Y of upper limit of large pseudorandom caves.
mgv7_large_cave_depth (Large cave depth) int -33
# Controls the density of floatland mountain terrain. # Controls the density of floatland mountain terrain.
# Is an offset added to the 'np_mountain' noise value. # Is an offset added to the 'np_mountain' noise value.
mgv7_float_mount_density (Floatland mountain density) float 0.6 mgv7_float_mount_density (Floatland mountain density) float 0.6
@ -1251,6 +1257,9 @@ mgflat_np_cave2 (Cave2 noise) noise_params 0, 12, (67, 67, 67), 10325, 3, 0.5, 2
# Controls width of tunnels, a smaller value creates wider tunnels. # Controls width of tunnels, a smaller value creates wider tunnels.
mgfractal_cave_width (Cave width) float 0.09 mgfractal_cave_width (Cave width) float 0.09
# Y of upper limit of large pseudorandom caves.
mgfractal_large_cave_depth (Large cave depth) int -33
# Choice of 18 fractals from 9 formulas. # Choice of 18 fractals from 9 formulas.
# 1 = 4D "Roundy" mandelbrot set. # 1 = 4D "Roundy" mandelbrot set.
# 2 = 4D "Roundy" julia set. # 2 = 4D "Roundy" julia set.

12
minetest.conf.example
View File

@ -1256,6 +1256,10 @@
# type: float # type: float
# mgv5_cave_width = 0.125 # mgv5_cave_width = 0.125
# Y of upper limit of large pseudorandom caves.
# type: int
# mgv5_large_cave_depth = -256
# Y-level of cavern upper limit. # Y-level of cavern upper limit.
# type: int # type: int
# mgv5_cavern_limit = -256 # mgv5_cavern_limit = -256
@ -1371,6 +1375,10 @@
# type: float # type: float
# mgv7_cave_width = 0.09 # mgv7_cave_width = 0.09
# Y of upper limit of large pseudorandom caves.
# type: int
# mgv7_large_cave_depth = -33
# Controls the density of floatland mountain terrain. # Controls the density of floatland mountain terrain.
# Is an offset added to the 'np_mountain' noise value. # Is an offset added to the 'np_mountain' noise value.
# type: float # type: float
@ -1522,6 +1530,10 @@
# type: float # type: float
# mgfractal_cave_width = 0.09 # mgfractal_cave_width = 0.09
# Y of upper limit of large pseudorandom caves.
# type: int
# mgfractal_large_cave_depth = -33
# Choice of 18 fractals from 9 formulas. # Choice of 18 fractals from 9 formulas.
# 1 = 4D "Roundy" mandelbrot set. # 1 = 4D "Roundy" mandelbrot set.
# 2 = 4D "Roundy" julia set. # 2 = 4D "Roundy" julia set.

71
src/mapgen_fractal.cpp
View File

@ -49,17 +49,18 @@ FlagDesc flagdesc_mapgen_fractal[] = {
MapgenFractal::MapgenFractal(int mapgenid, MapgenFractalParams *params, EmergeManager *emerge) MapgenFractal::MapgenFractal(int mapgenid, MapgenFractalParams *params, EmergeManager *emerge)
: MapgenBasic(mapgenid, params, emerge) : MapgenBasic(mapgenid, params, emerge)
{ {
this->spflags = params->spflags; this->spflags = params->spflags;
this->cave_width = params->cave_width; this->cave_width = params->cave_width;
this->fractal = params->fractal; this->large_cave_depth = params->large_cave_depth;
this->iterations = params->iterations; this->fractal = params->fractal;
this->scale = params->scale; this->iterations = params->iterations;
this->offset = params->offset; this->scale = params->scale;
this->slice_w = params->slice_w; this->offset = params->offset;
this->julia_x = params->julia_x; this->slice_w = params->slice_w;
this->julia_y = params->julia_y; this->julia_x = params->julia_x;
this->julia_z = params->julia_z; this->julia_y = params->julia_y;
this->julia_w = params->julia_w; this->julia_z = params->julia_z;
this->julia_w = params->julia_w;
//// 2D terrain noise //// 2D terrain noise
noise_seabed = new Noise(&params->np_seabed, seed, csize.X, csize.Z); noise_seabed = new Noise(&params->np_seabed, seed, csize.X, csize.Z);
@ -91,17 +92,18 @@ MapgenFractalParams::MapgenFractalParams()
void MapgenFractalParams::readParams(const Settings *settings) void MapgenFractalParams::readParams(const Settings *settings)
{ {
settings->getFlagStrNoEx("mgfractal_spflags", spflags, flagdesc_mapgen_fractal); settings->getFlagStrNoEx("mgfractal_spflags", spflags, flagdesc_mapgen_fractal);
settings->getFloatNoEx("mgfractal_cave_width", cave_width); settings->getFloatNoEx("mgfractal_cave_width", cave_width);
settings->getU16NoEx("mgfractal_fractal", fractal); settings->getS16NoEx("mgfractal_large_cave_depth", large_cave_depth);
settings->getU16NoEx("mgfractal_iterations", iterations); settings->getU16NoEx("mgfractal_fractal", fractal);
settings->getV3FNoEx("mgfractal_scale", scale); settings->getU16NoEx("mgfractal_iterations", iterations);
settings->getV3FNoEx("mgfractal_offset", offset); settings->getV3FNoEx("mgfractal_scale", scale);
settings->getFloatNoEx("mgfractal_slice_w", slice_w); settings->getV3FNoEx("mgfractal_offset", offset);
settings->getFloatNoEx("mgfractal_julia_x", julia_x); settings->getFloatNoEx("mgfractal_slice_w", slice_w);
settings->getFloatNoEx("mgfractal_julia_y", julia_y); settings->getFloatNoEx("mgfractal_julia_x", julia_x);
settings->getFloatNoEx("mgfractal_julia_z", julia_z); settings->getFloatNoEx("mgfractal_julia_y", julia_y);
settings->getFloatNoEx("mgfractal_julia_w", julia_w); settings->getFloatNoEx("mgfractal_julia_z", julia_z);
settings->getFloatNoEx("mgfractal_julia_w", julia_w);
settings->getNoiseParams("mgfractal_np_seabed", np_seabed); settings->getNoiseParams("mgfractal_np_seabed", np_seabed);
settings->getNoiseParams("mgfractal_np_filler_depth", np_filler_depth); settings->getNoiseParams("mgfractal_np_filler_depth", np_filler_depth);
@ -112,17 +114,18 @@ void MapgenFractalParams::readParams(const Settings *settings)
void MapgenFractalParams::writeParams(Settings *settings) const void MapgenFractalParams::writeParams(Settings *settings) const
{ {
settings->setFlagStr("mgfractal_spflags", spflags, flagdesc_mapgen_fractal, U32_MAX); settings->setFlagStr("mgfractal_spflags", spflags, flagdesc_mapgen_fractal, U32_MAX);
settings->setFloat("mgfractal_cave_width", cave_width); settings->setFloat("mgfractal_cave_width", cave_width);
settings->setU16("mgfractal_fractal", fractal); settings->setS16("mgfractal_large_cave_depth", large_cave_depth);
settings->setU16("mgfractal_iterations", iterations); settings->setU16("mgfractal_fractal", fractal);
settings->setV3F("mgfractal_scale", scale); settings->setU16("mgfractal_iterations", iterations);
settings->setV3F("mgfractal_offset", offset); settings->setV3F("mgfractal_scale", scale);
settings->setFloat("mgfractal_slice_w", slice_w); settings->setV3F("mgfractal_offset", offset);
settings->setFloat("mgfractal_julia_x", julia_x); settings->setFloat("mgfractal_slice_w", slice_w);
settings->setFloat("mgfractal_julia_y", julia_y); settings->setFloat("mgfractal_julia_x", julia_x);
settings->setFloat("mgfractal_julia_z", julia_z); settings->setFloat("mgfractal_julia_y", julia_y);
settings->setFloat("mgfractal_julia_w", julia_w); settings->setFloat("mgfractal_julia_z", julia_z);
settings->setFloat("mgfractal_julia_w", julia_w);
settings->setNoiseParams("mgfractal_np_seabed", np_seabed); settings->setNoiseParams("mgfractal_np_seabed", np_seabed);
settings->setNoiseParams("mgfractal_np_filler_depth", np_filler_depth); settings->setNoiseParams("mgfractal_np_filler_depth", np_filler_depth);
@ -196,7 +199,7 @@ void MapgenFractal::makeChunk(BlockMakeData *data)
MgStoneType stone_type = generateBiomes(); MgStoneType stone_type = generateBiomes();
if (flags & MG_CAVES) if (flags & MG_CAVES)
generateCaves(stone_surface_max_y, MGFRACTAL_LARGE_CAVE_DEPTH); generateCaves(stone_surface_max_y, large_cave_depth);
if (flags & MG_DUNGEONS) if (flags & MG_DUNGEONS)
generateDungeons(stone_surface_max_y, stone_type); generateDungeons(stone_surface_max_y, stone_type);

4
src/mapgen_fractal.h
View File

@ -26,8 +26,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "mapgen.h" #include "mapgen.h"
#define MGFRACTAL_LARGE_CAVE_DEPTH -33
class BiomeManager; class BiomeManager;
extern FlagDesc flagdesc_mapgen_fractal[]; extern FlagDesc flagdesc_mapgen_fractal[];
@ -36,6 +34,7 @@ struct MapgenFractalParams : public MapgenParams
{ {
u32 spflags = 0; u32 spflags = 0;
float cave_width = 0.09f; float cave_width = 0.09f;
s16 large_cave_depth = -33;
u16 fractal = 1; u16 fractal = 1;
u16 iterations = 11; u16 iterations = 11;
v3f scale = v3f(4096.0, 1024.0, 4096.0); v3f scale = v3f(4096.0, 1024.0, 4096.0);
@ -74,6 +73,7 @@ private:
u16 formula; u16 formula;
bool julia; bool julia;
s16 large_cave_depth;
u16 fractal; u16 fractal;
u16 iterations; u16 iterations;
v3f scale; v3f scale;

5
src/mapgen_v5.cpp
View File

@ -50,6 +50,7 @@ MapgenV5::MapgenV5(int mapgenid, MapgenV5Params *params, EmergeManager *emerge)
{ {
this->spflags = params->spflags; this->spflags = params->spflags;
this->cave_width = params->cave_width; this->cave_width = params->cave_width;
this->large_cave_depth = params->large_cave_depth;
this->cavern_limit = params->cavern_limit; this->cavern_limit = params->cavern_limit;
this->cavern_taper = params->cavern_taper; this->cavern_taper = params->cavern_taper;
this->cavern_threshold = params->cavern_threshold; this->cavern_threshold = params->cavern_threshold;
@ -94,6 +95,7 @@ void MapgenV5Params::readParams(const Settings *settings)
{ {
settings->getFlagStrNoEx("mgv5_spflags", spflags, flagdesc_mapgen_v5); settings->getFlagStrNoEx("mgv5_spflags", spflags, flagdesc_mapgen_v5);
settings->getFloatNoEx("mgv5_cave_width", cave_width); settings->getFloatNoEx("mgv5_cave_width", cave_width);
settings->getS16NoEx("mgv5_large_cave_depth", large_cave_depth);
settings->getS16NoEx("mgv5_cavern_limit", cavern_limit); settings->getS16NoEx("mgv5_cavern_limit", cavern_limit);
settings->getS16NoEx("mgv5_cavern_taper", cavern_taper); settings->getS16NoEx("mgv5_cavern_taper", cavern_taper);
settings->getFloatNoEx("mgv5_cavern_threshold", cavern_threshold); settings->getFloatNoEx("mgv5_cavern_threshold", cavern_threshold);
@ -112,6 +114,7 @@ void MapgenV5Params::writeParams(Settings *settings) const
{ {
settings->setFlagStr("mgv5_spflags", spflags, flagdesc_mapgen_v5, U32_MAX); settings->setFlagStr("mgv5_spflags", spflags, flagdesc_mapgen_v5, U32_MAX);
settings->setFloat("mgv5_cave_width", cave_width); settings->setFloat("mgv5_cave_width", cave_width);
settings->setS16("mgv5_large_cave_depth", large_cave_depth);
settings->setS16("mgv5_cavern_limit", cavern_limit); settings->setS16("mgv5_cavern_limit", cavern_limit);
settings->setS16("mgv5_cavern_taper", cavern_taper); settings->setS16("mgv5_cavern_taper", cavern_taper);
settings->setFloat("mgv5_cavern_threshold", cavern_threshold); settings->setFloat("mgv5_cavern_threshold", cavern_threshold);
@ -209,7 +212,7 @@ void MapgenV5::makeChunk(BlockMakeData *data)
// large caverns and floating blobs of overgenerated liquid. // large caverns and floating blobs of overgenerated liquid.
generateCaves(stone_surface_max_y, -MAX_MAP_GENERATION_LIMIT); generateCaves(stone_surface_max_y, -MAX_MAP_GENERATION_LIMIT);
else else
generateCaves(stone_surface_max_y, MGV5_LARGE_CAVE_DEPTH); generateCaves(stone_surface_max_y, large_cave_depth);
} }
// Generate dungeons and desert temples // Generate dungeons and desert temples

4
src/mapgen_v5.h
View File

@ -23,8 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "mapgen.h" #include "mapgen.h"
#define MGV5_LARGE_CAVE_DEPTH -256
///////// Mapgen V5 flags ///////// Mapgen V5 flags
#define MGV5_CAVERNS 0x01 #define MGV5_CAVERNS 0x01
@ -36,6 +34,7 @@ struct MapgenV5Params : public MapgenParams
{ {
u32 spflags = MGV5_CAVERNS; u32 spflags = MGV5_CAVERNS;
float cave_width = 0.125f; float cave_width = 0.125f;
s16 large_cave_depth = -256;
s16 cavern_limit = -256; s16 cavern_limit = -256;
s16 cavern_taper = 256; s16 cavern_taper = 256;
float cavern_threshold = 0.7f; float cavern_threshold = 0.7f;
@ -68,6 +67,7 @@ public:
int generateBaseTerrain(); int generateBaseTerrain();
private: private:
s16 large_cave_depth;
Noise *noise_factor; Noise *noise_factor;
Noise *noise_height; Noise *noise_height;
Noise *noise_ground; Noise *noise_ground;

5
src/mapgen_v7.cpp
View File

@ -56,6 +56,7 @@ MapgenV7::MapgenV7(int mapgenid, MapgenV7Params *params, EmergeManager *emerge)
{ {
this->spflags = params->spflags; this->spflags = params->spflags;
this->cave_width = params->cave_width; this->cave_width = params->cave_width;
this->large_cave_depth = params->large_cave_depth;
this->float_mount_density = params->float_mount_density; this->float_mount_density = params->float_mount_density;
this->float_mount_height = params->float_mount_height; this->float_mount_height = params->float_mount_height;
this->floatland_level = params->floatland_level; this->floatland_level = params->floatland_level;
@ -143,6 +144,7 @@ void MapgenV7Params::readParams(const Settings *settings)
{ {
settings->getFlagStrNoEx("mgv7_spflags", spflags, flagdesc_mapgen_v7); settings->getFlagStrNoEx("mgv7_spflags", spflags, flagdesc_mapgen_v7);
settings->getFloatNoEx("mgv7_cave_width", cave_width); settings->getFloatNoEx("mgv7_cave_width", cave_width);
settings->getS16NoEx("mgv7_large_cave_depth", large_cave_depth);
settings->getFloatNoEx("mgv7_float_mount_density", float_mount_density); settings->getFloatNoEx("mgv7_float_mount_density", float_mount_density);
settings->getFloatNoEx("mgv7_float_mount_height", float_mount_height); settings->getFloatNoEx("mgv7_float_mount_height", float_mount_height);
settings->getS16NoEx("mgv7_floatland_level", floatland_level); settings->getS16NoEx("mgv7_floatland_level", floatland_level);
@ -172,6 +174,7 @@ void MapgenV7Params::writeParams(Settings *settings) const
{ {
settings->setFlagStr("mgv7_spflags", spflags, flagdesc_mapgen_v7, U32_MAX); settings->setFlagStr("mgv7_spflags", spflags, flagdesc_mapgen_v7, U32_MAX);
settings->setFloat("mgv7_cave_width", cave_width); settings->setFloat("mgv7_cave_width", cave_width);
settings->setS16("mgv7_large_cave_depth", large_cave_depth);
settings->setFloat("mgv7_float_mount_density", float_mount_density); settings->setFloat("mgv7_float_mount_density", float_mount_density);
settings->setFloat("mgv7_float_mount_height", float_mount_height); settings->setFloat("mgv7_float_mount_height", float_mount_height);
settings->setS16("mgv7_floatland_level", floatland_level); settings->setS16("mgv7_floatland_level", floatland_level);
@ -303,7 +306,7 @@ void MapgenV7::makeChunk(BlockMakeData *data)
// large caverns and floating blobs of overgenerated liquid. // large caverns and floating blobs of overgenerated liquid.
generateCaves(stone_surface_max_y, -MAX_MAP_GENERATION_LIMIT); generateCaves(stone_surface_max_y, -MAX_MAP_GENERATION_LIMIT);
else else
generateCaves(stone_surface_max_y, water_level); generateCaves(stone_surface_max_y, large_cave_depth);
} }
// Generate dungeons // Generate dungeons

2
src/mapgen_v7.h
View File

@ -37,6 +37,7 @@ extern FlagDesc flagdesc_mapgen_v7[];
struct MapgenV7Params : public MapgenParams { struct MapgenV7Params : public MapgenParams {
u32 spflags = MGV7_MOUNTAINS | MGV7_RIDGES | MGV7_CAVERNS; u32 spflags = MGV7_MOUNTAINS | MGV7_RIDGES | MGV7_CAVERNS;
float cave_width = 0.09f; float cave_width = 0.09f;
s16 large_cave_depth = -33;
float float_mount_density = 0.6f; float float_mount_density = 0.6f;
float float_mount_height = 128.0f; float float_mount_height = 128.0f;
s16 floatland_level = 1280; s16 floatland_level = 1280;
@ -88,6 +89,7 @@ public:
void generateRidgeTerrain(); void generateRidgeTerrain();
private: private:
s16 large_cave_depth;
float float_mount_density; float float_mount_density;
float float_mount_height; float float_mount_height;
s16 floatland_level; s16 floatland_level;