2013-04-06 17:19:59 +02:00
|
|
|
/*
|
|
|
|
Minetest
|
|
|
|
Copyright (C) 2010-2013 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
|
|
|
|
|
|
|
|
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
|
|
|
|
the Free Software Foundation; either version 2.1 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU Lesser General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Lesser General Public License along
|
|
|
|
with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#include "mapgen.h"
|
|
|
|
#include "voxel.h"
|
|
|
|
#include "noise.h"
|
|
|
|
#include "mapblock.h"
|
|
|
|
#include "mapnode.h"
|
|
|
|
#include "map.h"
|
|
|
|
#include "content_sao.h"
|
|
|
|
#include "nodedef.h"
|
|
|
|
#include "voxelalgorithms.h"
|
|
|
|
#include "profiler.h"
|
|
|
|
#include "settings.h" // For g_settings
|
|
|
|
#include "main.h" // For g_profiler
|
|
|
|
#include "emerge.h"
|
|
|
|
#include "dungeongen.h"
|
2013-04-21 06:11:05 +02:00
|
|
|
#include "cavegen.h"
|
2013-04-06 17:19:59 +02:00
|
|
|
#include "treegen.h"
|
|
|
|
#include "biome.h"
|
|
|
|
#include "mapgen_v7.h"
|
|
|
|
|
|
|
|
|
2014-02-04 04:42:10 +01:00
|
|
|
FlagDesc flagdesc_mapgen_v7[] = {
|
2014-02-08 23:50:26 +01:00
|
|
|
{"mountains", MGV7_MOUNTAINS},
|
|
|
|
{"ridges", MGV7_RIDGES},
|
|
|
|
{NULL, 0}
|
2014-02-04 04:42:10 +01:00
|
|
|
};
|
2013-07-06 08:21:35 +02:00
|
|
|
|
2013-04-06 17:19:59 +02:00
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
|
2014-02-04 04:42:10 +01:00
|
|
|
MapgenV7::MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge) {
|
2013-04-06 17:19:59 +02:00
|
|
|
this->generating = false;
|
|
|
|
this->id = mapgenid;
|
|
|
|
this->emerge = emerge;
|
|
|
|
this->bmgr = emerge->biomedef;
|
|
|
|
|
2014-02-08 23:50:26 +01:00
|
|
|
this->seed = (int)params->seed;
|
2013-04-06 17:19:59 +02:00
|
|
|
this->water_level = params->water_level;
|
2014-02-08 23:50:26 +01:00
|
|
|
this->flags = params->flags;
|
|
|
|
this->gennotify = emerge->gennotify;
|
2013-06-23 18:23:59 +02:00
|
|
|
|
2013-04-06 17:19:59 +02:00
|
|
|
this->csize = v3s16(1, 1, 1) * params->chunksize * MAP_BLOCKSIZE;
|
2013-07-06 08:21:35 +02:00
|
|
|
|
|
|
|
// amount of elements to skip for the next index
|
|
|
|
// for noise/height/biome maps (not vmanip)
|
|
|
|
this->ystride = csize.X;
|
|
|
|
this->zstride = csize.X * csize.Y;
|
2013-04-06 17:19:59 +02:00
|
|
|
|
|
|
|
this->biomemap = new u8[csize.X * csize.Z];
|
|
|
|
this->heightmap = new s16[csize.X * csize.Z];
|
|
|
|
this->ridge_heightmap = new s16[csize.X * csize.Z];
|
|
|
|
|
2014-02-04 04:42:10 +01:00
|
|
|
MapgenV7Params *sp = (MapgenV7Params *)params->sparams;
|
|
|
|
|
2013-04-06 17:19:59 +02:00
|
|
|
// Terrain noise
|
2014-02-04 04:42:10 +01:00
|
|
|
noise_terrain_base = new Noise(&sp->np_terrain_base, seed, csize.X, csize.Z);
|
|
|
|
noise_terrain_alt = new Noise(&sp->np_terrain_alt, seed, csize.X, csize.Z);
|
|
|
|
noise_terrain_persist = new Noise(&sp->np_terrain_persist, seed, csize.X, csize.Z);
|
|
|
|
noise_height_select = new Noise(&sp->np_height_select, seed, csize.X, csize.Z);
|
|
|
|
noise_filler_depth = new Noise(&sp->np_filler_depth, seed, csize.X, csize.Z);
|
|
|
|
noise_mount_height = new Noise(&sp->np_mount_height, seed, csize.X, csize.Z);
|
|
|
|
noise_ridge_uwater = new Noise(&sp->np_ridge_uwater, seed, csize.X, csize.Z);
|
|
|
|
|
2013-07-06 08:21:35 +02:00
|
|
|
// 3d terrain noise
|
2014-02-04 04:42:10 +01:00
|
|
|
noise_mountain = new Noise(&sp->np_mountain, seed, csize.X, csize.Y, csize.Z);
|
|
|
|
noise_ridge = new Noise(&sp->np_ridge, seed, csize.X, csize.Y, csize.Z);
|
|
|
|
|
2013-04-06 17:19:59 +02:00
|
|
|
// Biome noise
|
|
|
|
noise_heat = new Noise(bmgr->np_heat, seed, csize.X, csize.Z);
|
|
|
|
noise_humidity = new Noise(bmgr->np_humidity, seed, csize.X, csize.Z);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
MapgenV7::~MapgenV7() {
|
|
|
|
delete noise_terrain_base;
|
|
|
|
delete noise_terrain_persist;
|
|
|
|
delete noise_height_select;
|
|
|
|
delete noise_terrain_alt;
|
2013-07-06 08:21:35 +02:00
|
|
|
delete noise_filler_depth;
|
|
|
|
delete noise_mount_height;
|
|
|
|
delete noise_ridge_uwater;
|
|
|
|
delete noise_mountain;
|
2013-04-06 17:19:59 +02:00
|
|
|
delete noise_ridge;
|
2013-07-06 08:21:35 +02:00
|
|
|
|
2013-04-06 17:19:59 +02:00
|
|
|
delete noise_heat;
|
|
|
|
delete noise_humidity;
|
|
|
|
|
|
|
|
delete[] ridge_heightmap;
|
|
|
|
delete[] heightmap;
|
|
|
|
delete[] biomemap;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-02-04 04:42:10 +01:00
|
|
|
MapgenV7Params::MapgenV7Params() {
|
|
|
|
spflags = MGV7_MOUNTAINS | MGV7_RIDGES;
|
|
|
|
|
|
|
|
np_terrain_base = NoiseParams(4, 70, v3f(300, 300, 300), 82341, 6, 0.7);
|
|
|
|
np_terrain_alt = NoiseParams(4, 25, v3f(600, 600, 600), 5934, 5, 0.6);
|
|
|
|
np_terrain_persist = NoiseParams(0.6, 0.1, v3f(500, 500, 500), 539, 3, 0.6);
|
|
|
|
np_height_select = NoiseParams(-0.5, 1, v3f(250, 250, 250), 4213, 5, 0.69);
|
|
|
|
np_filler_depth = NoiseParams(0, 1.2, v3f(150, 150, 150), 261, 4, 0.7);
|
|
|
|
np_mount_height = NoiseParams(100, 30, v3f(500, 500, 500), 72449, 4, 0.6);
|
|
|
|
np_ridge_uwater = NoiseParams(0, 1, v3f(500, 500, 500), 85039, 4, 0.6);
|
|
|
|
np_mountain = NoiseParams(0, 1, v3f(250, 350, 250), 5333, 5, 0.68);
|
|
|
|
np_ridge = NoiseParams(0, 1, v3f(100, 100, 100), 6467, 4, 0.75);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void MapgenV7Params::readParams(Settings *settings) {
|
2014-02-05 06:17:53 +01:00
|
|
|
settings->getFlagStrNoEx("mgv7_spflags", spflags, flagdesc_mapgen_v7);
|
2014-02-04 04:42:10 +01:00
|
|
|
|
|
|
|
settings->getNoiseParams("mgv7_np_terrain_base", np_terrain_base);
|
|
|
|
settings->getNoiseParams("mgv7_np_terrain_alt", np_terrain_alt);
|
|
|
|
settings->getNoiseParams("mgv7_np_terrain_persist", np_terrain_persist);
|
|
|
|
settings->getNoiseParams("mgv7_np_height_select", np_height_select);
|
|
|
|
settings->getNoiseParams("mgv7_np_filler_depth", np_filler_depth);
|
|
|
|
settings->getNoiseParams("mgv7_np_mount_height", np_mount_height);
|
|
|
|
settings->getNoiseParams("mgv7_np_ridge_uwater", np_ridge_uwater);
|
|
|
|
settings->getNoiseParams("mgv7_np_mountain", np_mountain);
|
|
|
|
settings->getNoiseParams("mgv7_np_ridge", np_ridge);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void MapgenV7Params::writeParams(Settings *settings) {
|
2014-02-08 23:50:26 +01:00
|
|
|
settings->setFlagStr("mgv7_spflags", spflags, flagdesc_mapgen_v7, (u32)-1);
|
2014-02-04 04:42:10 +01:00
|
|
|
|
|
|
|
settings->setNoiseParams("mgv7_np_terrain_base", np_terrain_base);
|
|
|
|
settings->setNoiseParams("mgv7_np_terrain_alt", np_terrain_alt);
|
|
|
|
settings->setNoiseParams("mgv7_np_terrain_persist", np_terrain_persist);
|
|
|
|
settings->setNoiseParams("mgv7_np_height_select", np_height_select);
|
|
|
|
settings->setNoiseParams("mgv7_np_filler_depth", np_filler_depth);
|
|
|
|
settings->setNoiseParams("mgv7_np_mount_height", np_mount_height);
|
|
|
|
settings->setNoiseParams("mgv7_np_ridge_uwater", np_ridge_uwater);
|
|
|
|
settings->setNoiseParams("mgv7_np_mountain", np_mountain);
|
|
|
|
settings->setNoiseParams("mgv7_np_ridge", np_ridge);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
///////////////////////////////////////
|
|
|
|
|
|
|
|
|
2013-04-06 17:19:59 +02:00
|
|
|
int MapgenV7::getGroundLevelAtPoint(v2s16 p) {
|
2013-07-06 08:21:35 +02:00
|
|
|
// Base terrain calculation
|
|
|
|
s16 y = baseTerrainLevelAtPoint(p.X, p.Y);
|
2013-04-21 21:47:13 +02:00
|
|
|
|
2013-07-06 08:21:35 +02:00
|
|
|
// Ridge/river terrain calculation
|
|
|
|
float width = 0.3;
|
|
|
|
float uwatern = NoisePerlin2DNoTxfm(noise_ridge_uwater->np, p.X, p.Y, seed) * 2;
|
|
|
|
// actually computing the depth of the ridge is much more expensive;
|
|
|
|
// if inside a river, simply guess
|
|
|
|
if (uwatern >= -width && uwatern <= width)
|
|
|
|
return water_level - 10;
|
|
|
|
|
|
|
|
// Mountain terrain calculation
|
|
|
|
int iters = 128; // don't even bother iterating more than 128 times..
|
2013-06-16 04:23:06 +02:00
|
|
|
while (iters--) {
|
2013-07-06 08:21:35 +02:00
|
|
|
//current point would have been air
|
|
|
|
if (!getMountainTerrainAtPoint(p.X, y, p.Y))
|
|
|
|
return y;
|
2013-06-16 04:23:06 +02:00
|
|
|
|
2013-07-06 08:21:35 +02:00
|
|
|
y++;
|
2013-04-21 21:47:13 +02:00
|
|
|
}
|
|
|
|
|
2013-07-06 08:21:35 +02:00
|
|
|
return y;
|
2013-04-06 17:19:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void MapgenV7::makeChunk(BlockMakeData *data) {
|
|
|
|
assert(data->vmanip);
|
|
|
|
assert(data->nodedef);
|
|
|
|
assert(data->blockpos_requested.X >= data->blockpos_min.X &&
|
|
|
|
data->blockpos_requested.Y >= data->blockpos_min.Y &&
|
|
|
|
data->blockpos_requested.Z >= data->blockpos_min.Z);
|
|
|
|
assert(data->blockpos_requested.X <= data->blockpos_max.X &&
|
|
|
|
data->blockpos_requested.Y <= data->blockpos_max.Y &&
|
|
|
|
data->blockpos_requested.Z <= data->blockpos_max.Z);
|
|
|
|
|
|
|
|
this->generating = true;
|
|
|
|
this->vm = data->vmanip;
|
|
|
|
this->ndef = data->nodedef;
|
|
|
|
//TimeTaker t("makeChunk");
|
|
|
|
|
|
|
|
v3s16 blockpos_min = data->blockpos_min;
|
|
|
|
v3s16 blockpos_max = data->blockpos_max;
|
|
|
|
node_min = blockpos_min * MAP_BLOCKSIZE;
|
|
|
|
node_max = (blockpos_max + v3s16(1, 1, 1)) * MAP_BLOCKSIZE - v3s16(1, 1, 1);
|
|
|
|
full_node_min = (blockpos_min - 1) * MAP_BLOCKSIZE;
|
|
|
|
full_node_max = (blockpos_max + 2) * MAP_BLOCKSIZE - v3s16(1, 1, 1);
|
|
|
|
|
2013-04-21 06:11:05 +02:00
|
|
|
blockseed = emerge->getBlockSeed(full_node_min); //////use getBlockSeed2()!
|
2013-04-06 17:19:59 +02:00
|
|
|
|
|
|
|
c_stone = ndef->getId("mapgen_stone");
|
|
|
|
c_dirt = ndef->getId("mapgen_dirt");
|
|
|
|
c_dirt_with_grass = ndef->getId("mapgen_dirt_with_grass");
|
|
|
|
c_sand = ndef->getId("mapgen_sand");
|
|
|
|
c_water_source = ndef->getId("mapgen_water_source");
|
2013-04-21 06:11:05 +02:00
|
|
|
c_lava_source = ndef->getId("mapgen_lava_source");
|
2013-07-06 08:21:35 +02:00
|
|
|
c_ice = ndef->getId("default:ice");
|
|
|
|
if (c_ice == CONTENT_IGNORE)
|
|
|
|
c_ice = CONTENT_AIR;
|
2013-04-06 17:19:59 +02:00
|
|
|
|
2013-07-06 08:21:35 +02:00
|
|
|
// Make some noise
|
|
|
|
calculateNoise();
|
2013-04-06 17:19:59 +02:00
|
|
|
|
2013-07-06 08:21:35 +02:00
|
|
|
// Generate base terrain, mountains, and ridges with initial heightmaps
|
|
|
|
s16 stone_surface_max_y = generateTerrain();
|
2013-06-16 04:23:06 +02:00
|
|
|
|
|
|
|
updateHeightmap(node_min, node_max);
|
2013-07-06 08:21:35 +02:00
|
|
|
|
|
|
|
// Calculate biomes
|
|
|
|
BiomeNoiseInput binput;
|
|
|
|
binput.mapsize = v2s16(csize.X, csize.Z);
|
|
|
|
binput.heat_map = noise_heat->result;
|
|
|
|
binput.humidity_map = noise_humidity->result;
|
|
|
|
binput.height_map = heightmap;
|
|
|
|
bmgr->calcBiomes(&binput, biomemap);
|
|
|
|
|
|
|
|
// Actually place the biome-specific nodes and what not
|
|
|
|
generateBiomes();
|
|
|
|
|
|
|
|
if (flags & MG_CAVES)
|
|
|
|
generateCaves(stone_surface_max_y);
|
2013-04-06 17:19:59 +02:00
|
|
|
|
|
|
|
if (flags & MG_DUNGEONS) {
|
2013-12-14 07:52:06 +01:00
|
|
|
DungeonGen dgen(this, NULL);
|
|
|
|
dgen.generate(blockseed, full_node_min, full_node_max);
|
2013-04-06 17:19:59 +02:00
|
|
|
}
|
|
|
|
|
2013-06-16 04:23:06 +02:00
|
|
|
for (size_t i = 0; i != emerge->decorations.size(); i++) {
|
|
|
|
Decoration *deco = emerge->decorations[i];
|
|
|
|
deco->placeDeco(this, blockseed + i, node_min, node_max);
|
|
|
|
}
|
|
|
|
|
2013-04-06 17:19:59 +02:00
|
|
|
for (size_t i = 0; i != emerge->ores.size(); i++) {
|
|
|
|
Ore *ore = emerge->ores[i];
|
2013-04-08 03:21:17 +02:00
|
|
|
ore->placeOre(this, blockseed + i, node_min, node_max);
|
2013-04-06 17:19:59 +02:00
|
|
|
}
|
|
|
|
|
2013-07-06 08:21:35 +02:00
|
|
|
// Sprinkle some dust on top after everything else was generated
|
|
|
|
dustTopNodes();
|
|
|
|
|
2013-04-06 17:19:59 +02:00
|
|
|
//printf("makeChunk: %dms\n", t.stop());
|
|
|
|
|
|
|
|
updateLiquid(&data->transforming_liquid, full_node_min, full_node_max);
|
2013-04-07 08:26:46 +02:00
|
|
|
|
2014-02-08 23:50:26 +01:00
|
|
|
if (flags & MG_LIGHT)
|
2013-06-23 18:23:59 +02:00
|
|
|
calcLighting(node_min - v3s16(1, 0, 1) * MAP_BLOCKSIZE,
|
2013-06-27 23:06:52 +02:00
|
|
|
node_max + v3s16(1, 0, 1) * MAP_BLOCKSIZE);
|
2013-04-21 21:47:13 +02:00
|
|
|
//setLighting(node_min - v3s16(1, 0, 1) * MAP_BLOCKSIZE,
|
|
|
|
// node_max + v3s16(1, 0, 1) * MAP_BLOCKSIZE, 0xFF);
|
2013-07-06 08:21:35 +02:00
|
|
|
|
2013-04-06 17:19:59 +02:00
|
|
|
this->generating = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void MapgenV7::calculateNoise() {
|
|
|
|
//TimeTaker t("calculateNoise", NULL, PRECISION_MICRO);
|
|
|
|
int x = node_min.X;
|
|
|
|
int y = node_min.Y;
|
|
|
|
int z = node_min.Z;
|
|
|
|
|
|
|
|
noise_height_select->perlinMap2D(x, z);
|
|
|
|
noise_height_select->transformNoiseMap();
|
|
|
|
|
|
|
|
noise_terrain_persist->perlinMap2D(x, z);
|
2013-07-06 08:21:35 +02:00
|
|
|
noise_terrain_persist->transformNoiseMap();
|
2013-04-06 17:19:59 +02:00
|
|
|
float *persistmap = noise_terrain_persist->result;
|
|
|
|
for (int i = 0; i != csize.X * csize.Z; i++)
|
2013-07-06 08:21:35 +02:00
|
|
|
persistmap[i] = rangelim(persistmap[i], 0.4, 0.9);
|
2013-04-06 17:19:59 +02:00
|
|
|
|
|
|
|
noise_terrain_base->perlinMap2DModulated(x, z, persistmap);
|
|
|
|
noise_terrain_base->transformNoiseMap();
|
|
|
|
|
|
|
|
noise_terrain_alt->perlinMap2DModulated(x, z, persistmap);
|
|
|
|
noise_terrain_alt->transformNoiseMap();
|
|
|
|
|
2013-07-06 08:21:35 +02:00
|
|
|
noise_filler_depth->perlinMap2D(x, z);
|
2013-04-06 17:19:59 +02:00
|
|
|
|
2014-02-04 04:42:10 +01:00
|
|
|
if (spflags & MGV7_MOUNTAINS) {
|
2013-07-06 08:21:35 +02:00
|
|
|
noise_mountain->perlinMap3D(x, y, z);
|
|
|
|
noise_mount_height->perlinMap2D(x, z);
|
|
|
|
noise_mount_height->transformNoiseMap();
|
|
|
|
}
|
|
|
|
|
2014-02-04 04:42:10 +01:00
|
|
|
if (spflags & MGV7_RIDGES) {
|
2013-07-06 08:21:35 +02:00
|
|
|
noise_ridge->perlinMap3D(x, y, z);
|
|
|
|
noise_ridge_uwater->perlinMap2D(x, z);
|
|
|
|
}
|
2013-04-06 17:19:59 +02:00
|
|
|
|
2013-07-06 08:21:35 +02:00
|
|
|
noise_heat->perlinMap2D(x, z);
|
2013-04-06 17:19:59 +02:00
|
|
|
noise_humidity->perlinMap2D(x, z);
|
|
|
|
|
|
|
|
//printf("calculateNoise: %dus\n", t.stop());
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Biome *MapgenV7::getBiomeAtPoint(v3s16 p) {
|
|
|
|
float heat = NoisePerlin2D(bmgr->np_heat, p.X, p.Z, seed);
|
|
|
|
float humidity = NoisePerlin2D(bmgr->np_humidity, p.X, p.Z, seed);
|
|
|
|
s16 groundlevel = baseTerrainLevelAtPoint(p.X, p.Z);
|
|
|
|
|
|
|
|
return bmgr->getBiome(heat, humidity, groundlevel);
|
|
|
|
}
|
|
|
|
|
2013-07-06 08:21:35 +02:00
|
|
|
//needs to be updated
|
2013-04-06 17:19:59 +02:00
|
|
|
float MapgenV7::baseTerrainLevelAtPoint(int x, int z) {
|
2013-07-06 08:21:35 +02:00
|
|
|
float hselect = NoisePerlin2D(noise_height_select->np, x, z, seed);
|
|
|
|
hselect = rangelim(hselect, 0.0, 1.0);
|
|
|
|
|
|
|
|
float persist = NoisePerlin2D(noise_terrain_persist->np, x, z, seed);
|
|
|
|
persist = rangelim(persist, 0.4, 0.9);
|
2013-04-06 17:19:59 +02:00
|
|
|
|
|
|
|
noise_terrain_base->np->persist = persist;
|
2013-07-06 08:21:35 +02:00
|
|
|
float height_base = NoisePerlin2D(noise_terrain_base->np, x, z, seed);
|
2013-04-06 17:19:59 +02:00
|
|
|
|
|
|
|
noise_terrain_alt->np->persist = persist;
|
|
|
|
float height_alt = NoisePerlin2D(noise_terrain_alt->np, x, z, seed);
|
|
|
|
|
2013-07-06 08:21:35 +02:00
|
|
|
if (height_alt > height_base)
|
|
|
|
return height_alt;
|
|
|
|
|
2013-04-06 17:19:59 +02:00
|
|
|
return (height_base * hselect) + (height_alt * (1.0 - hselect));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-04-21 21:47:13 +02:00
|
|
|
float MapgenV7::baseTerrainLevelFromMap(int index) {
|
2013-07-06 08:21:35 +02:00
|
|
|
float hselect = rangelim(noise_height_select->result[index], 0.0, 1.0);
|
|
|
|
float height_base = noise_terrain_base->result[index];
|
|
|
|
float height_alt = noise_terrain_alt->result[index];
|
|
|
|
|
|
|
|
if (height_alt > height_base)
|
|
|
|
return height_alt;
|
2013-04-06 17:19:59 +02:00
|
|
|
|
|
|
|
return (height_base * hselect) + (height_alt * (1.0 - hselect));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-07-06 08:21:35 +02:00
|
|
|
bool MapgenV7::getMountainTerrainAtPoint(int x, int y, int z) {
|
|
|
|
float mnt_h_n = NoisePerlin2D(noise_mount_height->np, x, z, seed);
|
|
|
|
float height_modifier = -((float)y / rangelim(mnt_h_n, 80.0, 150.0));
|
|
|
|
float mnt_n = NoisePerlin3D(noise_mountain->np, x, y, z, seed);
|
|
|
|
|
|
|
|
return mnt_n + height_modifier >= 0.6;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool MapgenV7::getMountainTerrainFromMap(int idx_xyz, int idx_xz, int y) {
|
|
|
|
float mounthn = noise_mount_height->result[idx_xz];
|
|
|
|
float height_modifier = -((float)y / rangelim(mounthn, 80.0, 150.0));
|
|
|
|
return (noise_mountain->result[idx_xyz] + height_modifier >= 0.6);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-04-06 17:19:59 +02:00
|
|
|
#if 0
|
|
|
|
void MapgenV7::carveRivers() {
|
|
|
|
MapNode n_air(CONTENT_AIR), n_water_source(c_water_source);
|
|
|
|
MapNode n_stone(c_stone);
|
|
|
|
u32 index = 0;
|
|
|
|
|
|
|
|
int river_depth = 4;
|
|
|
|
|
|
|
|
for (s16 z = node_min.Z; z <= node_max.Z; z++)
|
|
|
|
for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
|
|
|
|
float terrain_mod = noise_terrain_mod->result[index];
|
|
|
|
NoiseParams *np = noise_terrain_river->np;
|
|
|
|
np->persist = noise_terrain_persist->result[index];
|
|
|
|
float terrain_river = NoisePerlin2DNoTxfm(np, x, z, seed);
|
|
|
|
float height = terrain_river * (1 - abs(terrain_mod)) *
|
|
|
|
noise_terrain_river->np->scale;
|
|
|
|
height = log(height * height); //log(h^3) is pretty interesting for terrain
|
|
|
|
|
|
|
|
s16 y = heightmap[index];
|
|
|
|
if (height < 1.0 && y > river_depth &&
|
|
|
|
y - river_depth >= node_min.Y && y <= node_max.Y) {
|
|
|
|
|
|
|
|
for (s16 ry = y; ry != y - river_depth; ry--) {
|
|
|
|
u32 vi = vm->m_area.index(x, ry, z);
|
|
|
|
vm->m_data[vi] = n_air;
|
|
|
|
}
|
|
|
|
|
|
|
|
u32 vi = vm->m_area.index(x, y - river_depth, z);
|
|
|
|
vm->m_data[vi] = n_water_source;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2013-07-06 08:21:35 +02:00
|
|
|
int MapgenV7::generateTerrain() {
|
|
|
|
int ymax = generateBaseTerrain();
|
|
|
|
|
2014-02-04 04:42:10 +01:00
|
|
|
if (spflags & MGV7_MOUNTAINS)
|
2013-07-06 08:21:35 +02:00
|
|
|
generateMountainTerrain();
|
|
|
|
|
2014-02-04 04:42:10 +01:00
|
|
|
if (spflags & MGV7_RIDGES)
|
2013-07-06 08:21:35 +02:00
|
|
|
generateRidgeTerrain();
|
|
|
|
|
|
|
|
return ymax;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int MapgenV7::generateBaseTerrain() {
|
|
|
|
MapNode n_air(CONTENT_AIR);
|
|
|
|
MapNode n_stone(c_stone);
|
|
|
|
MapNode n_water(c_water_source);
|
|
|
|
|
2013-04-06 17:19:59 +02:00
|
|
|
int stone_surface_max_y = -MAP_GENERATION_LIMIT;
|
2013-07-06 08:21:35 +02:00
|
|
|
v3s16 em = vm->m_area.getExtent();
|
2013-04-06 17:19:59 +02:00
|
|
|
u32 index = 0;
|
|
|
|
|
|
|
|
for (s16 z = node_min.Z; z <= node_max.Z; z++)
|
|
|
|
for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
|
|
|
|
float surface_height = baseTerrainLevelFromMap(index);
|
|
|
|
s16 surface_y = (s16)surface_height;
|
|
|
|
|
|
|
|
heightmap[index] = surface_y;
|
|
|
|
ridge_heightmap[index] = surface_y;
|
|
|
|
|
|
|
|
if (surface_y > stone_surface_max_y)
|
|
|
|
stone_surface_max_y = surface_y;
|
|
|
|
|
2013-07-06 08:21:35 +02:00
|
|
|
u32 i = vm->m_area.index(x, node_min.Y, z);
|
2013-04-06 17:19:59 +02:00
|
|
|
for (s16 y = node_min.Y; y <= node_max.Y; y++) {
|
|
|
|
if (vm->m_data[i].getContent() == CONTENT_IGNORE) {
|
2013-07-06 08:21:35 +02:00
|
|
|
if (y <= surface_y)
|
|
|
|
vm->m_data[i] = n_stone;
|
|
|
|
else if (y <= water_level)
|
|
|
|
vm->m_data[i] = n_water;
|
|
|
|
else
|
2013-04-06 17:19:59 +02:00
|
|
|
vm->m_data[i] = n_air;
|
|
|
|
}
|
|
|
|
vm->m_area.add_y(em, i, 1);
|
|
|
|
}
|
|
|
|
}
|
2013-07-06 08:21:35 +02:00
|
|
|
|
|
|
|
return stone_surface_max_y;
|
2013-04-06 17:19:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-07-06 08:21:35 +02:00
|
|
|
void MapgenV7::generateMountainTerrain() {
|
2013-04-06 17:19:59 +02:00
|
|
|
if (node_max.Y <= water_level)
|
|
|
|
return;
|
|
|
|
|
2013-07-06 08:21:35 +02:00
|
|
|
MapNode n_stone(c_stone);
|
2013-07-06 21:22:51 +02:00
|
|
|
u32 j = 0;
|
2013-07-06 08:21:35 +02:00
|
|
|
|
|
|
|
for (s16 z = node_min.Z; z <= node_max.Z; z++)
|
|
|
|
for (s16 y = node_min.Y; y <= node_max.Y; y++) {
|
|
|
|
u32 vi = vm->m_area.index(node_min.X, y, z);
|
|
|
|
for (s16 x = node_min.X; x <= node_max.X; x++) {
|
2013-07-06 21:22:51 +02:00
|
|
|
int index = (z - node_min.Z) * csize.X + (x - node_min.X);
|
2013-07-06 08:21:35 +02:00
|
|
|
|
2013-07-06 21:22:51 +02:00
|
|
|
if (getMountainTerrainFromMap(j, index, y))
|
2013-07-06 08:21:35 +02:00
|
|
|
vm->m_data[vi] = n_stone;
|
|
|
|
|
|
|
|
vi++;
|
2013-07-06 21:22:51 +02:00
|
|
|
j++;
|
2013-07-06 08:21:35 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void MapgenV7::generateRidgeTerrain() {
|
|
|
|
MapNode n_water(c_water_source);
|
2013-04-06 17:19:59 +02:00
|
|
|
MapNode n_air(CONTENT_AIR);
|
|
|
|
u32 index = 0;
|
|
|
|
|
|
|
|
for (s16 z = node_min.Z; z <= node_max.Z; z++)
|
|
|
|
for (s16 y = node_min.Y; y <= node_max.Y; y++) {
|
|
|
|
u32 vi = vm->m_area.index(node_min.X, y, z);
|
|
|
|
for (s16 x = node_min.X; x <= node_max.X; x++, index++, vi++) {
|
2013-07-06 08:21:35 +02:00
|
|
|
int j = (z - node_min.Z) * csize.X + (x - node_min.X);
|
|
|
|
|
|
|
|
if (heightmap[j] < water_level - 4)
|
2013-04-06 17:19:59 +02:00
|
|
|
continue;
|
2013-07-06 08:21:35 +02:00
|
|
|
|
|
|
|
float widthn = (noise_terrain_persist->result[j] - 0.6) / 0.1;
|
|
|
|
//widthn = rangelim(widthn, -0.05, 0.5);
|
|
|
|
|
|
|
|
float width = 0.3; // TODO: figure out acceptable perlin noise values
|
|
|
|
float uwatern = noise_ridge_uwater->result[j] * 2;
|
|
|
|
if (uwatern < -width || uwatern > width)
|
2013-04-06 17:19:59 +02:00
|
|
|
continue;
|
2013-07-06 08:21:35 +02:00
|
|
|
|
|
|
|
float height_mod = (float)(y + 17) / 2.5;
|
|
|
|
float width_mod = (width - fabs(uwatern));
|
|
|
|
float nridge = noise_ridge->result[index] * (float)y / 7.0;
|
2013-04-06 17:19:59 +02:00
|
|
|
|
2013-07-06 08:21:35 +02:00
|
|
|
if (y < water_level)
|
|
|
|
nridge = -fabs(nridge) * 3.0 * widthn * 0.3;
|
|
|
|
|
|
|
|
if (nridge + width_mod * height_mod < 0.6)
|
|
|
|
continue;
|
|
|
|
|
2013-04-06 17:19:59 +02:00
|
|
|
if (y < ridge_heightmap[j])
|
|
|
|
ridge_heightmap[j] = y - 1;
|
|
|
|
|
2013-07-06 08:21:35 +02:00
|
|
|
vm->m_data[vi] = (y > water_level) ? n_air : n_water;
|
2013-04-06 17:19:59 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-07-06 08:21:35 +02:00
|
|
|
|
|
|
|
void MapgenV7::generateBiomes() {
|
|
|
|
if (node_max.Y < water_level)
|
|
|
|
return;
|
|
|
|
|
|
|
|
MapNode n_air(CONTENT_AIR);
|
|
|
|
MapNode n_stone(c_stone);
|
|
|
|
MapNode n_water(c_water_source);
|
|
|
|
|
|
|
|
v3s16 em = vm->m_area.getExtent();
|
2013-04-06 17:19:59 +02:00
|
|
|
u32 index = 0;
|
|
|
|
|
2013-07-06 08:21:35 +02:00
|
|
|
for (s16 z = node_min.Z; z <= node_max.Z; z++)
|
|
|
|
for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
|
|
|
|
Biome *biome = bmgr->biomes[biomemap[index]];
|
|
|
|
s16 dfiller = biome->depth_filler + noise_filler_depth->result[index];
|
|
|
|
s16 y0_top = biome->depth_top;
|
|
|
|
s16 y0_filler = biome->depth_filler + biome->depth_top + dfiller;
|
|
|
|
|
|
|
|
s16 nplaced = 0;
|
|
|
|
u32 i = vm->m_area.index(x, node_max.Y, z);
|
|
|
|
|
|
|
|
content_t c_above = vm->m_data[i + em.X].getContent();
|
|
|
|
bool have_air = c_above == CONTENT_AIR;
|
|
|
|
|
|
|
|
for (s16 y = node_max.Y; y >= node_min.Y; y--) {
|
|
|
|
content_t c = vm->m_data[i].getContent();
|
|
|
|
|
|
|
|
// It could be the case that the elevation is equal to the chunk
|
|
|
|
// boundary, but the chunk above has not been generated yet
|
|
|
|
if (y == node_max.Y && c_above == CONTENT_IGNORE &&
|
|
|
|
y == heightmap[index] && c == c_stone) {
|
2013-07-06 21:22:51 +02:00
|
|
|
int j = (z - node_min.Z) * zstride +
|
|
|
|
(y - node_min.Y) * ystride +
|
|
|
|
(x - node_min.X);
|
2013-07-06 08:21:35 +02:00
|
|
|
have_air = !getMountainTerrainFromMap(j, index, y);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (c == c_stone && have_air) {
|
|
|
|
content_t c_below = vm->m_data[i - em.X].getContent();
|
|
|
|
|
|
|
|
if (c_below != CONTENT_AIR) {
|
|
|
|
if (nplaced < y0_top) {
|
|
|
|
// A hack to prevent dirt_with_grass from being
|
|
|
|
// placed below water. TODO: fix later
|
|
|
|
content_t c_place = ((y < water_level) &&
|
|
|
|
(biome->c_top == c_dirt_with_grass)) ?
|
|
|
|
c_dirt : biome->c_top;
|
|
|
|
|
|
|
|
vm->m_data[i] = MapNode(c_place);
|
|
|
|
nplaced++;
|
|
|
|
} else if (nplaced < y0_filler && nplaced >= y0_top) {
|
|
|
|
vm->m_data[i] = MapNode(biome->c_filler);
|
|
|
|
nplaced++;
|
|
|
|
} else {
|
|
|
|
have_air = false;
|
|
|
|
nplaced = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else if (c == c_water_source) {
|
|
|
|
have_air = true;
|
|
|
|
nplaced = 0;
|
|
|
|
vm->m_data[i] = MapNode(biome->c_water);
|
|
|
|
} else if (c == CONTENT_AIR) {
|
|
|
|
have_air = true;
|
|
|
|
nplaced = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
vm->m_area.add_y(em, i, -1);
|
|
|
|
}
|
2013-04-06 17:19:59 +02:00
|
|
|
}
|
2013-07-06 08:21:35 +02:00
|
|
|
}
|
2013-04-06 17:19:59 +02:00
|
|
|
|
|
|
|
|
2013-07-06 08:21:35 +02:00
|
|
|
void MapgenV7::dustTopNodes() {
|
|
|
|
v3s16 em = vm->m_area.getExtent();
|
|
|
|
u32 index = 0;
|
|
|
|
|
|
|
|
if (water_level > node_max.Y)
|
|
|
|
return;
|
|
|
|
|
|
|
|
for (s16 z = node_min.Z; z <= node_max.Z; z++)
|
|
|
|
for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
|
|
|
|
Biome *biome = bmgr->biomes[biomemap[index]];
|
|
|
|
|
|
|
|
if (biome->c_dust == CONTENT_IGNORE)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
s16 y = node_max.Y;
|
|
|
|
u32 vi = vm->m_area.index(x, y, z);
|
|
|
|
for (; y >= node_min.Y; y--) {
|
|
|
|
if (vm->m_data[vi].getContent() != CONTENT_AIR)
|
|
|
|
break;
|
|
|
|
|
|
|
|
vm->m_area.add_y(em, vi, -1);
|
|
|
|
}
|
|
|
|
|
|
|
|
content_t c = vm->m_data[vi].getContent();
|
|
|
|
if (c == biome->c_water && biome->c_dust_water != CONTENT_IGNORE) {
|
|
|
|
if (y < node_min.Y)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
vm->m_data[vi] = MapNode(biome->c_dust_water);
|
|
|
|
} else if (!ndef->get(c).buildable_to && c != CONTENT_IGNORE) {
|
|
|
|
if (y == node_max.Y)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
vm->m_area.add_y(em, vi, 1);
|
|
|
|
vm->m_data[vi] = MapNode(biome->c_dust);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#if 0
|
2013-04-06 17:19:59 +02:00
|
|
|
void MapgenV7::addTopNodes() {
|
|
|
|
v3s16 em = vm->m_area.getExtent();
|
|
|
|
s16 ntopnodes;
|
|
|
|
u32 index = 0;
|
2013-04-21 21:47:13 +02:00
|
|
|
|
2013-04-06 17:19:59 +02:00
|
|
|
for (s16 z = node_min.Z; z <= node_max.Z; z++)
|
|
|
|
for (s16 x = node_min.X; x <= node_max.X; x++, index++) {
|
2013-04-21 06:11:05 +02:00
|
|
|
Biome *biome = bmgr->biomes[biomemap[index]];
|
|
|
|
|
2013-04-21 21:47:13 +02:00
|
|
|
//////////////////// First, add top nodes below the ridge
|
2013-04-06 17:19:59 +02:00
|
|
|
s16 y = ridge_heightmap[index];
|
|
|
|
|
|
|
|
// This cutoff is good enough, but not perfect.
|
|
|
|
// It will cut off potentially placed top nodes at chunk boundaries
|
|
|
|
if (y < node_min.Y)
|
|
|
|
continue;
|
|
|
|
if (y > node_max.Y) {
|
|
|
|
y = node_max.Y; // Let's see if we can still go downward anyway
|
|
|
|
u32 vi = vm->m_area.index(x, y, z);
|
2013-04-21 06:11:05 +02:00
|
|
|
content_t c = vm->m_data[vi].getContent();
|
2013-04-21 21:47:13 +02:00
|
|
|
if (ndef->get(c).walkable)
|
2013-04-06 17:19:59 +02:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2013-06-22 23:27:48 +02:00
|
|
|
// N.B. It is necessary to search downward since ridge_heightmap[i]
|
2013-04-06 17:19:59 +02:00
|
|
|
// might not be the actual height, just the lowest part in the chunk
|
|
|
|
// where a ridge had been carved
|
|
|
|
u32 i = vm->m_area.index(x, y, z);
|
|
|
|
for (; y >= node_min.Y; y--) {
|
2013-04-21 06:11:05 +02:00
|
|
|
content_t c = vm->m_data[i].getContent();
|
2013-04-21 21:47:13 +02:00
|
|
|
if (ndef->get(c).walkable)
|
2013-04-06 17:19:59 +02:00
|
|
|
break;
|
|
|
|
vm->m_area.add_y(em, i, -1);
|
|
|
|
}
|
|
|
|
|
2013-04-21 21:47:13 +02:00
|
|
|
if (y != node_min.Y - 1 && y >= water_level) {
|
2013-04-06 17:19:59 +02:00
|
|
|
ridge_heightmap[index] = y; //update ridgeheight
|
|
|
|
ntopnodes = biome->top_depth;
|
|
|
|
for (; y <= node_max.Y && ntopnodes; y++) {
|
|
|
|
ntopnodes--;
|
|
|
|
vm->m_data[i] = MapNode(biome->c_top);
|
|
|
|
vm->m_area.add_y(em, i, 1);
|
|
|
|
}
|
2013-04-21 21:47:13 +02:00
|
|
|
// If dirt, grow grass on it.
|
2013-04-28 04:40:52 +02:00
|
|
|
if (y > water_level - 10 &&
|
|
|
|
vm->m_data[i].getContent() == CONTENT_AIR) {
|
2013-04-21 21:47:13 +02:00
|
|
|
vm->m_area.add_y(em, i, -1);
|
|
|
|
if (vm->m_data[i].getContent() == c_dirt)
|
|
|
|
vm->m_data[i] = MapNode(c_dirt_with_grass);
|
|
|
|
}
|
2013-04-06 17:19:59 +02:00
|
|
|
}
|
|
|
|
|
2013-04-21 21:47:13 +02:00
|
|
|
//////////////////// Now, add top nodes on top of the ridge
|
2013-04-06 17:19:59 +02:00
|
|
|
y = heightmap[index];
|
2013-04-21 21:47:13 +02:00
|
|
|
if (y > node_max.Y) {
|
|
|
|
y = node_max.Y; // Let's see if we can still go downward anyway
|
|
|
|
u32 vi = vm->m_area.index(x, y, z);
|
|
|
|
content_t c = vm->m_data[vi].getContent();
|
|
|
|
if (ndef->get(c).walkable)
|
|
|
|
continue;
|
|
|
|
}
|
2013-04-06 17:19:59 +02:00
|
|
|
|
|
|
|
i = vm->m_area.index(x, y, z);
|
|
|
|
for (; y >= node_min.Y; y--) {
|
2013-04-21 06:11:05 +02:00
|
|
|
content_t c = vm->m_data[i].getContent();
|
2013-04-21 21:47:13 +02:00
|
|
|
if (ndef->get(c).walkable)
|
2013-04-06 17:19:59 +02:00
|
|
|
break;
|
|
|
|
vm->m_area.add_y(em, i, -1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (y != node_min.Y - 1) {
|
|
|
|
ntopnodes = biome->top_depth;
|
|
|
|
// Let's see if we've already added it...
|
|
|
|
if (y == ridge_heightmap[index] + ntopnodes - 1)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
for (; y <= node_max.Y && ntopnodes; y++) {
|
|
|
|
ntopnodes--;
|
|
|
|
vm->m_data[i] = MapNode(biome->c_top);
|
|
|
|
vm->m_area.add_y(em, i, 1);
|
|
|
|
}
|
2013-04-21 21:47:13 +02:00
|
|
|
// If dirt, grow grass on it.
|
2013-04-28 04:40:52 +02:00
|
|
|
if (y > water_level - 10 &&
|
|
|
|
vm->m_data[i].getContent() == CONTENT_AIR) {
|
2013-04-06 17:19:59 +02:00
|
|
|
vm->m_area.add_y(em, i, -1);
|
2013-04-21 21:47:13 +02:00
|
|
|
if (vm->m_data[i].getContent() == c_dirt)
|
|
|
|
vm->m_data[i] = MapNode(c_dirt_with_grass);
|
2013-04-06 17:19:59 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-07-06 08:21:35 +02:00
|
|
|
#endif
|
2013-04-21 06:11:05 +02:00
|
|
|
|
2013-04-21 21:47:13 +02:00
|
|
|
|
2014-02-04 04:42:10 +01:00
|
|
|
NoiseParams nparams_v7_def_cave(6, 6.0, v3f(250.0, 250.0, 250.0), 34329, 3, 0.50);
|
|
|
|
|
2013-04-21 06:11:05 +02:00
|
|
|
void MapgenV7::generateCaves(int max_stone_y) {
|
|
|
|
PseudoRandom ps(blockseed + 21343);
|
|
|
|
|
|
|
|
int volume_nodes = (node_max.X - node_min.X + 1) *
|
2013-04-28 04:40:52 +02:00
|
|
|
(node_max.Y - node_min.Y + 1) *
|
|
|
|
(node_max.Z - node_min.Z + 1);
|
2014-02-04 04:42:10 +01:00
|
|
|
float cave_amount = NoisePerlin2D(&nparams_v7_def_cave,
|
2013-04-21 06:11:05 +02:00
|
|
|
node_min.X, node_min.Y, seed);
|
2013-04-28 04:40:52 +02:00
|
|
|
|
|
|
|
u32 caves_count = MYMAX(0.0, cave_amount) * volume_nodes / 250000;
|
2013-04-21 06:11:05 +02:00
|
|
|
for (u32 i = 0; i < caves_count; i++) {
|
2013-04-28 04:40:52 +02:00
|
|
|
CaveV7 cave(this, &ps, false);
|
2013-04-21 06:11:05 +02:00
|
|
|
cave.makeCave(node_min, node_max, max_stone_y);
|
|
|
|
}
|
2013-04-28 04:40:52 +02:00
|
|
|
|
|
|
|
u32 bruises_count = (ps.range(1, 8) == 1) ? ps.range(0, ps.range(0, 2)) : 1;
|
2013-04-21 06:11:05 +02:00
|
|
|
for (u32 i = 0; i < bruises_count; i++) {
|
2013-04-28 04:40:52 +02:00
|
|
|
CaveV7 cave(this, &ps, true);
|
2013-04-21 06:11:05 +02:00
|
|
|
cave.makeCave(node_min, node_max, max_stone_y);
|
2014-02-04 04:42:10 +01:00
|
|
|
}
|
2013-04-21 06:11:05 +02:00
|
|
|
}
|