diff options
author | Mattes D <github@xoft.cz> | 2014-11-20 09:26:05 +0100 |
---|---|---|
committer | Mattes D <github@xoft.cz> | 2014-11-20 09:26:05 +0100 |
commit | f1bddc607c2e68cd9ef940c47403bb2948aad46d (patch) | |
tree | 9782ecbd191d4c8d9d082b23c2043adb2ac6a7d8 /src/Generating/Noise3DGenerator.h | |
parent | Merge pull request #1598 from mc-server/SignEditor (diff) | |
parent | cInterpolNoise: Implemented optimized 2D generating. (diff) | |
download | cuberite-f1bddc607c2e68cd9ef940c47403bb2948aad46d.tar cuberite-f1bddc607c2e68cd9ef940c47403bb2948aad46d.tar.gz cuberite-f1bddc607c2e68cd9ef940c47403bb2948aad46d.tar.bz2 cuberite-f1bddc607c2e68cd9ef940c47403bb2948aad46d.tar.lz cuberite-f1bddc607c2e68cd9ef940c47403bb2948aad46d.tar.xz cuberite-f1bddc607c2e68cd9ef940c47403bb2948aad46d.tar.zst cuberite-f1bddc607c2e68cd9ef940c47403bb2948aad46d.zip |
Diffstat (limited to 'src/Generating/Noise3DGenerator.h')
-rw-r--r-- | src/Generating/Noise3DGenerator.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/Generating/Noise3DGenerator.h b/src/Generating/Noise3DGenerator.h index ba541fbcc..07767ba84 100644 --- a/src/Generating/Noise3DGenerator.h +++ b/src/Generating/Noise3DGenerator.h @@ -13,7 +13,8 @@ #pragma once #include "ComposableGenerator.h" -#include "../Noise.h" +#include "../Noise/Noise.h" +#include "../Noise/InterpolNoise.h" @@ -34,17 +35,20 @@ public: protected: // Linear interpolation step sizes, must be divisors of cChunkDef::Width and cChunkDef::Height, respectively: - static const int UPSCALE_X = 8; - static const int UPSCALE_Y = 4; - static const int UPSCALE_Z = 8; + static const int UPSCALE_X = 4; + static const int UPSCALE_Y = 8; + static const int UPSCALE_Z = 4; // Linear interpolation buffer dimensions, calculated from the step sizes: static const int DIM_X = 1 + cChunkDef::Width / UPSCALE_X; static const int DIM_Y = 1 + cChunkDef::Height / UPSCALE_Y; static const int DIM_Z = 1 + cChunkDef::Width / UPSCALE_Z; - cPerlinNoise m_Perlin; // The base 3D noise source for the actual composition - cCubicNoise m_Cubic; // The noise used for heightmap directing + /** The base 3D noise source for the actual composition */ + cOctavedNoise<cInterp5DegNoise> m_Perlin; + + /** The noise used for heightmap directing. */ + cOctavedNoise<cInterp5DegNoise> m_Cubic; int m_SeaLevel; NOISE_DATATYPE m_HeightAmplification; |