flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Added cFinishGenNetherSprinkleFoliage.

Browse Source
This commit is contained in:
STRWarrior 2014-01-10 16:31:45 +01:00
parent 36c100a53e
commit 82a06725bd
3 changed files with 73 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Generating/ComposableGenerator.cpp
View File

@ -402,9 +402,9 @@ void cComposableGenerator::InitStructureGens(cIniFile & a_IniFile)
void cComposableGenerator::InitFinishGens(cIniFile & a_IniFile)
{
int Seed = m_ChunkGenerator.GetSeed();
AString Structures = a_IniFile.GetValueSet("Generator", "Finishers", "SprinkleFoliage,Ice,Snow,Lilypads,BottomLava,DeadBushes,PreSimulator");
AString Finishers = a_IniFile.GetValueSet("Generator", "Finishers", "SprinkleFoliage,Ice,Snow,Lilypads,BottomLava,DeadBushes,PreSimulator");
AStringVector Str = StringSplitAndTrim(Structures, ",");
AStringVector Str = StringSplitAndTrim(Finishers, ",");
for (AStringVector::const_iterator itr = Str.begin(); itr != Str.end(); ++itr)
{
// Finishers, alpha-sorted:
@ -442,6 +442,10 @@ void cComposableGenerator::InitFinishGens(cIniFile & a_IniFile)
{
m_FinishGens.push_back(new cFinishGenSprinkleFoliage(Seed));
}
else if (NoCaseCompare(*itr, "NetherSprinkleFoliage") == 0)
{
m_FinishGens.push_back(new cFinishGenNetherSprinkleFoliage(Seed));
}
else if (NoCaseCompare(*itr, "WaterSprings") == 0)
{
m_FinishGens.push_back(new cFinishGenFluidSprings(Seed, E_BLOCK_WATER, a_IniFile, *m_World));

45
src/Generating/FinishGen.cpp
View File

@ -39,6 +39,51 @@ static inline bool IsWater(BLOCKTYPE a_BlockType)
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// cFinishGenNetherSprinkleFoliage:
void cFinishGenNetherSprinkleFoliage::GenFinish(cChunkDesc & a_ChunkDesc)
{
double ChunkX = a_ChunkDesc.GetChunkX() + 0.5; // We can't devide through 0 so lets add 0.5 to all the chunk coordinates.
double ChunkZ = a_ChunkDesc.GetChunkZ() + 0.5;
for (int z = 0; z < cChunkDef::Width; z++)
{
for (int x = 0; x < cChunkDef::Width; x++)
{
for (int y = 1; y < cChunkDef::Height; y++)
{
if (!g_BlockIsSolid[a_ChunkDesc.GetBlockType(x, y - 1, z)]) // Only place on solid blocks
{
continue;
}
if (a_ChunkDesc.GetBlockType(x, y, z) != E_BLOCK_AIR)
{
continue;
}
NOISE_DATATYPE Val = m_Noise.CubicNoise1D((float) ((ChunkX * x) * (ChunkZ * z) * y));
if (Val < -0.98)
{
a_ChunkDesc.SetBlockType(x, y, z, E_BLOCK_BROWN_MUSHROOM);
}
else if (Val < -0.96)
{
a_ChunkDesc.SetBlockType(x, y, z, E_BLOCK_RED_MUSHROOM);
}
else if (Val < -0.94)
{
a_ChunkDesc.SetBlockType(x, y, z, E_BLOCK_FIRE);
}
}
}
}
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// cFinishGenSprinkleFoliage:

22
src/Generating/FinishGen.h
View File

@ -47,6 +47,27 @@ protected:
class cFinishGenNetherSprinkleFoliage :
public cFinishGen
{
public:
cFinishGenNetherSprinkleFoliage(int a_Seed) :
m_Noise(a_Seed),
m_Seed(a_Seed)
{
}
protected:
cNoise m_Noise;
int m_Seed;
virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
} ;
class cFinishGenSprinkleFoliage :
public cFinishGen
{
@ -117,6 +138,7 @@ public:
{
}
int GetLevel(void) const { return m_Level; }
protected:
int m_Level;