/*
Minetest
-Copyright (C) 2014-2016 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
-Copyright (C) 2014-2017 paramat
+Copyright (C) 2014-2018 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+Copyright (C) 2014-2018 paramat
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
// Create default biome to be used in case none exist
Biome *b = new Biome;
- b->name = "Default";
+ b->name = "default";
b->flags = 0;
b->depth_top = 0;
b->depth_filler = -MAX_MAP_GENERATION_LIMIT;
b->depth_water_top = 0;
b->depth_riverbed = 0;
- b->y_min = -MAX_MAP_GENERATION_LIMIT;
- b->y_max = MAX_MAP_GENERATION_LIMIT;
+ b->min_pos = v3s16(-MAX_MAP_GENERATION_LIMIT,
+ -MAX_MAP_GENERATION_LIMIT, -MAX_MAP_GENERATION_LIMIT);
+ b->max_pos = v3s16(MAX_MAP_GENERATION_LIMIT,
+ MAX_MAP_GENERATION_LIMIT, MAX_MAP_GENERATION_LIMIT);
b->heat_point = 0.0;
b->humidity_point = 0.0;
+ b->vertical_blend = 0;
b->m_nodenames.emplace_back("mapgen_stone");
b->m_nodenames.emplace_back("mapgen_stone");
b->m_nodenames.emplace_back("mapgen_river_water_source");
b->m_nodenames.emplace_back("mapgen_stone");
b->m_nodenames.emplace_back("ignore");
+ b->m_nodenames.emplace_back("ignore");
+ b->m_nodenames.emplace_back("ignore");
+ b->m_nodenames.emplace_back("ignore");
+ b->m_nodenames.emplace_back("ignore");
m_ndef->pendNodeResolve(b);
add(b);
m_objects.resize(1);
}
-////////////////////////////////////////////////////////////////////////////////
+// For BiomeGen type 'BiomeGenOriginal'
+float BiomeManager::getHeatAtPosOriginal(v3s16 pos, NoiseParams &np_heat,
+ NoiseParams &np_heat_blend, u64 seed)
+{
+ return
+ NoisePerlin2D(&np_heat, pos.X, pos.Z, seed) +
+ NoisePerlin2D(&np_heat_blend, pos.X, pos.Z, seed);
+}
+
+
+// For BiomeGen type 'BiomeGenOriginal'
+float BiomeManager::getHumidityAtPosOriginal(v3s16 pos, NoiseParams &np_humidity,
+ NoiseParams &np_humidity_blend, u64 seed)
+{
+ return
+ NoisePerlin2D(&np_humidity, pos.X, pos.Z, seed) +
+ NoisePerlin2D(&np_humidity_blend, pos.X, pos.Z, seed);
+}
+
+
+// For BiomeGen type 'BiomeGenOriginal'
+Biome *BiomeManager::getBiomeFromNoiseOriginal(float heat, float humidity, v3s16 pos)
+{
+ Biome *biome_closest = nullptr;
+ Biome *biome_closest_blend = nullptr;
+ float dist_min = FLT_MAX;
+ float dist_min_blend = FLT_MAX;
+
+ for (size_t i = 1; i < getNumObjects(); i++) {
+ Biome *b = (Biome *)getRaw(i);
+ if (!b ||
+ pos.Y < b->min_pos.Y || pos.Y > b->max_pos.Y + b->vertical_blend ||
+ pos.X < b->min_pos.X || pos.X > b->max_pos.X ||
+ pos.Z < b->min_pos.Z || pos.Z > b->max_pos.Z)
+ continue;
+
+ float d_heat = heat - b->heat_point;
+ float d_humidity = humidity - b->humidity_point;
+ float dist = (d_heat * d_heat) + (d_humidity * d_humidity);
+
+ if (pos.Y <= b->max_pos.Y) { // Within y limits of biome b
+ if (dist < dist_min) {
+ dist_min = dist;
+ biome_closest = b;
+ }
+ } else if (dist < dist_min_blend) { // Blend area above biome b
+ dist_min_blend = dist;
+ biome_closest_blend = b;
+ }
+ }
+
+ mysrand(pos.Y + (heat + humidity) * 0.9f);
+ if (biome_closest_blend && dist_min_blend <= dist_min &&
+ myrand_range(0, biome_closest_blend->vertical_blend) >=
+ pos.Y - biome_closest_blend->max_pos.Y)
+ return biome_closest_blend;
+
+ return (biome_closest) ? biome_closest : (Biome *)getRaw(BIOME_NONE);
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
void BiomeParamsOriginal::readParams(const Settings *settings)
{
heatmap = noise_heat->result;
humidmap = noise_humidity->result;
+
biomemap = new biome_t[m_csize.X * m_csize.Z];
+ // Initialise with the ID of 'BIOME_NONE' so that cavegen can get the
+ // fallback biome when biome generation (which calculates the biomemap IDs)
+ // is disabled.
+ memset(biomemap, 0, sizeof(biome_t) * m_csize.X * m_csize.Z);
}
BiomeGenOriginal::~BiomeGenOriginal()
delete noise_humidity_blend;
}
-
+// Only usable in a mapgen thread
Biome *BiomeGenOriginal::calcBiomeAtPoint(v3s16 pos) const
{
float heat =
NoisePerlin2D(&m_params->np_humidity, pos.X, pos.Z, m_params->seed) +
NoisePerlin2D(&m_params->np_humidity_blend, pos.X, pos.Z, m_params->seed);
- return calcBiomeFromNoise(heat, humidity, pos.Y);
+ return calcBiomeFromNoise(heat, humidity, pos);
}
}
-biome_t *BiomeGenOriginal::getBiomes(s16 *heightmap)
+biome_t *BiomeGenOriginal::getBiomes(s16 *heightmap, v3s16 pmin)
{
- for (s32 i = 0; i != m_csize.X * m_csize.Z; i++) {
+ for (s16 zr = 0; zr < m_csize.Z; zr++)
+ for (s16 xr = 0; xr < m_csize.X; xr++) {
+ s32 i = zr * m_csize.X + xr;
Biome *biome = calcBiomeFromNoise(
noise_heat->result[i],
noise_humidity->result[i],
- heightmap[i]);
+ v3s16(pmin.X + xr, heightmap[i], pmin.Z + zr));
biomemap[i] = biome->index;
}
{
return getBiomeAtIndex(
(pos.Z - m_pmin.Z) * m_csize.X + (pos.X - m_pmin.X),
- pos.Y);
+ pos);
}
-Biome *BiomeGenOriginal::getBiomeAtIndex(size_t index, s16 y) const
+Biome *BiomeGenOriginal::getBiomeAtIndex(size_t index, v3s16 pos) const
{
return calcBiomeFromNoise(
noise_heat->result[index],
noise_humidity->result[index],
- y);
+ pos);
}
-Biome *BiomeGenOriginal::calcBiomeFromNoise(float heat, float humidity, s16 y) const
+Biome *BiomeGenOriginal::calcBiomeFromNoise(float heat, float humidity, v3s16 pos) const
{
- Biome *b, *biome_closest = NULL;
+ Biome *biome_closest = nullptr;
+ Biome *biome_closest_blend = nullptr;
float dist_min = FLT_MAX;
+ float dist_min_blend = FLT_MAX;
for (size_t i = 1; i < m_bmgr->getNumObjects(); i++) {
- b = (Biome *)m_bmgr->getRaw(i);
- if (!b || y > b->y_max || y < b->y_min)
+ Biome *b = (Biome *)m_bmgr->getRaw(i);
+ if (!b ||
+ pos.Y < b->min_pos.Y || pos.Y > b->max_pos.Y + b->vertical_blend ||
+ pos.X < b->min_pos.X || pos.X > b->max_pos.X ||
+ pos.Z < b->min_pos.Z || pos.Z > b->max_pos.Z)
continue;
- float d_heat = heat - b->heat_point;
+ float d_heat = heat - b->heat_point;
float d_humidity = humidity - b->humidity_point;
- float dist = (d_heat * d_heat) +
- (d_humidity * d_humidity);
- if (dist < dist_min) {
- dist_min = dist;
- biome_closest = b;
+ float dist = (d_heat * d_heat) + (d_humidity * d_humidity);
+
+ if (pos.Y <= b->max_pos.Y) { // Within y limits of biome b
+ if (dist < dist_min) {
+ dist_min = dist;
+ biome_closest = b;
+ }
+ } else if (dist < dist_min_blend) { // Blend area above biome b
+ dist_min_blend = dist;
+ biome_closest_blend = b;
}
}
- return biome_closest ? biome_closest : (Biome *)m_bmgr->getRaw(BIOME_NONE);
+ // Carefully tune pseudorandom seed variation to avoid single node dither
+ // and create larger scale blending patterns similar to horizontal biome
+ // blend.
+ mysrand(pos.Y + (heat + humidity) * 0.9f);
+
+ if (biome_closest_blend && dist_min_blend <= dist_min &&
+ myrand_range(0, biome_closest_blend->vertical_blend) >=
+ pos.Y - biome_closest_blend->max_pos.Y)
+ return biome_closest_blend;
+
+ return (biome_closest) ? biome_closest : (Biome *)m_bmgr->getRaw(BIOME_NONE);
}
void Biome::resolveNodeNames()
{
- getIdFromNrBacklog(&c_top, "mapgen_stone", CONTENT_AIR);
- getIdFromNrBacklog(&c_filler, "mapgen_stone", CONTENT_AIR);
- getIdFromNrBacklog(&c_stone, "mapgen_stone", CONTENT_AIR);
- getIdFromNrBacklog(&c_water_top, "mapgen_water_source", CONTENT_AIR);
- getIdFromNrBacklog(&c_water, "mapgen_water_source", CONTENT_AIR);
- getIdFromNrBacklog(&c_river_water, "mapgen_river_water_source", CONTENT_AIR);
- getIdFromNrBacklog(&c_riverbed, "mapgen_stone", CONTENT_AIR);
- getIdFromNrBacklog(&c_dust, "ignore", CONTENT_IGNORE);
+ getIdFromNrBacklog(&c_top, "mapgen_stone", CONTENT_AIR, false);
+ getIdFromNrBacklog(&c_filler, "mapgen_stone", CONTENT_AIR, false);
+ getIdFromNrBacklog(&c_stone, "mapgen_stone", CONTENT_AIR, false);
+ getIdFromNrBacklog(&c_water_top, "mapgen_water_source", CONTENT_AIR, false);
+ getIdFromNrBacklog(&c_water, "mapgen_water_source", CONTENT_AIR, false);
+ getIdFromNrBacklog(&c_river_water, "mapgen_river_water_source", CONTENT_AIR, false);
+ getIdFromNrBacklog(&c_riverbed, "mapgen_stone", CONTENT_AIR, false);
+ getIdFromNrBacklog(&c_dust, "ignore", CONTENT_IGNORE, false);
+ getIdFromNrBacklog(&c_cave_liquid, "ignore", CONTENT_IGNORE, false);
+ getIdFromNrBacklog(&c_dungeon, "ignore", CONTENT_IGNORE, false);
+ getIdFromNrBacklog(&c_dungeon_alt, "ignore", CONTENT_IGNORE, false);
+ getIdFromNrBacklog(&c_dungeon_stair, "ignore", CONTENT_IGNORE, false);
}
projects / oweals / minetest.git / blobdiff