Skip to content

Commit c0dafa1

Browse files
paramatparamat
committedJul 1, 2015
Cavegen: Cleanup code. Define constant for MGV7_LAVA_DEPTH
·
5.11.00.4.13
1 parent d75009a commit c0dafa1

File tree

2 files changed

+61
-46
lines changed

2 files changed

+61
-46
lines changed
 

Diff for: ‎src/cavegen.cpp

+60-46
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ NoiseParams nparams_caveliquids(0, 1, v3f(150.0, 150.0, 150.0), 776, 3, 0.6, 2.0
3232

3333

3434
CaveV5::CaveV5(MapgenV5 *mg, PseudoRandom *ps) {
35-
this->mg = mg;
36-
this->vm = mg->vm;
37-
this->ndef = mg->ndef;
38-
this->water_level = mg->water_level;
39-
this->ps = ps;
35+
this->mg = mg;
36+
this->vm = mg->vm;
37+
this->ndef = mg->ndef;
38+
this->water_level = mg->water_level;
39+
this->ps = ps;
4040
this->c_water_source = mg->c_water_source;
4141
this->c_lava_source = mg->c_lava_source;
4242
this->c_ice = mg->c_ice;
@@ -45,8 +45,8 @@ CaveV5::CaveV5(MapgenV5 *mg, PseudoRandom *ps) {
4545
dswitchint = ps->range(1, 14);
4646
flooded = ps->range(1, 2) == 2;
4747

48-
part_max_length_rs = ps->range(2, 4);
49-
tunnel_routepoints = ps->range(5, ps->range(15, 30));
48+
part_max_length_rs = ps->range(2, 4);
49+
tunnel_routepoints = ps->range(5, ps->range(15, 30));
5050
min_tunnel_diameter = 5;
5151
max_tunnel_diameter = ps->range(7, ps->range(8, 24));
5252

@@ -157,7 +157,7 @@ void CaveV5::makeTunnel(bool dirswitch) {
157157

158158
p = orpi + of + rs / 2;
159159
if (p.Z >= node_min.Z && p.Z <= node_max.Z &&
160-
p.X >= node_min.X && p.X <= node_max.X) {
160+
p.X >= node_min.X && p.X <= node_max.X) {
161161
u32 index = (p.Z - node_min.Z) * mg->ystride + (p.X - node_min.X);
162162
s16 h = mg->heightmap[index];
163163
if (h < p.Y)
@@ -215,7 +215,7 @@ void CaveV5::carveRoute(v3f vec, float f, bool randomize_xz, bool is_ravine) {
215215
startp += of;
216216

217217
float nval = NoisePerlin3D(np_caveliquids, startp.X,
218-
startp.Y, startp.Z, mg->seed);
218+
startp.Y, startp.Z, mg->seed);
219219
MapNode liquidnode = nval < 0.40 ? lavanode : waternode;
220220

221221
v3f fp = orp + vec * f;
@@ -238,7 +238,7 @@ void CaveV5::carveRoute(v3f vec, float f, bool randomize_xz, bool is_ravine) {
238238
s16 maxabsxz = MYMAX(abs(x0), abs(z0));
239239

240240
s16 si2 = is_ravine ? MYMIN(ps->range(25, 26), ar.Y) :
241-
rs / 2 - MYMAX(0, maxabsxz - rs / 7 - 1);
241+
rs / 2 - MYMAX(0, maxabsxz - rs / 7 - 1);
242242

243243
for (s16 y0 = -si2; y0 <= si2; y0++) {
244244
if (large_cave_is_flat) {
@@ -251,9 +251,10 @@ void CaveV5::carveRoute(v3f vec, float f, bool randomize_xz, bool is_ravine) {
251251
p += of;
252252

253253
if (!is_ravine && mg->heightmap && should_make_cave_hole &&
254-
p.X <= node_max.X && p.Z <= node_max.Z) {
254+
p.X <= node_max.X && p.Z <= node_max.Z) {
255255
int maplen = node_max.X - node_min.X + 1;
256-
int idx = (p.Z - node_min.Z) * maplen + (p.X - node_min.X);
256+
int idx = (p.Z - node_min.Z) * maplen +
257+
(p.X - node_min.X);
257258
if (p.Y >= mg->heightmap[idx] - 2)
258259
continue;
259260
}
@@ -269,10 +270,13 @@ void CaveV5::carveRoute(v3f vec, float f, bool randomize_xz, bool is_ravine) {
269270
int full_ymin = node_min.Y - MAP_BLOCKSIZE;
270271
int full_ymax = node_max.Y + MAP_BLOCKSIZE;
271272

272-
if (flooded && full_ymin < water_level && full_ymax > water_level)
273-
vm->m_data[i] = (p.Y <= water_level) ? waternode : airnode;
273+
if (flooded && full_ymin < water_level &&
274+
full_ymax > water_level)
275+
vm->m_data[i] = (p.Y <= water_level) ?
276+
waternode : airnode;
274277
else if (flooded && full_ymax < water_level)
275-
vm->m_data[i] = (p.Y < startp.Y - 4) ? liquidnode : airnode;
278+
vm->m_data[i] = (p.Y < startp.Y - 4) ?
279+
liquidnode : airnode;
276280
else
277281
vm->m_data[i] = airnode;
278282
}
@@ -285,24 +289,24 @@ void CaveV5::carveRoute(v3f vec, float f, bool randomize_xz, bool is_ravine) {
285289

286290

287291
CaveV6::CaveV6(MapgenV6 *mg, PseudoRandom *ps, PseudoRandom *ps2, bool is_large_cave) {
288-
this->mg = mg;
289-
this->vm = mg->vm;
290-
this->ndef = mg->ndef;
291-
this->water_level = mg->water_level;
292-
this->large_cave = is_large_cave;
293-
this->ps = ps;
294-
this->ps2 = ps2;
292+
this->mg = mg;
293+
this->vm = mg->vm;
294+
this->ndef = mg->ndef;
295+
this->water_level = mg->water_level;
296+
this->large_cave = is_large_cave;
297+
this->ps = ps;
298+
this->ps2 = ps2;
295299
this->c_water_source = mg->c_water_source;
296300
this->c_lava_source = mg->c_lava_source;
297301

298302
min_tunnel_diameter = 2;
299303
max_tunnel_diameter = ps->range(2, 6);
300-
dswitchint = ps->range(1, 14);
301-
flooded = true;
304+
dswitchint = ps->range(1, 14);
305+
flooded = true;
302306

303307
if (large_cave) {
304-
part_max_length_rs = ps->range(2,4);
305-
tunnel_routepoints = ps->range(5, ps->range(15,30));
308+
part_max_length_rs = ps->range(2,4);
309+
tunnel_routepoints = ps->range(5, ps->range(15,30));
306310
min_tunnel_diameter = 5;
307311
max_tunnel_diameter = ps->range(7, ps->range(8,24));
308312
} else {
@@ -438,7 +442,8 @@ void CaveV6::makeTunnel(bool dirswitch) {
438442
v3s16 p1 = orpi + veci + of + rs / 2;
439443
if (p1.Z >= node_min.Z && p1.Z <= node_max.Z &&
440444
p1.X >= node_min.X && p1.X <= node_max.X) {
441-
u32 index1 = (p1.Z - node_min.Z) * mg->ystride + (p1.X - node_min.X);
445+
u32 index1 = (p1.Z - node_min.Z) * mg->ystride +
446+
(p1.X - node_min.X);
442447
h1 = mg->heightmap[index1];
443448
} else {
444449
h1 = water_level; // If not in heightmap
@@ -447,7 +452,8 @@ void CaveV6::makeTunnel(bool dirswitch) {
447452
v3s16 p2 = orpi + of + rs / 2;
448453
if (p2.Z >= node_min.Z && p2.Z <= node_max.Z &&
449454
p2.X >= node_min.X && p2.X <= node_max.X) {
450-
u32 index2 = (p2.Z - node_min.Z) * mg->ystride + (p2.X - node_min.X);
455+
u32 index2 = (p2.Z - node_min.Z) * mg->ystride +
456+
(p2.X - node_min.X);
451457
h2 = mg->heightmap[index2];
452458
} else {
453459
h2 = water_level;
@@ -540,10 +546,13 @@ void CaveV6::carveRoute(v3f vec, float f, bool randomize_xz) {
540546
int full_ymin = node_min.Y - MAP_BLOCKSIZE;
541547
int full_ymax = node_max.Y + MAP_BLOCKSIZE;
542548

543-
if (flooded && full_ymin < water_level && full_ymax > water_level) {
544-
vm->m_data[i] = (p.Y <= water_level) ? waternode : airnode;
549+
if (flooded && full_ymin < water_level &&
550+
full_ymax > water_level) {
551+
vm->m_data[i] = (p.Y <= water_level) ?
552+
waternode : airnode;
545553
} else if (flooded && full_ymax < water_level) {
546-
vm->m_data[i] = (p.Y < startp.Y - 2) ? lavanode : airnode;
554+
vm->m_data[i] = (p.Y < startp.Y - 2) ?
555+
lavanode : airnode;
547556
} else {
548557
vm->m_data[i] = airnode;
549558
}
@@ -564,11 +573,11 @@ void CaveV6::carveRoute(v3f vec, float f, bool randomize_xz) {
564573

565574

566575
CaveV7::CaveV7(MapgenV7 *mg, PseudoRandom *ps) {
567-
this->mg = mg;
568-
this->vm = mg->vm;
569-
this->ndef = mg->ndef;
570-
this->water_level = mg->water_level;
571-
this->ps = ps;
576+
this->mg = mg;
577+
this->vm = mg->vm;
578+
this->ndef = mg->ndef;
579+
this->water_level = mg->water_level;
580+
this->ps = ps;
572581
this->c_water_source = mg->c_water_source;
573582
this->c_lava_source = mg->c_lava_source;
574583
this->c_ice = mg->c_ice;
@@ -577,8 +586,8 @@ CaveV7::CaveV7(MapgenV7 *mg, PseudoRandom *ps) {
577586
dswitchint = ps->range(1, 14);
578587
flooded = ps->range(1, 2) == 2;
579588

580-
part_max_length_rs = ps->range(2, 4);
581-
tunnel_routepoints = ps->range(5, ps->range(15, 30));
589+
part_max_length_rs = ps->range(2, 4);
590+
tunnel_routepoints = ps->range(5, ps->range(15, 30));
582591
min_tunnel_diameter = 5;
583592
max_tunnel_diameter = ps->range(7, ps->range(8, 24));
584593

@@ -748,8 +757,9 @@ void CaveV7::carveRoute(v3f vec, float f, bool randomize_xz, bool is_ravine) {
748757
startp += of;
749758

750759
float nval = NoisePerlin3D(np_caveliquids, startp.X,
751-
startp.Y, startp.Z, mg->seed);
752-
MapNode liquidnode = (nval < 0.40 && node_max.Y < -256) ? lavanode : waternode;
760+
startp.Y, startp.Z, mg->seed);
761+
MapNode liquidnode = (nval < 0.40 && node_max.Y < MGV7_LAVA_DEPTH) ?
762+
lavanode : waternode;
753763

754764
v3f fp = orp + vec * f;
755765
fp.X += 0.1 * ps->range(-10, 10);
@@ -771,7 +781,7 @@ void CaveV7::carveRoute(v3f vec, float f, bool randomize_xz, bool is_ravine) {
771781
s16 maxabsxz = MYMAX(abs(x0), abs(z0));
772782

773783
s16 si2 = is_ravine ? MYMIN(ps->range(25, 26), ar.Y) :
774-
rs / 2 - MYMAX(0, maxabsxz - rs / 7 - 1);
784+
rs / 2 - MYMAX(0, maxabsxz - rs / 7 - 1);
775785

776786
for (s16 y0 = -si2; y0 <= si2; y0++) {
777787
if (large_cave_is_flat) {
@@ -784,9 +794,10 @@ void CaveV7::carveRoute(v3f vec, float f, bool randomize_xz, bool is_ravine) {
784794
p += of;
785795

786796
if (!is_ravine && mg->heightmap && should_make_cave_hole &&
787-
p.X <= node_max.X && p.Z <= node_max.Z) {
797+
p.X <= node_max.X && p.Z <= node_max.Z) {
788798
int maplen = node_max.X - node_min.X + 1;
789-
int idx = (p.Z - node_min.Z) * maplen + (p.X - node_min.X);
799+
int idx = (p.Z - node_min.Z) * maplen +
800+
(p.X - node_min.X);
790801
if (p.Y >= mg->heightmap[idx] - 2)
791802
continue;
792803
}
@@ -802,10 +813,13 @@ void CaveV7::carveRoute(v3f vec, float f, bool randomize_xz, bool is_ravine) {
802813
int full_ymin = node_min.Y - MAP_BLOCKSIZE;
803814
int full_ymax = node_max.Y + MAP_BLOCKSIZE;
804815

805-
if (flooded && full_ymin < water_level && full_ymax > water_level)
806-
vm->m_data[i] = (p.Y <= water_level) ? waternode : airnode;
816+
if (flooded && full_ymin < water_level &&
817+
full_ymax > water_level)
818+
vm->m_data[i] = (p.Y <= water_level) ?
819+
waternode : airnode;
807820
else if (flooded && full_ymax < water_level)
808-
vm->m_data[i] = (p.Y < startp.Y - 4) ? liquidnode : airnode;
821+
vm->m_data[i] = (p.Y < startp.Y - 4) ?
822+
liquidnode : airnode;
809823
else
810824
vm->m_data[i] = airnode;
811825
}

Diff for: ‎src/cavegen.h

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2121
#define CAVEGEN_HEADER
2222

2323
#define VMANIP_FLAG_CAVE VOXELFLAG_CHECKED1
24+
#define MGV7_LAVA_DEPTH -256
2425

2526
class MapgenV5;
2627
class MapgenV6;

0 commit comments

Comments
 (0)
Please sign in to comment.