135 changes: 135 additions & 0 deletions src/mapgen_indev.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
/*
Minetest
Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
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 MAPGENINDEV_HEADER
#define MAPGENINDEV_HEADER

#include "mapgen.h"
#include "mapgen_v6.h"

float farscale(float scale, float x, float y, float z);

struct NoiseIndevParams : public NoiseParams {
float farscale;

NoiseIndevParams(){}
NoiseIndevParams(float offset_, float scale_, v3f spread_, int seed_, int octaves_, float persist_, float farscale_)
//:NoiseParams(offset_, scale_, spread_, seed_, octaves_, persist_)
{
//NoiseParams(float offset_, float scale_, v3f spread_, int seed_, int octaves_, float persist_) {
offset = offset_;
scale = scale_;
spread = spread_;
seed = seed_;
octaves = octaves_;
persist = persist_;
//}
farscale = farscale_;
}

};

#define getNoiseIndevParams(x) getStruct<NoiseIndevParams>((x), "f,f,v3,s32,s32,f,f")
#define setNoiseIndevParams(x, y) setStruct((x), "f,f,v3,s32,s32,f,f", (y))

class NoiseIndev : public Noise {
public:
NoiseIndevParams *npindev;

//NoiseIndev() {};
NoiseIndev(NoiseIndevParams *np, int seed, int sx, int sy);
NoiseIndev(NoiseIndevParams *np, int seed, int sx, int sy, int sz);
void init(NoiseIndevParams *np, int seed, int sx, int sy, int sz);
void transformNoiseMapFarScale(float xx = 0, float yy = 0, float zz = 0);
};

extern NoiseIndevParams nparams_indev_def_terrain_base;
extern NoiseIndevParams nparams_indev_def_terrain_higher;
extern NoiseIndevParams nparams_indev_def_steepness;
//extern NoiseIndevParams nparams_indev_def_height_select;
//extern NoiseIndevParams nparams_indev_def_trees;
extern NoiseIndevParams nparams_indev_def_mud;
//extern NoiseIndevParams nparams_indev_def_beach;
//extern NoiseIndevParams nparams_indev_def_biome;
//extern NoiseIndevParams nparams_indev_def_cave;


struct MapgenIndevParams : public MapgenV6Params {
NoiseIndevParams *npindev_terrain_base;
NoiseIndevParams *npindev_terrain_higher;
NoiseIndevParams *npindev_steepness;
//NoiseParams *np_height_select;
//NoiseParams *np_trees;
NoiseIndevParams *npindev_mud;
//NoiseParams *np_beach;
//NoiseParams *np_biome;
//NoiseParams *np_cave;

MapgenIndevParams() {
//freq_desert = 0.45;
//freq_beach = 0.15;
npindev_terrain_base = &nparams_indev_def_terrain_base;
npindev_terrain_higher = &nparams_indev_def_terrain_higher;
npindev_steepness = &nparams_indev_def_steepness;
//np_height_select = &nparams_v6_def_height_select;
//np_trees = &nparams_v6_def_trees;
npindev_mud = &nparams_indev_def_mud;
//np_beach = &nparams_v6_def_beach;
//np_biome = &nparams_v6_def_biome;
//np_cave = &nparams_v6_def_cave;
}

bool readParams(Settings *settings);
void writeParams(Settings *settings);
};

class MapgenIndev : public MapgenV6 {
public:
NoiseIndev *noiseindev_terrain_base;
NoiseIndev *noiseindev_terrain_higher;
NoiseIndev *noiseindev_steepness;
//NoiseIndev *noise_height_select;
//NoiseIndev *noise_trees;
NoiseIndev *noiseindev_mud;
//NoiseIndev *noise_beach;
//NoiseIndev *noise_biome;
//NoiseIndevParams *np_cave;

MapgenIndev(int mapgenid, MapgenIndevParams *params);
~MapgenIndev();
void calculateNoise();

float baseTerrainLevelFromNoise(v2s16 p);
float baseTerrainLevelFromMap(int index);
float getMudAmount(int index);
void defineCave(Cave & cave, PseudoRandom ps, v3s16 node_min, bool large_cave);
};

struct MapgenFactoryIndev : public MapgenFactoryV6 {
Mapgen *createMapgen(int mgid, MapgenParams *params, EmergeManager *emerge) {
return new MapgenIndev(mgid, (MapgenIndevParams *)params);
};

MapgenParams *createMapgenParams() {
return new MapgenIndevParams();
};
};


#endif
72 changes: 39 additions & 33 deletions src/mapgen_v6.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,6 +878,24 @@ void MapgenV6::growGrass() {
}
}

void MapgenV6::defineCave(Cave & cave, PseudoRandom ps, v3s16 node_min, bool large_cave) {
cave.min_tunnel_diameter = 2;
cave.max_tunnel_diameter = ps.range(2,6);
cave.dswitchint = ps.range(1,14);
//cave.tunnel_routepoints = 0;
//cave.part_max_length_rs = 0;
cave.flooded = large_cave && ps.range(0,4);
if(large_cave){
cave.part_max_length_rs = ps.range(2,4);
cave.tunnel_routepoints = ps.range(5, ps.range(15,30));
cave.min_tunnel_diameter = 5;
cave.max_tunnel_diameter = ps.range(7, ps.range(8,24));
} else {
cave.part_max_length_rs = ps.range(2,9);
cave.tunnel_routepoints = ps.range(10, ps.range(15,30));
}
cave.large_cave_is_flat = (ps.range(0,1) == 0);
};

void MapgenV6::generateCaves(int max_stone_y) {
// 24ms @cs=8
Expand Down Expand Up @@ -911,21 +929,9 @@ void MapgenV6::generateCaves(int max_stone_y) {
break;*/

bool large_cave = (jj >= caves_count);
s16 min_tunnel_diameter = 2;
s16 max_tunnel_diameter = ps.range(2,6);
int dswitchint = ps.range(1,14);
u16 tunnel_routepoints = 0;
int part_max_length_rs = 0;
if(large_cave){
part_max_length_rs = ps.range(2,4);
tunnel_routepoints = ps.range(5, ps.range(15,30));
min_tunnel_diameter = 5;
max_tunnel_diameter = ps.range(7, ps.range(8,24));
} else {
part_max_length_rs = ps.range(2,9);
tunnel_routepoints = ps.range(10, ps.range(15,30));
}
bool large_cave_is_flat = (ps.range(0,1) == 0);

Cave cave;
defineCave(cave, ps, node_min, large_cave);

v3f main_direction(0,0,0);

Expand All @@ -938,13 +944,13 @@ void MapgenV6::generateCaves(int max_stone_y) {
// Allow a bit more
//(this should be more than the maximum radius of the tunnel)
s16 insure = 10;
s16 more = max_spread_amount - max_tunnel_diameter / 2 - insure;
s16 more = max_spread_amount - cave.max_tunnel_diameter / 2 - insure;
ar += v3s16(1,0,1) * more * 2;
of -= v3s16(1,0,1) * more;

s16 route_y_min = 0;
// Allow half a diameter + 7 over stone surface
s16 route_y_max = -of.Y + max_stone_y + max_tunnel_diameter/2 + 7;
s16 route_y_max = -of.Y + max_stone_y + cave.max_tunnel_diameter/2 + 7;

// Limit maximum to area
route_y_max = rangelim(route_y_max, 0, ar.Y-1);
Expand All @@ -954,10 +960,10 @@ void MapgenV6::generateCaves(int max_stone_y) {
s16 min = 0;
if(node_min.Y < water_level && node_max.Y > water_level)
{
min = water_level - max_tunnel_diameter/3 - of.Y;
route_y_max = water_level + max_tunnel_diameter/3 - of.Y;
min = water_level - cave.max_tunnel_diameter/3 - of.Y;
route_y_max = water_level + cave.max_tunnel_diameter/3 - of.Y;
}
route_y_min = ps.range(min, min + max_tunnel_diameter);
route_y_min = ps.range(min, min + cave.max_tunnel_diameter);
route_y_min = rangelim(route_y_min, 0, route_y_max);
}

Expand Down Expand Up @@ -985,9 +991,9 @@ void MapgenV6::generateCaves(int max_stone_y) {
Generate some tunnel starting from orp
*/

for(u16 j=0; j<tunnel_routepoints; j++)
for(u16 j=0; j<cave.tunnel_routepoints; j++)
{
if(j%dswitchint==0 && large_cave == false)
if(j%cave.dswitchint==0 && large_cave == false)
{
main_direction = v3f(
((float)(ps.next()%20)-(float)10)/10,
Expand All @@ -998,8 +1004,8 @@ void MapgenV6::generateCaves(int max_stone_y) {
}

// Randomize size
s16 min_d = min_tunnel_diameter;
s16 max_d = max_tunnel_diameter;
s16 min_d = cave.min_tunnel_diameter;
s16 max_d = cave.max_tunnel_diameter;
s16 rs = ps.range(min_d, max_d);

// Every second section is rough
Expand All @@ -1009,17 +1015,17 @@ void MapgenV6::generateCaves(int max_stone_y) {
if(large_cave)
{
maxlen = v3s16(
rs*part_max_length_rs,
rs*part_max_length_rs/2,
rs*part_max_length_rs
rs*cave.part_max_length_rs,
rs*cave.part_max_length_rs/2,
rs*cave.part_max_length_rs
);
}
else
{
maxlen = v3s16(
rs*part_max_length_rs,
ps.range(1, rs*part_max_length_rs),
rs*part_max_length_rs
rs*cave.part_max_length_rs,
ps.range(1, rs*cave.part_max_length_rs),
rs*cave.part_max_length_rs
);
}

Expand Down Expand Up @@ -1091,7 +1097,7 @@ void MapgenV6::generateCaves(int max_stone_y) {
/*// Make better floors in small caves
if(y0 <= -rs/2 && rs<=7)
continue;*/
if (large_cave_is_flat) {
if (cave.large_cave_is_flat) {
// Make large caves not so tall
if (rs > 7 && abs(y0) >= rs/3)
continue;
Expand All @@ -1109,13 +1115,13 @@ void MapgenV6::generateCaves(int max_stone_y) {
u32 i = vm->m_area.index(p);

if(large_cave) {
if (full_node_min.Y < water_level &&
if (cave.flooded && full_node_min.Y < water_level &&
full_node_max.Y > water_level) {
if (p.Y <= water_level)
vm->m_data[i] = waternode;
else
vm->m_data[i] = airnode;
} else if (full_node_max.Y < water_level) {
} else if (cave.flooded && full_node_max.Y < water_level) {
if (p.Y < startp.Y - 2)
vm->m_data[i] = lavanode;
else
Expand Down
21 changes: 16 additions & 5 deletions src/mapgen_v6.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,16 @@ extern NoiseParams nparams_v6_def_humidity;
extern NoiseParams nparams_v6_def_trees;
extern NoiseParams nparams_v6_def_apple_trees;

struct Cave {
s16 min_tunnel_diameter;
s16 max_tunnel_diameter;
int dswitchint;
u16 tunnel_routepoints;
int part_max_length_rs;
bool large_cave_is_flat;
bool flooded;
};

struct MapgenV6Params : public MapgenParams {
float freq_desert;
float freq_beach;
Expand Down Expand Up @@ -126,9 +136,9 @@ class MapgenV6 : public Mapgen {

float baseTerrainLevel(float terrain_base, float terrain_higher,
float steepness, float height_select);
float baseTerrainLevelFromNoise(v2s16 p);
float baseTerrainLevelFromMap(v2s16 p);
float baseTerrainLevelFromMap(int index);
virtual float baseTerrainLevelFromNoise(v2s16 p);
virtual float baseTerrainLevelFromMap(v2s16 p);
virtual float baseTerrainLevelFromMap(int index);

s16 find_ground_level(v2s16 p2d);
s16 find_stone_level(v2s16 p2d);
Expand All @@ -139,7 +149,7 @@ class MapgenV6 : public Mapgen {
float getTreeAmount(v2s16 p);
bool getHaveAppleTree(v2s16 p);
float getMudAmount(v2s16 p);
float getMudAmount(int index);
virtual float getMudAmount(int index);
bool getHaveBeach(v2s16 p);
bool getHaveBeach(int index);
BiomeType getBiome(v2s16 p);
Expand All @@ -148,13 +158,14 @@ class MapgenV6 : public Mapgen {
u32 get_blockseed(u64 seed, v3s16 p);


void calculateNoise();
virtual void calculateNoise();
int generateGround();
void addMud();
void flowMud(s16 &mudflow_minpos, s16 &mudflow_maxpos);
void addDirtGravelBlobs();
void growGrass();
void placeTrees();
virtual void defineCave(Cave & cave, PseudoRandom ps, v3s16 node_min, bool large_cave);
void generateCaves(int max_stone_y);
};

Expand Down
1 change: 1 addition & 0 deletions src/noise.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,7 @@ float *Noise::perlinMap2D(float x, float y) {
for (j = 0; j != sy; j++) {
for (i = 0; i != sx; i++) {
result[index] += g * buf[index];
//dstream << "pm2d i="<<index<<" r="<< result[index]<<std::endl;
index++;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/noise.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class Noise {
Noise(NoiseParams *np, int seed, int sx, int sy, int sz);
~Noise();

void init(NoiseParams *np, int seed, int sx, int sy, int sz);
virtual void init(NoiseParams *np, int seed, int sx, int sy, int sz);
void setSize(int sx, int sy);
void setSize(int sx, int sy, int sz);
void setSpreadFactor(v3f spread);
Expand Down
2 changes: 1 addition & 1 deletion src/settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ class Settings
n = m_defaults.find(name);
if(n == m_defaults.end())
{
throw SettingNotFoundException("Setting not found");
throw SettingNotFoundException(("Setting [" + name + "] not found ").c_str());
}
}

Expand Down