summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-11-23 15:10:55 +0100
committerMattes D <github@xoft.cz>2014-11-23 15:10:55 +0100
commit9f4342434b7a34d0a9523e68b3d13a9eeeb116ca (patch)
tree768d86de19a4bbd38d9ccd66588440a969ba1dbe /src
parentMerge remote-tracking branch 'origin/master' into GeneratorShapeRefactor (diff)
downloadcuberite-9f4342434b7a34d0a9523e68b3d13a9eeeb116ca.tar
cuberite-9f4342434b7a34d0a9523e68b3d13a9eeeb116ca.tar.gz
cuberite-9f4342434b7a34d0a9523e68b3d13a9eeeb116ca.tar.bz2
cuberite-9f4342434b7a34d0a9523e68b3d13a9eeeb116ca.tar.lz
cuberite-9f4342434b7a34d0a9523e68b3d13a9eeeb116ca.tar.xz
cuberite-9f4342434b7a34d0a9523e68b3d13a9eeeb116ca.tar.zst
cuberite-9f4342434b7a34d0a9523e68b3d13a9eeeb116ca.zip
Diffstat (limited to '')
-rw-r--r--src/Generating/Noise3DGenerator.cpp4
-rw-r--r--src/Generating/Noise3DGenerator.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Generating/Noise3DGenerator.cpp b/src/Generating/Noise3DGenerator.cpp
index fe6c9bdaf..a7af87bac 100644
--- a/src/Generating/Noise3DGenerator.cpp
+++ b/src/Generating/Noise3DGenerator.cpp
@@ -537,7 +537,7 @@ cBiomalNoise3DComposable::cBiomalNoise3DComposable(int a_Seed, cBiomeGenPtr a_Bi
{
for (int x = 0; x <= AVERAGING_SIZE * 2; x++)
{
- m_Weight[z][x] = static_cast<NOISE_DATATYPE>((5 - std::abs(5 - x)) + (5 - std::abs(5 - z)));
+ m_Weight[z][x] = static_cast<NOISE_DATATYPE>((AVERAGING_SIZE - std::abs(AVERAGING_SIZE - x)) + (AVERAGING_SIZE - std::abs(AVERAGING_SIZE - z)));
m_WeightSum += m_Weight[z][x];
}
}
@@ -715,7 +715,7 @@ void cBiomalNoise3DComposable::GetBiomeParams(EMCSBiome a_Biome, NOISE_DATATYPE
{
switch (a_Biome)
{
- case biBeach: a_HeightAmp = 0.3f; a_MidPoint = 62; break;
+ case biBeach: a_HeightAmp = 0.2f; a_MidPoint = 60; break;
case biBirchForest: a_HeightAmp = 0.1f; a_MidPoint = 64; break;
case biBirchForestHills: a_HeightAmp = 0.075f; a_MidPoint = 68; break;
case biBirchForestHillsM: a_HeightAmp = 0.075f; a_MidPoint = 68; break;
diff --git a/src/Generating/Noise3DGenerator.h b/src/Generating/Noise3DGenerator.h
index 1bc7f3fa1..35b1e4c94 100644
--- a/src/Generating/Noise3DGenerator.h
+++ b/src/Generating/Noise3DGenerator.h
@@ -144,8 +144,8 @@ public:
void Initialize(cIniFile & a_IniFile);
protected:
- /** Number of columns around the pixel to query for biomes for averaging. */
- static const int AVERAGING_SIZE = 5;
+ /** Number of columns around the pixel to query for biomes for averaging. Must be less than or equal to 16. */
+ static const int AVERAGING_SIZE = 9;
/** Type used for a single parameter across the entire (downscaled) chunk. */
typedef NOISE_DATATYPE ChunkParam[5 * 5];