Skip to content

Commit 706e7ce

Browse files
paramatparamat
committedOct 7, 2015
Fractal mapgen: Add seabed and large pseudorandom caves
·
5.11.00.4.14
1 parent d152b55 commit 706e7ce

File tree

4 files changed

+371
-50
lines changed

4 files changed

+371
-50
lines changed
 

Diff for: ‎src/cavegen.cpp

+245
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2323
#include "mapgen_v5.h"
2424
#include "mapgen_v6.h"
2525
#include "mapgen_v7.h"
26+
#include "mapgen_fractal.h"
2627
#include "cavegen.h"
2728

2829
NoiseParams nparams_caveliquids(0, 1, v3f(150.0, 150.0, 150.0), 776, 3, 0.6, 2.0);
@@ -807,3 +808,247 @@ void CaveV7::carveRoute(v3f vec, float f, bool randomize_xz)
807808
}
808809
}
809810
}
811+
812+
813+
///////////////////////////////////////// Caves Fractal
814+
815+
816+
CaveFractal::CaveFractal(MapgenFractal *mg, PseudoRandom *ps)
817+
{
818+
this->mg = mg;
819+
this->vm = mg->vm;
820+
this->ndef = mg->ndef;
821+
this->water_level = mg->water_level;
822+
this->ps = ps;
823+
this->c_water_source = mg->c_water_source;
824+
this->c_lava_source = mg->c_lava_source;
825+
this->c_ice = mg->c_ice;
826+
this->np_caveliquids = &nparams_caveliquids;
827+
828+
dswitchint = ps->range(1, 14);
829+
flooded = ps->range(1, 2) == 2;
830+
831+
part_max_length_rs = ps->range(2, 4);
832+
tunnel_routepoints = ps->range(5, ps->range(15, 30));
833+
min_tunnel_diameter = 5;
834+
max_tunnel_diameter = ps->range(7, ps->range(8, 24));
835+
836+
large_cave_is_flat = (ps->range(0, 1) == 0);
837+
}
838+
839+
840+
void CaveFractal::makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height)
841+
{
842+
node_min = nmin;
843+
node_max = nmax;
844+
main_direction = v3f(0, 0, 0);
845+
846+
// Allowed route area size in nodes
847+
ar = node_max - node_min + v3s16(1, 1, 1);
848+
// Area starting point in nodes
849+
of = node_min;
850+
851+
// Allow a bit more
852+
//(this should be more than the maximum radius of the tunnel)
853+
s16 insure = 10;
854+
s16 more = MYMAX(MAP_BLOCKSIZE - max_tunnel_diameter / 2 - insure, 1);
855+
ar += v3s16(1,0,1) * more * 2;
856+
of -= v3s16(1,0,1) * more;
857+
858+
route_y_min = 0;
859+
// Allow half a diameter + 7 over stone surface
860+
route_y_max = -of.Y + max_stone_y + max_tunnel_diameter / 2 + 7;
861+
862+
// Limit maximum to area
863+
route_y_max = rangelim(route_y_max, 0, ar.Y - 1);
864+
865+
s16 min = 0;
866+
if (node_min.Y < water_level && node_max.Y > water_level) {
867+
min = water_level - max_tunnel_diameter/3 - of.Y;
868+
route_y_max = water_level + max_tunnel_diameter/3 - of.Y;
869+
}
870+
route_y_min = ps->range(min, min + max_tunnel_diameter);
871+
route_y_min = rangelim(route_y_min, 0, route_y_max);
872+
873+
s16 route_start_y_min = route_y_min;
874+
s16 route_start_y_max = route_y_max;
875+
876+
route_start_y_min = rangelim(route_start_y_min, 0, ar.Y - 1);
877+
route_start_y_max = rangelim(route_start_y_max, route_start_y_min, ar.Y - 1);
878+
879+
// Randomize starting position
880+
orp = v3f(
881+
(float)(ps->next() % ar.X) + 0.5,
882+
(float)(ps->range(route_start_y_min, route_start_y_max)) + 0.5,
883+
(float)(ps->next() % ar.Z) + 0.5
884+
);
885+
886+
// Add generation notify begin event
887+
v3s16 abs_pos(of.X + orp.X, of.Y + orp.Y, of.Z + orp.Z);
888+
GenNotifyType notifytype = GENNOTIFY_LARGECAVE_BEGIN;
889+
mg->gennotify.addEvent(notifytype, abs_pos);
890+
891+
// Generate some tunnel starting from orp
892+
for (u16 j = 0; j < tunnel_routepoints; j++)
893+
makeTunnel(j % dswitchint == 0);
894+
895+
// Add generation notify end event
896+
abs_pos = v3s16(of.X + orp.X, of.Y + orp.Y, of.Z + orp.Z);
897+
notifytype = GENNOTIFY_LARGECAVE_END;
898+
mg->gennotify.addEvent(notifytype, abs_pos);
899+
}
900+
901+
902+
void CaveFractal::makeTunnel(bool dirswitch)
903+
{
904+
// Randomize size
905+
s16 min_d = min_tunnel_diameter;
906+
s16 max_d = max_tunnel_diameter;
907+
rs = ps->range(min_d, max_d);
908+
s16 rs_part_max_length_rs = rs * part_max_length_rs;
909+
910+
v3s16 maxlen;
911+
maxlen = v3s16(
912+
rs_part_max_length_rs,
913+
rs_part_max_length_rs / 2,
914+
rs_part_max_length_rs
915+
);
916+
917+
v3f vec;
918+
// Jump downward sometimes
919+
vec = v3f(
920+
(float)(ps->next() % maxlen.X) - (float)maxlen.X / 2,
921+
(float)(ps->next() % maxlen.Y) - (float)maxlen.Y / 2,
922+
(float)(ps->next() % maxlen.Z) - (float)maxlen.Z / 2
923+
);
924+
925+
// Do not make caves that are above ground.
926+
// It is only necessary to check the startpoint and endpoint.
927+
v3s16 orpi(orp.X, orp.Y, orp.Z);
928+
v3s16 veci(vec.X, vec.Y, vec.Z);
929+
v3s16 p;
930+
931+
p = orpi + veci + of + rs / 2;
932+
if (p.Z >= node_min.Z && p.Z <= node_max.Z &&
933+
p.X >= node_min.X && p.X <= node_max.X) {
934+
u32 index = (p.Z - node_min.Z) * mg->ystride + (p.X - node_min.X);
935+
s16 h = mg->heightmap[index];
936+
if (h < p.Y)
937+
return;
938+
} else if (p.Y > water_level) {
939+
return; // If it's not in our heightmap, use a simple heuristic
940+
}
941+
942+
p = orpi + of + rs / 2;
943+
if (p.Z >= node_min.Z && p.Z <= node_max.Z &&
944+
p.X >= node_min.X && p.X <= node_max.X) {
945+
u32 index = (p.Z - node_min.Z) * mg->ystride + (p.X - node_min.X);
946+
s16 h = mg->heightmap[index];
947+
if (h < p.Y)
948+
return;
949+
} else if (p.Y > water_level) {
950+
return;
951+
}
952+
953+
vec += main_direction;
954+
955+
v3f rp = orp + vec;
956+
if (rp.X < 0)
957+
rp.X = 0;
958+
else if (rp.X >= ar.X)
959+
rp.X = ar.X - 1;
960+
961+
if (rp.Y < route_y_min)
962+
rp.Y = route_y_min;
963+
else if (rp.Y >= route_y_max)
964+
rp.Y = route_y_max - 1;
965+
966+
if (rp.Z < 0)
967+
rp.Z = 0;
968+
else if (rp.Z >= ar.Z)
969+
rp.Z = ar.Z - 1;
970+
971+
vec = rp - orp;
972+
973+
float veclen = vec.getLength();
974+
if (veclen < 0.05)
975+
veclen = 1.0;
976+
977+
// Every second section is rough
978+
bool randomize_xz = (ps->range(1, 2) == 1);
979+
980+
// Carve routes
981+
for (float f = 0; f < 1.0; f += 1.0 / veclen)
982+
carveRoute(vec, f, randomize_xz);
983+
984+
orp = rp;
985+
}
986+
987+
988+
void CaveFractal::carveRoute(v3f vec, float f, bool randomize_xz)
989+
{
990+
MapNode airnode(CONTENT_AIR);
991+
MapNode waternode(c_water_source);
992+
MapNode lavanode(c_lava_source);
993+
994+
v3s16 startp(orp.X, orp.Y, orp.Z);
995+
startp += of;
996+
997+
float nval = NoisePerlin3D(np_caveliquids, startp.X,
998+
startp.Y, startp.Z, mg->seed);
999+
MapNode liquidnode = (nval < 0.40 && node_max.Y < MGFRACTAL_LAVA_DEPTH) ?
1000+
lavanode : waternode;
1001+
1002+
v3f fp = orp + vec * f;
1003+
fp.X += 0.1 * ps->range(-10, 10);
1004+
fp.Z += 0.1 * ps->range(-10, 10);
1005+
v3s16 cp(fp.X, fp.Y, fp.Z);
1006+
1007+
s16 d0 = -rs/2;
1008+
s16 d1 = d0 + rs;
1009+
if (randomize_xz) {
1010+
d0 += ps->range(-1, 1);
1011+
d1 += ps->range(-1, 1);
1012+
}
1013+
1014+
for (s16 z0 = d0; z0 <= d1; z0++) {
1015+
s16 si = rs / 2 - MYMAX(0, abs(z0) - rs / 7 - 1);
1016+
for (s16 x0 = -si - ps->range(0,1); x0 <= si - 1 + ps->range(0,1); x0++) {
1017+
s16 maxabsxz = MYMAX(abs(x0), abs(z0));
1018+
1019+
s16 si2 = rs / 2 - MYMAX(0, maxabsxz - rs / 7 - 1);
1020+
1021+
for (s16 y0 = -si2; y0 <= si2; y0++) {
1022+
if (large_cave_is_flat) {
1023+
// Make large caves not so tall
1024+
if (rs > 7 && abs(y0) >= rs / 3)
1025+
continue;
1026+
}
1027+
1028+
v3s16 p(cp.X + x0, cp.Y + y0, cp.Z + z0);
1029+
p += of;
1030+
1031+
if (vm->m_area.contains(p) == false)
1032+
continue;
1033+
1034+
u32 i = vm->m_area.index(p);
1035+
content_t c = vm->m_data[i].getContent();
1036+
if (!ndef->get(c).is_ground_content)
1037+
continue;
1038+
1039+
int full_ymin = node_min.Y - MAP_BLOCKSIZE;
1040+
int full_ymax = node_max.Y + MAP_BLOCKSIZE;
1041+
1042+
if (flooded && full_ymin < water_level &&
1043+
full_ymax > water_level)
1044+
vm->m_data[i] = (p.Y <= water_level) ?
1045+
waternode : airnode;
1046+
else if (flooded && full_ymax < water_level)
1047+
vm->m_data[i] = (p.Y < startp.Y - 4) ?
1048+
liquidnode : airnode;
1049+
else
1050+
vm->m_data[i] = airnode;
1051+
}
1052+
}
1053+
}
1054+
}

Diff for: ‎src/cavegen.h

+47
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2222

2323
#define VMANIP_FLAG_CAVE VOXELFLAG_CHECKED1
2424
#define MGV7_LAVA_DEPTH -256
25+
#define MGFRACTAL_LAVA_DEPTH -256
2526

2627
class MapgenV5;
2728
class MapgenV6;
2829
class MapgenV7;
30+
class MapgenFractal;
2931

3032
class CaveV5 {
3133
public:
@@ -161,4 +163,49 @@ class CaveV7 {
161163
void carveRoute(v3f vec, float f, bool randomize_xz);
162164
};
163165

166+
class CaveFractal {
167+
public:
168+
MapgenFractal *mg;
169+
MMVManip *vm;
170+
INodeDefManager *ndef;
171+
172+
NoiseParams *np_caveliquids;
173+
174+
s16 min_tunnel_diameter;
175+
s16 max_tunnel_diameter;
176+
u16 tunnel_routepoints;
177+
int dswitchint;
178+
int part_max_length_rs;
179+
180+
bool large_cave_is_flat;
181+
bool flooded;
182+
183+
s16 max_stone_y;
184+
v3s16 node_min;
185+
v3s16 node_max;
186+
187+
v3f orp; // starting point, relative to caved space
188+
v3s16 of; // absolute coordinates of caved space
189+
v3s16 ar; // allowed route area
190+
s16 rs; // tunnel radius size
191+
v3f main_direction;
192+
193+
s16 route_y_min;
194+
s16 route_y_max;
195+
196+
PseudoRandom *ps;
197+
198+
content_t c_water_source;
199+
content_t c_lava_source;
200+
content_t c_ice;
201+
202+
int water_level;
203+
204+
CaveFractal() {}
205+
CaveFractal(MapgenFractal *mg, PseudoRandom *ps);
206+
void makeCave(v3s16 nmin, v3s16 nmax, int max_stone_height);
207+
void makeTunnel(bool dirswitch);
208+
void carveRoute(v3f vec, float f, bool randomize_xz);
209+
};
210+
164211
#endif

Diff for: ‎src/mapgen_fractal.cpp

+71-47
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Minetest
3-
Copyright (C) 2010-2013 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
4-
Additional development and fractal code by paramat
3+
Copyright (C) 2010-2015 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
4+
Copyright (C) 2010-2015 paramat, Matt Gregory
55
66
This program is free software; you can redistribute it and/or modify
77
it under the terms of the GNU Lesser General Public License as published by
@@ -73,9 +73,12 @@ MapgenFractal::MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager *
7373
this->offset_y = sp->offset_y;
7474
this->offset_z = sp->offset_z;
7575

76-
//// 3d terrain noise
77-
noise_cave1 = new Noise(&sp->np_cave1, seed, csize.X, csize.Y + 2, csize.Z);
78-
noise_cave2 = new Noise(&sp->np_cave2, seed, csize.X, csize.Y + 2, csize.Z);
76+
//// 2D terrain noise
77+
noise_seabed = new Noise(&sp->np_seabed, seed, csize.X, csize.Z);
78+
79+
//// 3D terrain noise
80+
noise_cave1 = new Noise(&sp->np_cave1, seed, csize.X, csize.Y + 2, csize.Z);
81+
noise_cave2 = new Noise(&sp->np_cave2, seed, csize.X, csize.Y + 2, csize.Z);
7982

8083
//// Biome noise
8184
noise_heat = new Noise(&params->np_biome_heat, seed, csize.X, csize.Z);
@@ -114,6 +117,8 @@ MapgenFractal::MapgenFractal(int mapgenid, MapgenParams *params, EmergeManager *
114117

115118
MapgenFractal::~MapgenFractal()
116119
{
120+
delete noise_seabed;
121+
117122
delete noise_cave1;
118123
delete noise_cave2;
119124

@@ -132,20 +137,21 @@ MapgenFractalParams::MapgenFractalParams()
132137
spflags = 0;
133138

134139
iterations = 9;
135-
scale_x = 1024;
136-
scale_y = 256;
137-
scale_z = 1024;
140+
scale_x = 1024.0;
141+
scale_y = 256.0;
142+
scale_z = 1024.0;
138143
offset_x = -1.75;
139-
offset_y = 0;
140-
offset_z = 0;
144+
offset_y = 0.0;
145+
offset_z = 0.0;
141146
slice_w = 0.5;
142147
julia_x = 0.33;
143148
julia_y = 0.33;
144149
julia_z = 0.33;
145150
julia_w = 0.33;
146151

147-
np_cave1 = NoiseParams(0, 12, v3f(128, 128, 128), 52534, 4, 0.5, 2.0);
148-
np_cave2 = NoiseParams(0, 12, v3f(128, 128, 128), 10325, 4, 0.5, 2.0);
152+
np_seabed = NoiseParams(-14, 9, v3f(600, 600, 600), 41900, 5, 0.6, 2.0);
153+
np_cave1 = NoiseParams(0, 12, v3f(128, 128, 128), 52534, 4, 0.5, 2.0);
154+
np_cave2 = NoiseParams(0, 12, v3f(128, 128, 128), 10325, 4, 0.5, 2.0);
149155
}
150156

151157

@@ -166,6 +172,7 @@ void MapgenFractalParams::readParams(const Settings *settings)
166172
settings->getFloatNoEx("mgfractal_julia_z", julia_z);
167173
settings->getFloatNoEx("mgfractal_julia_w", julia_w);
168174

175+
settings->getNoiseParams("mgfractal_np_seabed", np_seabed);
169176
settings->getNoiseParams("mgfractal_np_cave1", np_cave1);
170177
settings->getNoiseParams("mgfractal_np_cave2", np_cave2);
171178
}
@@ -188,6 +195,7 @@ void MapgenFractalParams::writeParams(Settings *settings) const
188195
settings->setFloat("mgfractal_julia_z", julia_z);
189196
settings->setFloat("mgfractal_julia_w", julia_w);
190197

198+
settings->setNoiseParams("mgfractal_np_seabed", np_seabed);
191199
settings->setNoiseParams("mgfractal_np_cave1", np_cave1);
192200
settings->setNoiseParams("mgfractal_np_cave2", np_cave2);
193201
}
@@ -198,15 +206,15 @@ void MapgenFractalParams::writeParams(Settings *settings) const
198206

199207
int MapgenFractal::getGroundLevelAtPoint(v2s16 p)
200208
{
201-
s16 search_top = water_level + 128;
202-
s16 search_base = water_level;
203-
s16 level = -MAX_MAP_GENERATION_LIMIT;
204-
for (s16 y = search_top; y >= search_base; y--) {
205-
if (getTerrainAtPoint(p.X, y, p.Y))
209+
s16 search_start = 128;
210+
s16 search_end = -128;
211+
212+
for (s16 y = search_start; y >= search_end; y--) {
213+
if (getFractalAtPoint(p.X, y, p.Y))
206214
return y;
207215
}
208216

209-
return level;
217+
return -MAX_MAP_GENERATION_LIMIT;
210218
}
211219

212220

@@ -329,6 +337,8 @@ void MapgenFractal::calculateNoise()
329337
int y = node_min.Y - 1;
330338
int z = node_min.Z;
331339

340+
noise_seabed->perlinMap2D(x, z);
341+
332342
if (flags & MG_CAVES) {
333343
noise_cave1->perlinMap3D(x, y, z);
334344
noise_cave2->perlinMap3D(x, y, z);
@@ -350,7 +360,7 @@ void MapgenFractal::calculateNoise()
350360
}
351361

352362

353-
bool MapgenFractal::getTerrainAtPoint(s16 x, s16 y, s16 z)
363+
bool MapgenFractal::getFractalAtPoint(s16 x, s16 y, s16 z)
354364
{
355365
float cx, cy, cz, cw, ox, oy, oz, ow;
356366

@@ -368,22 +378,21 @@ bool MapgenFractal::getTerrainAtPoint(s16 x, s16 y, s16 z)
368378
cy = (float)y / scale_y + offset_y;
369379
cz = (float)z / scale_z + offset_z;
370380
cw = slice_w;
371-
ox = 0.0;
372-
oy = 0.0;
373-
oz = 0.0;
374-
ow = 0.0;
381+
ox = 0.0f;
382+
oy = 0.0f;
383+
oz = 0.0f;
384+
ow = 0.0f;
375385
}
376386

377387
for (u16 iter = 0; iter < iterations; iter++) {
378388
// 4D "Roundy" Mandelbrot set
379389
float nx = ox * ox - oy * oy - oz * oz - ow * ow + cx;
380-
float ny = 2.0 * (ox * oy + oz * ow) + cy;
381-
float nz = 2.0 * (ox * oz + oy * ow) + cz;
382-
float nw = 2.0 * (ox * ow + oy * oz) + cw;
390+
float ny = 2.0f * (ox * oy + oz * ow) + cy;
391+
float nz = 2.0f * (ox * oz + oy * ow) + cz;
392+
float nw = 2.0f * (ox * ow + oy * oz) + cw;
383393

384-
if (nx * nx + ny * ny + nz * nz + nw * nw > 4.0) {
394+
if (nx * nx + ny * ny + nz * nz + nw * nw > 4.0f)
385395
return false;
386-
}
387396

388397
ox = nx;
389398
oy = ny;
@@ -402,23 +411,29 @@ s16 MapgenFractal::generateTerrain()
402411
MapNode n_water(c_water_source);
403412

404413
s16 stone_surface_max_y = -MAX_MAP_GENERATION_LIMIT;
414+
u32 index2d = 0;
405415

406-
for (s16 z = node_min.Z; z <= node_max.Z; z++)
407-
for (s16 y = node_min.Y - 1; y <= node_max.Y + 1; y++) {
408-
u32 i = vm->m_area.index(node_min.X, y, z);
409-
for (s16 x = node_min.X; x <= node_max.X; x++, i++) {
410-
if (vm->m_data[i].getContent() == CONTENT_IGNORE) {
411-
if (getTerrainAtPoint(x, y, z)) {
412-
vm->m_data[i] = n_stone;
413-
if (y > stone_surface_max_y)
414-
stone_surface_max_y = y;
415-
} else if (y <= water_level) {
416-
vm->m_data[i] = n_water;
417-
} else {
418-
vm->m_data[i] = n_air;
416+
for (s16 z = node_min.Z; z <= node_max.Z; z++) {
417+
for (s16 y = node_min.Y - 1; y <= node_max.Y + 1; y++) {
418+
u32 vi = vm->m_area.index(node_min.X, y, z);
419+
for (s16 x = node_min.X; x <= node_max.X; x++, vi++, index2d++) {
420+
if (vm->m_data[vi].getContent() == CONTENT_IGNORE) {
421+
s16 seabed_height = noise_seabed->result[index2d];
422+
423+
if (y <= seabed_height || getFractalAtPoint(x, y, z)) {
424+
vm->m_data[vi] = n_stone;
425+
if (y > stone_surface_max_y)
426+
stone_surface_max_y = y;
427+
} else if (y <= water_level) {
428+
vm->m_data[vi] = n_water;
429+
} else {
430+
vm->m_data[vi] = n_air;
431+
}
419432
}
420433
}
434+
index2d -= ystride;
421435
}
436+
index2d += ystride;
422437
}
423438

424439
return stone_surface_max_y;
@@ -575,23 +590,32 @@ void MapgenFractal::dustTopNodes()
575590
void MapgenFractal::generateCaves(s16 max_stone_y)
576591
{
577592
if (max_stone_y >= node_min.Y) {
578-
u32 index = 0;
593+
u32 index = 0;
579594

580595
for (s16 z = node_min.Z; z <= node_max.Z; z++)
581596
for (s16 y = node_min.Y - 1; y <= node_max.Y + 1; y++) {
582-
u32 i = vm->m_area.index(node_min.X, y, z);
583-
for (s16 x = node_min.X; x <= node_max.X; x++, i++, index++) {
597+
u32 vi = vm->m_area.index(node_min.X, y, z);
598+
for (s16 x = node_min.X; x <= node_max.X; x++, vi++, index++) {
584599
float d1 = contour(noise_cave1->result[index]);
585600
float d2 = contour(noise_cave2->result[index]);
586601
if (d1 * d2 > 0.3) {
587-
content_t c = vm->m_data[i].getContent();
602+
content_t c = vm->m_data[vi].getContent();
588603
if (!ndef->get(c).is_ground_content || c == CONTENT_AIR)
589604
continue;
590605

591-
vm->m_data[i] = MapNode(CONTENT_AIR);
606+
vm->m_data[vi] = MapNode(CONTENT_AIR);
592607
}
593608
}
594609
}
595610
}
596-
}
597611

612+
if (node_max.Y > MGFRACTAL_LARGE_CAVE_DEPTH)
613+
return;
614+
615+
PseudoRandom ps(blockseed + 21343);
616+
u32 bruises_count = (ps.range(1, 4) == 1) ? ps.range(1, 2) : 0;
617+
for (u32 i = 0; i < bruises_count; i++) {
618+
CaveFractal cave(this, &ps);
619+
cave.makeCave(node_min, node_max, max_stone_y);
620+
}
621+
}

Diff for: ‎src/mapgen_fractal.h

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Minetest
3-
Copyright (C) 2010-2013 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
4-
Additional development and fractal code by paramat
3+
Copyright (C) 2010-2015 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
4+
Copyright (C) 2010-2015 paramat, Matt Gregory
55
66
This program is free software; you can redistribute it and/or modify
77
it under the terms of the GNU Lesser General Public License as published by
@@ -23,6 +23,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2323

2424
#include "mapgen.h"
2525

26+
#define MGFRACTAL_LARGE_CAVE_DEPTH -32
27+
2628
/////////////////// Mapgen Fractal flags
2729
#define MGFRACTAL_JULIA 0x01
2830

@@ -47,6 +49,7 @@ struct MapgenFractalParams : public MapgenSpecificParams {
4749
float julia_z;
4850
float julia_w;
4951

52+
NoiseParams np_seabed;
5053
NoiseParams np_cave1;
5154
NoiseParams np_cave2;
5255

@@ -84,6 +87,8 @@ class MapgenFractal : public Mapgen {
8487
float julia_z;
8588
float julia_w;
8689

90+
Noise *noise_seabed;
91+
8792
Noise *noise_cave1;
8893
Noise *noise_cave2;
8994

@@ -111,7 +116,7 @@ class MapgenFractal : public Mapgen {
111116
virtual void makeChunk(BlockMakeData *data);
112117
int getGroundLevelAtPoint(v2s16 p);
113118
void calculateNoise();
114-
bool getTerrainAtPoint(s16 x, s16 y, s16 z);
119+
bool getFractalAtPoint(s16 x, s16 y, s16 z);
115120
s16 generateTerrain();
116121
MgStoneType generateBiomes(float *heat_map, float *humidity_map);
117122
void dustTopNodes();

0 commit comments

Comments
 (0)
Please sign in to comment.