summaryrefslogtreecommitdiffstats
path: root/src/Generating
diff options
context:
space:
mode:
authorSTRWarrior <niels.breuker@hotmail.nl>2014-07-20 16:23:45 +0200
committerSTRWarrior <niels.breuker@hotmail.nl>2014-07-20 16:23:45 +0200
commit7bf9da74413c69cbd79a9db81ba098e13b847904 (patch)
treee70ab8bf3ac4824cac31ae28e2f77eaa12ecdc33 /src/Generating
parentPass cItem by reference. (diff)
downloadcuberite-7bf9da74413c69cbd79a9db81ba098e13b847904.tar
cuberite-7bf9da74413c69cbd79a9db81ba098e13b847904.tar.gz
cuberite-7bf9da74413c69cbd79a9db81ba098e13b847904.tar.bz2
cuberite-7bf9da74413c69cbd79a9db81ba098e13b847904.tar.lz
cuberite-7bf9da74413c69cbd79a9db81ba098e13b847904.tar.xz
cuberite-7bf9da74413c69cbd79a9db81ba098e13b847904.tar.zst
cuberite-7bf9da74413c69cbd79a9db81ba098e13b847904.zip
Diffstat (limited to 'src/Generating')
-rw-r--r--src/Generating/ComposableGenerator.cpp4
-rw-r--r--src/Generating/FinishGen.cpp32
-rw-r--r--src/Generating/FinishGen.h38
3 files changed, 74 insertions, 0 deletions
diff --git a/src/Generating/ComposableGenerator.cpp b/src/Generating/ComposableGenerator.cpp
index 7b6234161..21626e76b 100644
--- a/src/Generating/ComposableGenerator.cpp
+++ b/src/Generating/ComposableGenerator.cpp
@@ -338,6 +338,10 @@ void cComposableGenerator::InitFinishGens(cIniFile & a_IniFile)
float Threshold = (float)a_IniFile.GetValueSetF("Generator", "DualRidgeCavesThreshold", 0.3);
m_FinishGens.push_back(new cStructGenDualRidgeCaves(Seed, Threshold));
}
+ else if (NoCaseCompare(*itr, "Foliage") == 0)
+ {
+ m_FinishGens.push_back(new cFinishGenFoliage(Seed));
+ }
else if (NoCaseCompare(*itr, "Ice") == 0)
{
m_FinishGens.push_back(new cFinishGenIce);
diff --git a/src/Generating/FinishGen.cpp b/src/Generating/FinishGen.cpp
index f2d66af70..06c1dcbbe 100644
--- a/src/Generating/FinishGen.cpp
+++ b/src/Generating/FinishGen.cpp
@@ -160,6 +160,38 @@ void cFinishGenNetherClumpFoliage::TryPlaceClump(cChunkDesc & a_ChunkDesc, int a
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// cFinishGenFoliage:
+
+void cFinishGenFoliage::GenFinish(cChunkDesc & a_ChunkDesc)
+{
+ for (int x = 1; x < cChunkDef::Width; x++)
+ {
+ int xx = x + a_ChunkDesc.GetChunkX();
+ for (int z = 1; z < cChunkDef::Width; z++)
+ {
+ int zz = z + a_ChunkDesc.GetChunkZ();
+ //if (true)
+ if (m_Noise.CubicNoise2D((float) xx + m_Noise.CubicNoise1D(xx), zz + m_Noise.CubicNoise1D(zz)) < GetBiomeDensity(a_ChunkDesc.GetBiome(x, z)))
+ {
+ for (int y = a_ChunkDesc.GetHeight(x, z) + 1; y >= 1; y--)
+ {
+ if (
+ (a_ChunkDesc.GetBlockType(x, y, z) == E_BLOCK_AIR) &&
+ (a_ChunkDesc.GetBlockType(x, y - 1, z) == E_BLOCK_GRASS)
+ )
+ {
+ a_ChunkDesc.SetBlockTypeMeta(x, y, z, E_BLOCK_TALL_GRASS, m_Noise.CubicNoise2D(xx * 100, zz * 100) > -0.2 ? 1 : 2);
+ }
+ }
+ }
+ }
+ }
+}
+
+
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// cFinishGenSprinkleFoliage:
bool cFinishGenSprinkleFoliage::TryAddSugarcane(cChunkDesc & a_ChunkDesc, int a_RelX, int a_RelY, int a_RelZ)
diff --git a/src/Generating/FinishGen.h b/src/Generating/FinishGen.h
index 2e5732929..ea322c7ae 100644
--- a/src/Generating/FinishGen.h
+++ b/src/Generating/FinishGen.h
@@ -69,6 +69,44 @@ protected:
+class cFinishGenFoliage :
+ public cFinishGen
+{
+public:
+ cFinishGenFoliage(int a_Seed) : m_Noise(a_Seed), m_Seed(a_Seed) {}
+
+protected:
+ cNoise m_Noise;
+ int m_Seed;
+
+ // cFinishGen override:
+ virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
+
+ float GetBiomeDensity(EMCSBiome a_Biome)
+ {
+ switch (a_Biome)
+ {
+ case biSavanna:
+ case biSavannaM:
+ case biSavannaPlateau:
+ case biSavannaPlateauM:
+ case biPlains:
+ {
+ return 0.0;
+ }
+ default:
+ {
+ return -0.4;
+ }
+ }
+ return -0.3;
+ }
+};
+
+
+
+
+
class cFinishGenSprinkleFoliage :
public cFinishGen
{