Skip to content

Commit ba15c98

Browse files
paramatparamat
committedJul 7, 2015
Mgv7: Auto-set lowest mountain generation level
Lowest level of base terrain determines mountain generation in mapchunk Change some positional function arguments from int to s16
·
5.11.00.4.13
1 parent d92d376 commit ba15c98

File tree

2 files changed

+31
-28
lines changed

2 files changed

+31
-28
lines changed
 

‎src/mapgen_v7.cpp

+25-20
Original file line numberDiff line numberDiff line change
@@ -363,10 +363,7 @@ void MapgenV7::calculateNoise()
363363
noise_ridge_uwater->perlinMap2D(x, z);
364364
}
365365

366-
if ((spflags & MGV7_MOUNTAINS) && node_max.Y >= MOUNTAIN_BASE) {
367-
noise_mountain->perlinMap3D(x, y, z);
368-
noise_mount_height->perlinMap2D(x, z);
369-
}
366+
// Mountain noises are calculated in generateMountainTerrain()
370367

371368
noise_filler_depth->perlinMap2D(x, z);
372369
noise_heat->perlinMap2D(x, z);
@@ -397,7 +394,7 @@ Biome *MapgenV7::getBiomeAtPoint(v3s16 p)
397394
}
398395

399396
//needs to be updated
400-
float MapgenV7::baseTerrainLevelAtPoint(int x, int z)
397+
float MapgenV7::baseTerrainLevelAtPoint(s16 x, s16 z)
401398
{
402399
float hselect = NoisePerlin2D(&noise_height_select->np, x, z, seed);
403400
hselect = rangelim(hselect, 0.0, 1.0);
@@ -430,15 +427,15 @@ float MapgenV7::baseTerrainLevelFromMap(int index)
430427
}
431428

432429

433-
bool MapgenV7::getMountainTerrainAtPoint(int x, int y, int z)
430+
bool MapgenV7::getMountainTerrainAtPoint(s16 x, s16 y, s16 z)
434431
{
435432
float mnt_h_n = NoisePerlin2D(&noise_mount_height->np, x, z, seed);
436433
float mnt_n = NoisePerlin3D(&noise_mountain->np, x, y, z, seed);
437434
return mnt_n * mnt_h_n >= (float)y;
438435
}
439436

440437

441-
bool MapgenV7::getMountainTerrainFromMap(int idx_xyz, int idx_xz, int y)
438+
bool MapgenV7::getMountainTerrainFromMap(int idx_xyz, int idx_xz, s16 y)
442439
{
443440
float mounthn = noise_mount_height->result[idx_xz];
444441
float mountn = noise_mountain->result[idx_xyz];
@@ -483,26 +480,30 @@ void MapgenV7::carveRivers() {
483480

484481
int MapgenV7::generateTerrain()
485482
{
486-
int ymax = generateBaseTerrain();
483+
s16 stone_surface_min_y;
484+
s16 stone_surface_max_y;
485+
486+
generateBaseTerrain(&stone_surface_min_y, &stone_surface_max_y);
487487

488-
if (spflags & MGV7_MOUNTAINS)
489-
ymax = generateMountainTerrain(ymax);
488+
if ((spflags & MGV7_MOUNTAINS) && stone_surface_min_y < node_max.Y)
489+
stone_surface_max_y = generateMountainTerrain(stone_surface_max_y);
490490

491491
if (spflags & MGV7_RIDGES)
492492
generateRidgeTerrain();
493493

494-
return ymax;
494+
return stone_surface_max_y;
495495
}
496496

497497

498-
int MapgenV7::generateBaseTerrain()
498+
void MapgenV7::generateBaseTerrain(s16 *stone_surface_min_y, s16 *stone_surface_max_y)
499499
{
500500
MapNode n_air(CONTENT_AIR);
501501
MapNode n_stone(c_stone);
502502
MapNode n_water(c_water_source);
503503

504-
int stone_surface_max_y = -MAP_GENERATION_LIMIT;
505504
v3s16 em = vm->m_area.getExtent();
505+
s16 surface_min_y = MAP_GENERATION_LIMIT;
506+
s16 surface_max_y = -MAP_GENERATION_LIMIT;
506507
u32 index = 0;
507508

508509
for (s16 z = node_min.Z; z <= node_max.Z; z++)
@@ -513,8 +514,11 @@ int MapgenV7::generateBaseTerrain()
513514
heightmap[index] = surface_y;
514515
ridge_heightmap[index] = surface_y;
515516

516-
if (surface_y > stone_surface_max_y)
517-
stone_surface_max_y = surface_y;
517+
if (surface_y < surface_min_y)
518+
surface_min_y = surface_y;
519+
520+
if (surface_y > surface_max_y)
521+
surface_max_y = surface_y;
518522

519523
u32 i = vm->m_area.index(x, node_min.Y - 1, z);
520524
for (s16 y = node_min.Y - 1; y <= node_max.Y + 1; y++) {
@@ -530,14 +534,15 @@ int MapgenV7::generateBaseTerrain()
530534
}
531535
}
532536

533-
return stone_surface_max_y;
537+
*stone_surface_min_y = surface_min_y;
538+
*stone_surface_max_y = surface_max_y;
534539
}
535540

536541

537-
int MapgenV7::generateMountainTerrain(int ymax)
542+
int MapgenV7::generateMountainTerrain(s16 ymax)
538543
{
539-
if (node_max.Y < MOUNTAIN_BASE)
540-
return ymax;
544+
noise_mountain->perlinMap3D(node_min.X, node_min.Y - 1, node_min.Z);
545+
noise_mount_height->perlinMap2D(node_min.X, node_min.Z);
541546

542547
MapNode n_stone(c_stone);
543548
u32 j = 0;
@@ -848,7 +853,7 @@ void MapgenV7::addTopNodes()
848853
#endif
849854

850855

851-
void MapgenV7::generateCaves(int max_stone_y)
856+
void MapgenV7::generateCaves(s16 max_stone_y)
852857
{
853858
if (max_stone_y >= node_min.Y) {
854859
u32 index = 0;

‎src/mapgen_v7.h

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

2323
#include "mapgen.h"
2424

25-
#define MOUNTAIN_BASE -112
26-
2725
/////////////////// Mapgen V7 flags
2826
#define MGV7_MOUNTAINS 0x01
2927
#define MGV7_RIDGES 0x02
@@ -107,24 +105,24 @@ class MapgenV7 : public Mapgen {
107105
int getGroundLevelAtPoint(v2s16 p);
108106
Biome *getBiomeAtPoint(v3s16 p);
109107

110-
float baseTerrainLevelAtPoint(int x, int z);
108+
float baseTerrainLevelAtPoint(s16 x, s16 z);
111109
float baseTerrainLevelFromMap(int index);
112-
bool getMountainTerrainAtPoint(int x, int y, int z);
113-
bool getMountainTerrainFromMap(int idx_xyz, int idx_xz, int y);
110+
bool getMountainTerrainAtPoint(s16 x, s16 y, s16 z);
111+
bool getMountainTerrainFromMap(int idx_xyz, int idx_xz, s16 y);
114112

115113
void calculateNoise();
116114

117115
virtual int generateTerrain();
118-
int generateBaseTerrain();
119-
int generateMountainTerrain(int ymax);
116+
void generateBaseTerrain(s16 *stone_surface_min_y, s16 *stone_surface_max_y);
117+
int generateMountainTerrain(s16 ymax);
120118
void generateRidgeTerrain();
121119

122120
MgStoneType generateBiomes(float *heat_map, float *humidity_map);
123121
void dustTopNodes();
124122

125123
//void addTopNodes();
126124

127-
void generateCaves(int max_stone_y);
125+
void generateCaves(s16 max_stone_y);
128126
};
129127

130128
struct MapgenFactoryV7 : public MapgenFactory {

0 commit comments

Comments
 (0)
Please sign in to comment.