summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-11-20 14:45:20 +0100
committerMattes D <github@xoft.cz>2014-11-20 14:45:20 +0100
commit5325885ef49c57ecc7d7f071fc29df6c55467eb5 (patch)
tree83b360e98359c80e1ea8e7535098c163acfed77d /src
parentMerge remote-tracking branch 'origin/master' into GeneratorShapeRefactor (diff)
downloadcuberite-5325885ef49c57ecc7d7f071fc29df6c55467eb5.tar
cuberite-5325885ef49c57ecc7d7f071fc29df6c55467eb5.tar.gz
cuberite-5325885ef49c57ecc7d7f071fc29df6c55467eb5.tar.bz2
cuberite-5325885ef49c57ecc7d7f071fc29df6c55467eb5.tar.lz
cuberite-5325885ef49c57ecc7d7f071fc29df6c55467eb5.tar.xz
cuberite-5325885ef49c57ecc7d7f071fc29df6c55467eb5.tar.zst
cuberite-5325885ef49c57ecc7d7f071fc29df6c55467eb5.zip
Diffstat (limited to '')
-rw-r--r--src/Generating/CompoGenBiomal.cpp2
-rw-r--r--src/Generating/Noise3DGenerator.h18
2 files changed, 10 insertions, 10 deletions
diff --git a/src/Generating/CompoGenBiomal.cpp b/src/Generating/CompoGenBiomal.cpp
index 0bb7f4802..38c91c0d2 100644
--- a/src/Generating/CompoGenBiomal.cpp
+++ b/src/Generating/CompoGenBiomal.cpp
@@ -6,7 +6,7 @@
#include "Globals.h"
#include "ComposableGenerator.h"
#include "../IniFile.h"
-#include "../Noise.h"
+#include "../Noise/Noise.h"
#include "../LinearUpscale.h"
diff --git a/src/Generating/Noise3DGenerator.h b/src/Generating/Noise3DGenerator.h
index 7822a9efa..54429b42b 100644
--- a/src/Generating/Noise3DGenerator.h
+++ b/src/Generating/Noise3DGenerator.h
@@ -81,17 +81,17 @@ public:
void Initialize(cIniFile & a_IniFile);
protected:
- /** The noise that is used to choose between density noise A and B. */
- cPerlinNoise m_ChoiceNoise;
+ /** The 3D noise that is used to choose between density noise A and B. */
+ cOctavedNoise<cInterpolNoise<Interp5Deg>> m_ChoiceNoise;
/** Density 3D noise, variant A. */
- cPerlinNoise m_DensityNoiseA;
+ cOctavedNoise<cInterpolNoise<Interp5Deg>> m_DensityNoiseA;
/** Density 3D noise, variant B. */
- cPerlinNoise m_DensityNoiseB;
+ cOctavedNoise<cInterpolNoise<Interp5Deg>> m_DensityNoiseB;
/** Heightmap-like noise used to provide variance for low-amplitude biomes. */
- cPerlinNoise m_BaseNoise;
+ cOctavedNoise<cInterpolNoise<Interp5Deg>> m_BaseNoise;
/** Block height of the sealevel, used for composing the terrain. */
int m_SeaLevel;
@@ -155,16 +155,16 @@ protected:
/** The noise that is used to choose between density noise A and B. */
- cPerlinNoise m_ChoiceNoise;
+ cOctavedNoise<cInterpolNoise<Interp5Deg>> m_ChoiceNoise;
/** Density 3D noise, variant A. */
- cPerlinNoise m_DensityNoiseA;
+ cOctavedNoise<cInterpolNoise<Interp5Deg>> m_DensityNoiseA;
/** Density 3D noise, variant B. */
- cPerlinNoise m_DensityNoiseB;
+ cOctavedNoise<cInterpolNoise<Interp5Deg>> m_DensityNoiseB;
/** Heightmap-like noise used to provide variance for low-amplitude biomes. */
- cPerlinNoise m_BaseNoise;
+ cOctavedNoise<cInterpolNoise<Interp5Deg>> m_BaseNoise;
/** The underlying biome generator. */
cBiomeGenPtr m_BiomeGen;