Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Biome API: Enable biome generation to lower world limit
Decorations: Remove lower limit of water level for placement
  • Loading branch information
paramat committed Jun 15, 2015
1 parent bb5f830 commit 38482d2
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 20 deletions.
11 changes: 3 additions & 8 deletions src/mapgen_v5.cpp
Expand Up @@ -327,11 +327,9 @@ void MapgenV5::calculateNoise()
noise_cave2->perlinMap3D(x, y, z);
}

if (node_max.Y >= BIOMEGEN_BASE_V5) {
noise_filler_depth->perlinMap2D(x, z);
noise_heat->perlinMap2D(x, z);
noise_humidity->perlinMap2D(x, z);
}
noise_filler_depth->perlinMap2D(x, z);
noise_heat->perlinMap2D(x, z);
noise_humidity->perlinMap2D(x, z);

//printf("calculateNoise: %dus\n", t.stop());
}
Expand Down Expand Up @@ -396,9 +394,6 @@ int MapgenV5::generateBaseTerrain()

MgStoneType MapgenV5::generateBiomes(float *heat_map, float *humidity_map)
{
if (node_max.Y < BIOMEGEN_BASE_V5)
return STONE;

v3s16 em = vm->m_area.getExtent();
u32 index = 0;
MgStoneType stone_type = STONE;
Expand Down
1 change: 0 additions & 1 deletion src/mapgen_v5.h
Expand Up @@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "mapgen.h"

#define LARGE_CAVE_DEPTH -256
#define BIOMEGEN_BASE_V5 -192

/////////////////// Mapgen V5 flags
//#define MGV5_ 0x01
Expand Down
11 changes: 3 additions & 8 deletions src/mapgen_v7.cpp
Expand Up @@ -362,11 +362,9 @@ void MapgenV7::calculateNoise()
noise_mount_height->perlinMap2D(x, z);
}

if (node_max.Y >= BIOMEGEN_BASE_V7) {
noise_filler_depth->perlinMap2D(x, z);
noise_heat->perlinMap2D(x, z);
noise_humidity->perlinMap2D(x, z);
}
noise_filler_depth->perlinMap2D(x, z);
noise_heat->perlinMap2D(x, z);
noise_humidity->perlinMap2D(x, z);
//printf("calculateNoise: %dus\n", t.stop());
}

Expand Down Expand Up @@ -591,9 +589,6 @@ void MapgenV7::generateRidgeTerrain()

MgStoneType MapgenV7::generateBiomes(float *heat_map, float *humidity_map)
{
if (node_max.Y < BIOMEGEN_BASE_V7)
return STONE;

v3s16 em = vm->m_area.getExtent();
u32 index = 0;
MgStoneType stone_type = STONE;
Expand Down
2 changes: 0 additions & 2 deletions src/mapgen_v7.h
Expand Up @@ -22,8 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,

#include "mapgen.h"

#define BIOMEGEN_BASE_V7 -192

/////////////////// Mapgen V7 flags
#define MGV7_MOUNTAINS 0x01
#define MGV7_RIDGES 0x02
Expand Down
1 change: 0 additions & 1 deletion src/mg_decoration.cpp
Expand Up @@ -129,7 +129,6 @@ size_t Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax)
s16 y = mg->heightmap ?
mg->heightmap[mapindex] :
mg->findGroundLevel(v2s16(x, z), nmin.Y, nmax.Y);
y = MYMAX(y, mg->water_level);

if (y < nmin.Y || y > nmax.Y ||
y < y_min || y > y_max)
Expand Down

0 comments on commit 38482d2

Please sign in to comment.