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

Merge pull request #1879 from mc-server/DynamicThreshold

Browse Source 
Changed Nether composition to change the threshold from a cubic noise
This commit is contained in:
Mattes D 2015-04-21 23:09:27 +02:00
commit 0ff7514351
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Generating/CompoGen.cpp
View File

@ -218,7 +218,7 @@ void cCompoGenClassic::InitializeCompoGen(cIniFile & a_IniFile)
cCompoGenNether::cCompoGenNether(int a_Seed) : cCompoGenNether::cCompoGenNether(int a_Seed) :
m_Noise1(a_Seed + 10), m_Noise1(a_Seed + 10),
m_Noise2(a_Seed * a_Seed * 10 + a_Seed * 1000 + 6000), m_Noise2(a_Seed * a_Seed * 10 + a_Seed * 1000 + 6000),
m_Threshold(0) m_MaxThreshold(25000)
{ {
} }
@ -282,17 +282,16 @@ void cCompoGenNether::ComposeTerrain(cChunkDesc & a_ChunkDesc, const cChunkDesc:
// Interpolate between FloorLo and FloorHi: // Interpolate between FloorLo and FloorHi:
for (int z = 0; z < 16; z++) for (int x = 0; x < 16; x++) for (int z = 0; z < 16; z++) for (int x = 0; x < 16; x++)
{ {
int Threshold = static_cast<int>(m_Noise1.CubicNoise2D(static_cast<float>(BaseX + x) / 75, static_cast<float>(BaseZ + z) / 75) * m_MaxThreshold);
int Lo = FloorLo[x + 17 * z] / 256; int Lo = FloorLo[x + 17 * z] / 256;
int Hi = FloorHi[x + 17 * z] / 256; int Hi = FloorHi[x + 17 * z] / 256;
for (int y = 0; y < SEGMENT_HEIGHT; y++) for (int y = 0; y < SEGMENT_HEIGHT; y++)
{ {
int Val = Lo + (Hi - Lo) * y / SEGMENT_HEIGHT; int Val = Lo + (Hi - Lo) * y / SEGMENT_HEIGHT;
BLOCKTYPE Block = E_BLOCK_AIR; if (Val < Threshold) // Don't calculate if the block should be Netherrack when it's already decided that it's air.
if (Val < m_Threshold) // Don't calculate if the block should be Netherrack or Soulsand when it's already decided that it's air.
{ {
Block = E_BLOCK_NETHERRACK; a_ChunkDesc.SetBlockType(x, y + Segment, z, E_BLOCK_NETHERRACK);
} }
a_ChunkDesc.SetBlockType(x, y + Segment, z, Block);
} }
} }
@ -329,7 +328,7 @@ void cCompoGenNether::ComposeTerrain(cChunkDesc & a_ChunkDesc, const cChunkDesc:
void cCompoGenNether::InitializeCompoGen(cIniFile & a_IniFile) void cCompoGenNether::InitializeCompoGen(cIniFile & a_IniFile)
{ {
m_Threshold = a_IniFile.GetValueSetI("Generator", "NetherThreshold", m_Threshold); m_MaxThreshold = a_IniFile.GetValueSetF("Generator", "NetherMaxThreshold", m_MaxThreshold);
} }

2
src/Generating/CompoGen.h
View File

@ -99,7 +99,7 @@ protected:
cNoise m_Noise1; cNoise m_Noise1;
cNoise m_Noise2; cNoise m_Noise2;
int m_Threshold; double m_MaxThreshold;
// cTerrainCompositionGen overrides: // cTerrainCompositionGen overrides:
virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc, const cChunkDesc::Shape & a_Shape) override; virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc, const cChunkDesc::Shape & a_Shape) override;