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

MgV5/6/7: Generate dungeons above water level

Browse Source 
Use/add stone_surface_max_y to speed-optimise/guide dungeon generation
MgV7: Don't let mountain terrain chop dungeons at mapchunk borders
Make mountain terrain update stone_surface_max_y for caves in mountains
This commit is contained in:
paramat 2014-12-31 00:19:05 +00:00 committed by kwolekr
parent 938a3f2976
commit 7452d5399b
6 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/dungeongen.cpp
View File

@ -70,10 +70,7 @@ DungeonGen::DungeonGen(Mapgen *mapgen, DungeonParams *dparams) {
void DungeonGen::generate(u32 bseed, v3s16 nmin, v3s16 nmax) { void DungeonGen::generate(u32 bseed, v3s16 nmin, v3s16 nmax) {
//TimeTaker t("gen dungeons"); //TimeTaker t("gen dungeons");
int approx_groundlevel = 10 + mg->water_level; if (NoisePerlin3D(&dp.np_rarity, nmin.X, nmin.Y, nmin.Z, mg->seed) < 0.2)
if ((nmin.Y + nmax.Y) / 2 >= approx_groundlevel ||
NoisePerlin3D(&dp.np_rarity, nmin.X, nmin.Y, nmin.Z, mg->seed) < 0.2)
return; return;
this->blockseed = bseed; this->blockseed = bseed;

12
src/mapgen_v5.cpp
View File

@ -252,7 +252,8 @@ void MapgenV5::makeChunk(BlockMakeData *data)
calculateNoise(); calculateNoise();
// Generate base terrain // Generate base terrain
generateBaseTerrain(); s16 stone_surface_max_y = generateBaseTerrain();
updateHeightmap(node_min, node_max); updateHeightmap(node_min, node_max);
// Generate underground dirt, sand, gravel and lava blobs // Generate underground dirt, sand, gravel and lava blobs
@ -268,7 +269,7 @@ void MapgenV5::makeChunk(BlockMakeData *data)
generateBiomes(); generateBiomes();
// Generate dungeons and desert temples // Generate dungeons and desert temples
if (flags & MG_DUNGEONS) { if ((flags & MG_DUNGEONS) && (stone_surface_max_y >= node_min.Y)) {
DungeonGen dgen(this, NULL); DungeonGen dgen(this, NULL);
dgen.generate(blockseed, full_node_min, full_node_max); dgen.generate(blockseed, full_node_min, full_node_max);
} }
@ -342,10 +343,11 @@ void MapgenV5::calculateNoise()
// Make base ground level // Make base ground level
void MapgenV5::generateBaseTerrain() int MapgenV5::generateBaseTerrain()
{ {
u32 index = 0; u32 index = 0;
u32 index2d = 0; u32 index2d = 0;
int stone_surface_max_y = -MAP_GENERATION_LIMIT;
for(s16 z=node_min.Z; z<=node_max.Z; z++) { for(s16 z=node_min.Z; z<=node_max.Z; z++) {
for(s16 y=node_min.Y - 1; y<=node_max.Y + 1; y++) { for(s16 y=node_min.Y - 1; y<=node_max.Y + 1; y++) {
@ -372,12 +374,16 @@ void MapgenV5::generateBaseTerrain()
vm->m_data[i] = MapNode(CONTENT_AIR); vm->m_data[i] = MapNode(CONTENT_AIR);
} else { } else {
vm->m_data[i] = MapNode(c_stone); vm->m_data[i] = MapNode(c_stone);
if (y > stone_surface_max_y)
stone_surface_max_y = y;
} }
} }
index2d = index2d - ystride; index2d = index2d - ystride;
} }
index2d = index2d + ystride; index2d = index2d + ystride;
} }
return stone_surface_max_y;
} }

2
src/mapgen_v5.h
View File

@ -94,7 +94,7 @@ public:
virtual void makeChunk(BlockMakeData *data); virtual void makeChunk(BlockMakeData *data);
int getGroundLevelAtPoint(v2s16 p); int getGroundLevelAtPoint(v2s16 p);
void calculateNoise(); void calculateNoise();
void generateBaseTerrain(); int generateBaseTerrain();
void generateBlobs(); void generateBlobs();
void generateBiomes(); void generateBiomes();
void dustTopNodes(); void dustTopNodes();

2
src/mapgen_v6.cpp
View File

@ -500,7 +500,7 @@ void MapgenV6::makeChunk(BlockMakeData *data)
} }
// Add dungeons // Add dungeons
if (flags & MG_DUNGEONS) { if ((flags & MG_DUNGEONS) && (stone_surface_max_y >= node_min.Y)) {
DungeonParams dp; DungeonParams dp;
dp.np_rarity = nparams_dungeon_rarity; dp.np_rarity = nparams_dungeon_rarity;

17
src/mapgen_v7.cpp
View File

@ -241,7 +241,7 @@ void MapgenV7::makeChunk(BlockMakeData *data)
if (flags & MG_CAVES) if (flags & MG_CAVES)
generateCaves(stone_surface_max_y); generateCaves(stone_surface_max_y);
if (flags & MG_DUNGEONS) { if ((flags & MG_DUNGEONS) && (stone_surface_max_y >= node_min.Y)) {
DungeonGen dgen(this, NULL); DungeonGen dgen(this, NULL);
dgen.generate(blockseed, full_node_min, full_node_max); dgen.generate(blockseed, full_node_min, full_node_max);
} }
@ -405,7 +405,7 @@ int MapgenV7::generateTerrain()
int ymax = generateBaseTerrain(); int ymax = generateBaseTerrain();
if (spflags & MGV7_MOUNTAINS) if (spflags & MGV7_MOUNTAINS)
generateMountainTerrain(); ymax = generateMountainTerrain(ymax);
if (spflags & MGV7_RIDGES) if (spflags & MGV7_RIDGES)
generateRidgeTerrain(); generateRidgeTerrain();
@ -453,10 +453,10 @@ int MapgenV7::generateBaseTerrain()
} }
void MapgenV7::generateMountainTerrain() int MapgenV7::generateMountainTerrain(int ymax)
{ {
if (node_max.Y <= water_level) if (node_max.Y <= water_level)
return; return ymax;
MapNode n_stone(c_stone); MapNode n_stone(c_stone);
u32 j = 0; u32 j = 0;
@ -466,14 +466,21 @@ void MapgenV7::generateMountainTerrain()
u32 vi = vm->m_area.index(node_min.X, y, z); u32 vi = vm->m_area.index(node_min.X, y, z);
for (s16 x = node_min.X; x <= node_max.X; x++) { for (s16 x = node_min.X; x <= node_max.X; x++) {
int index = (z - node_min.Z) * csize.X + (x - node_min.X); int index = (z - node_min.Z) * csize.X + (x - node_min.X);
content_t c = vm->m_data[vi].getContent();
if (getMountainTerrainFromMap(j, index, y)) if (getMountainTerrainFromMap(j, index, y)
&& (c == CONTENT_AIR || c == c_water_source)) {
vm->m_data[vi] = n_stone; vm->m_data[vi] = n_stone;
if (y > ymax)
ymax = y;
}
vi++; vi++;
j++; j++;
} }
} }
return ymax;
} }

2
src/mapgen_v7.h
View File

@ -107,7 +107,7 @@ public:
virtual int generateTerrain(); virtual int generateTerrain();
int generateBaseTerrain(); int generateBaseTerrain();
void generateMountainTerrain(); int generateMountainTerrain(int ymax);
void generateRidgeTerrain(); void generateRidgeTerrain();
void generateBiomes(); void generateBiomes();