1 files changed, 285 insertions, 285 deletions

diff --git a/source/FinishGen.cpp b/source/FinishGen.cpp
index 9761d4373..eac4a6c02 100644
--- a/source/FinishGen.cpp
+++ b/source/FinishGen.cpp
@@ -1,285 +1,285 @@
-

-// FinishGen.cpp

-

-/* Implements the various finishing generators:

-	- cFinishGenSnow

-	- cFinishGenIce

-	- cFinishGenSprinkleFoliage

-*/

-

-#include "Globals.h"

-

-#include "FinishGen.h"

-#include "cNoise.h"

-#include "BlockID.h"

-

-

-

-

-

-static inline bool IsWater(BLOCKTYPE a_BlockType)

-{

-	return (a_BlockType == E_BLOCK_STATIONARY_WATER) || (a_BlockType == E_BLOCK_WATER);

-}

-

-

-

-

-

-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

-// cFinishGenSprinkleFoliage:

-

-bool cFinishGenSprinkleFoliage::TryAddSugarcane(

-	int a_ChunkX, int a_ChunkZ,

-	int a_RelX, int a_RelY, int a_RelZ,

-	cChunkDef::BlockTypes & a_BlockTypes,

-	cChunkDef::BlockNibbles & a_BlockMeta

-)

-{

-	// We'll be doing comparison to neighbors, so require the coords to be 1 block away from the chunk edges:

-	if (

-		(a_RelX < 1) || (a_RelX >= cChunkDef::Width  - 1) ||

-		(a_RelY < 1) || (a_RelY >= cChunkDef::Height - 2) ||

-		(a_RelZ < 1) || (a_RelZ >= cChunkDef::Width  - 1)

-	)

-	{

-		return false;

-	}

-

-	// Only allow dirt, grass or sand below sugarcane:

-	switch (cChunkDef::GetBlock(a_BlockTypes, a_RelX, a_RelY, a_RelZ))

-	{

-		case E_BLOCK_DIRT:

-		case E_BLOCK_GRASS:

-		case E_BLOCK_SAND:

-		{

-			break;

-		}

-		default:

-		{

-			return false;

-		}

-	}

-

-	// Water is required next to the block below the sugarcane:

-	if (

-		!IsWater(cChunkDef::GetBlock(a_BlockTypes, a_RelX - 1, a_RelY, a_RelZ)) &&

-		!IsWater(cChunkDef::GetBlock(a_BlockTypes, a_RelX + 1, a_RelY, a_RelZ)) &&

-		!IsWater(cChunkDef::GetBlock(a_BlockTypes, a_RelX    , a_RelY, a_RelZ - 1)) &&

-		!IsWater(cChunkDef::GetBlock(a_BlockTypes, a_RelX    , a_RelY, a_RelZ + 1))

-	)

-	{

-		return false;

-	}

-	

-	// All conditions met, place a sugarcane here:

-	cChunkDef::SetBlock(a_BlockTypes, a_RelX, a_RelY + 1, a_RelZ, E_BLOCK_SUGARCANE);

-	return true;

-}

-

-

-

-

-

-void cFinishGenSprinkleFoliage::GenFinish(

-	int a_ChunkX, int a_ChunkZ,

-	cChunkDef::BlockTypes & a_BlockTypes,    // Block types to read and change

-	cChunkDef::BlockNibbles & a_BlockMeta,   // Block meta to read and change

-	cChunkDef::HeightMap & a_HeightMap,      // Height map to read and change by the current data

-	const cChunkDef::BiomeMap & a_BiomeMap,  // Biomes to adhere to

-	cEntityList & a_Entities,                // Entities may be added or deleted

-	cBlockEntityList & a_BlockEntities       // Block entities may be added or deleted

-	)

-{

-	// Generate small foliage (1-block):

-	

-	// TODO: Update heightmap with 1-block-tall foliage

-	cNoise Noise(m_Seed);

-	for (int z = 0; z < cChunkDef::Width; z++) 

-	{

-		int BlockZ = a_ChunkZ * cChunkDef::Width + z;

-		const float zz = (float)BlockZ;

-		for (int x = 0; x < cChunkDef::Width; x++)

-		{

-			int BlockX = a_ChunkX * cChunkDef::Width + x;

-			if (((Noise.IntNoise2DInt(BlockX, BlockZ) / 8) % 128) < 124)

-			{

-				continue;

-			}

-			int Top = cChunkDef::GetHeight(a_HeightMap, x, z);

-			if (Top > 250)

-			{

-				// Nothing grows above Y=250

-				continue;

-			}

-			if (cChunkDef::GetBlock(a_BlockTypes, x, Top + 1, z) != E_BLOCK_AIR)

-			{

-				// Space already taken by something else, don't grow here

-				// WEIRD, since we're using heightmap, so there should NOT be anything above it

-				continue;

-			}

-			

-			const float xx = (float)BlockX;

-			float val1 = Noise.CubicNoise2D(xx * 0.1f,  zz * 0.1f );

-			float val2 = Noise.CubicNoise2D(xx * 0.01f, zz * 0.01f );

-			switch (cChunkDef::GetBlock(a_BlockTypes, x, Top, z))

-			{

-				case E_BLOCK_GRASS:

-				{

-					float val3 = Noise.CubicNoise2D(xx * 0.01f + 10, zz * 0.01f + 10 );

-					float val4 = Noise.CubicNoise2D(xx * 0.05f + 20, zz * 0.05f + 20 );

-					if (val1 + val2 > 0.2f)

-					{

-						cChunkDef::SetBlock(a_BlockTypes, x, ++Top, z, E_BLOCK_YELLOW_FLOWER);

-					}

-					else if (val2 + val3 > 0.2f)

-					{

-						cChunkDef::SetBlock(a_BlockTypes, x, ++Top, z, E_BLOCK_RED_ROSE);

-					}

-					else if (val3 + val4 > 0.2f)

-					{

-						cChunkDef::SetBlock(a_BlockTypes, x, ++Top, z, E_BLOCK_RED_MUSHROOM);

-					}

-					else if (val1 + val4 > 0.2f)

-					{

-						cChunkDef::SetBlock(a_BlockTypes, x, ++Top, z, E_BLOCK_BROWN_MUSHROOM);

-					}

-					else if (val1 + val2 + val3 + val4 < -0.1)

-					{

-						cChunkDef::SetBlock (a_BlockTypes, x, ++Top, z, E_BLOCK_TALL_GRASS);

-						cChunkDef::SetNibble(a_BlockMeta,  x,   Top, z, E_META_TALL_GRASS_GRASS);

-					}

-					else if (TryAddSugarcane(a_ChunkX, a_ChunkZ, x, Top, z, a_BlockTypes, a_BlockMeta))

-					{

-						++Top;

-					}

-					else if ((val1 > 0.5) && (val2 < -0.5))

-					{

-						cChunkDef::SetBlock (a_BlockTypes, x, ++Top, z, E_BLOCK_PUMPKIN);

-						cChunkDef::SetNibble(a_BlockMeta,  x,   Top, z, (int)(val3 * 8) % 4);

-					}

-					break;

-				}  // case E_BLOCK_GRASS

-				

-				case E_BLOCK_SAND:

-				{

-					int y = Top + 1;

-					if (

-						(x > 0) && (x < cChunkDef::Width - 1) &&

-						(z > 0) && (z < cChunkDef::Width - 1) &&

-						(val1 + val2 > 0.5f) &&

-						(cChunkDef::GetBlock(a_BlockTypes, x + 1, y, z)     == E_BLOCK_AIR) &&

-						(cChunkDef::GetBlock(a_BlockTypes, x - 1, y, z)     == E_BLOCK_AIR) &&

-						(cChunkDef::GetBlock(a_BlockTypes, x,     y, z + 1) == E_BLOCK_AIR) &&

-						(cChunkDef::GetBlock(a_BlockTypes, x,     y, z - 1) == E_BLOCK_AIR)

-					)

-					{

-						cChunkDef::SetBlock(a_BlockTypes, x, ++Top, z, E_BLOCK_CACTUS);

-					}

-					else if (TryAddSugarcane(a_ChunkX, a_ChunkZ, x, Top, z, a_BlockTypes, a_BlockMeta))

-					{

-						++Top;

-					}

-					break;

-				}

-			}  // switch (TopBlock)

-			cChunkDef::SetHeight(a_HeightMap, x, z, Top);

-		}  // for y

-	}  // for z

-}

-

-

-

-

-

-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

-// cFinishGenSnow:

-

-void cFinishGenSnow::GenFinish(

-	int a_ChunkX, int a_ChunkZ,

-	cChunkDef::BlockTypes & a_BlockTypes,    // Block types to read and change

-	cChunkDef::BlockNibbles & a_BlockMeta,   // Block meta to read and change

-	cChunkDef::HeightMap & a_HeightMap,      // Height map to read and change by the current data

-	const cChunkDef::BiomeMap & a_BiomeMap,  // Biomes to adhere to

-	cEntityList & a_Entities,                // Entities may be added or deleted

-	cBlockEntityList & a_BlockEntities       // Block entities may be added or deleted

-	)

-{

-	// Add a snow block in snowy biomes onto blocks that can be snowed over

-	for (int z = 0; z < cChunkDef::Width; z++)

-	{

-		for (int x = 0; x < cChunkDef::Width; x++)

-		{

-			switch (cChunkDef::GetBiome(a_BiomeMap, x, z))

-			{

-				case biIcePlains:

-				case biIceMountains:

-				case biTaiga:

-				case biTaigaHills:

-				case biFrozenRiver:

-				case biFrozenOcean:

-				{

-					int Height = cChunkDef::GetHeight(a_HeightMap, x, z);

-					if (g_BlockIsSnowable[cChunkDef::GetBlock(a_BlockTypes, x, Height, z)])

-					{

-						cChunkDef::SetBlock(a_BlockTypes, x, Height + 1, z, E_BLOCK_SNOW);

-						cChunkDef::SetHeight(a_HeightMap, x, z, Height + 1);

-					}

-					break;

-				}

-			}

-		}

-	}  // for z

-}

-

-

-

-

-

-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

-// cFinishGenIce:

-

-void cFinishGenIce::GenFinish(

-	int a_ChunkX, int a_ChunkZ,

-	cChunkDef::BlockTypes & a_BlockTypes,    // Block types to read and change

-	cChunkDef::BlockNibbles & a_BlockMeta,   // Block meta to read and change

-	cChunkDef::HeightMap & a_HeightMap,      // Height map to read and change by the current data

-	const cChunkDef::BiomeMap & a_BiomeMap,  // Biomes to adhere to

-	cEntityList & a_Entities,                // Entities may be added or deleted

-	cBlockEntityList & a_BlockEntities       // Block entities may be added or deleted

-	)

-{

-	// Turn surface water into ice in icy biomes

-	for (int z = 0; z < cChunkDef::Width; z++)

-	{

-		for (int x = 0; x < cChunkDef::Width; x++)

-		{

-			switch (cChunkDef::GetBiome(a_BiomeMap, x, z))

-			{

-				case biIcePlains:

-				case biIceMountains:

-				case biTaiga:

-				case biTaigaHills:

-				case biFrozenRiver:

-				case biFrozenOcean:

-				{

-					int Height = cChunkDef::GetHeight(a_HeightMap, x, z);

-					switch (cChunkDef::GetBlock(a_BlockTypes, x, Height, z))

-					{

-						case E_BLOCK_WATER:

-						case E_BLOCK_STATIONARY_WATER:

-						{

-							cChunkDef::SetBlock(a_BlockTypes, x, Height, z, E_BLOCK_ICE);

-							break;

-						}

-					}

-					break;

-				}

-			}

-		}

-	}  // for z

-}

-

-

-

-

+
+// FinishGen.cpp
+
+/* Implements the various finishing generators:
+	- cFinishGenSnow
+	- cFinishGenIce
+	- cFinishGenSprinkleFoliage
+*/
+
+#include "Globals.h"
+
+#include "FinishGen.h"
+#include "cNoise.h"
+#include "BlockID.h"
+
+
+
+
+
+static inline bool IsWater(BLOCKTYPE a_BlockType)
+{
+	return (a_BlockType == E_BLOCK_STATIONARY_WATER) || (a_BlockType == E_BLOCK_WATER);
+}
+
+
+
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// cFinishGenSprinkleFoliage:
+
+bool cFinishGenSprinkleFoliage::TryAddSugarcane(
+	int a_ChunkX, int a_ChunkZ,
+	int a_RelX, int a_RelY, int a_RelZ,
+	cChunkDef::BlockTypes & a_BlockTypes,
+	cChunkDef::BlockNibbles & a_BlockMeta
+)
+{
+	// We'll be doing comparison to neighbors, so require the coords to be 1 block away from the chunk edges:
+	if (
+		(a_RelX < 1) || (a_RelX >= cChunkDef::Width  - 1) ||
+		(a_RelY < 1) || (a_RelY >= cChunkDef::Height - 2) ||
+		(a_RelZ < 1) || (a_RelZ >= cChunkDef::Width  - 1)
+	)
+	{
+		return false;
+	}
+
+	// Only allow dirt, grass or sand below sugarcane:
+	switch (cChunkDef::GetBlock(a_BlockTypes, a_RelX, a_RelY, a_RelZ))
+	{
+		case E_BLOCK_DIRT:
+		case E_BLOCK_GRASS:
+		case E_BLOCK_SAND:
+		{
+			break;
+		}
+		default:
+		{
+			return false;
+		}
+	}
+
+	// Water is required next to the block below the sugarcane:
+	if (
+		!IsWater(cChunkDef::GetBlock(a_BlockTypes, a_RelX - 1, a_RelY, a_RelZ)) &&
+		!IsWater(cChunkDef::GetBlock(a_BlockTypes, a_RelX + 1, a_RelY, a_RelZ)) &&
+		!IsWater(cChunkDef::GetBlock(a_BlockTypes, a_RelX    , a_RelY, a_RelZ - 1)) &&
+		!IsWater(cChunkDef::GetBlock(a_BlockTypes, a_RelX    , a_RelY, a_RelZ + 1))
+	)
+	{
+		return false;
+	}
+	
+	// All conditions met, place a sugarcane here:
+	cChunkDef::SetBlock(a_BlockTypes, a_RelX, a_RelY + 1, a_RelZ, E_BLOCK_SUGARCANE);
+	return true;
+}
+
+
+
+
+
+void cFinishGenSprinkleFoliage::GenFinish(
+	int a_ChunkX, int a_ChunkZ,
+	cChunkDef::BlockTypes & a_BlockTypes,    // Block types to read and change
+	cChunkDef::BlockNibbles & a_BlockMeta,   // Block meta to read and change
+	cChunkDef::HeightMap & a_HeightMap,      // Height map to read and change by the current data
+	const cChunkDef::BiomeMap & a_BiomeMap,  // Biomes to adhere to
+	cEntityList & a_Entities,                // Entities may be added or deleted
+	cBlockEntityList & a_BlockEntities       // Block entities may be added or deleted
+	)
+{
+	// Generate small foliage (1-block):
+	
+	// TODO: Update heightmap with 1-block-tall foliage
+	cNoise Noise(m_Seed);
+	for (int z = 0; z < cChunkDef::Width; z++) 
+	{
+		int BlockZ = a_ChunkZ * cChunkDef::Width + z;
+		const float zz = (float)BlockZ;
+		for (int x = 0; x < cChunkDef::Width; x++)
+		{
+			int BlockX = a_ChunkX * cChunkDef::Width + x;
+			if (((Noise.IntNoise2DInt(BlockX, BlockZ) / 8) % 128) < 124)
+			{
+				continue;
+			}
+			int Top = cChunkDef::GetHeight(a_HeightMap, x, z);
+			if (Top > 250)
+			{
+				// Nothing grows above Y=250
+				continue;
+			}
+			if (cChunkDef::GetBlock(a_BlockTypes, x, Top + 1, z) != E_BLOCK_AIR)
+			{
+				// Space already taken by something else, don't grow here
+				// WEIRD, since we're using heightmap, so there should NOT be anything above it
+				continue;
+			}
+			
+			const float xx = (float)BlockX;
+			float val1 = Noise.CubicNoise2D(xx * 0.1f,  zz * 0.1f );
+			float val2 = Noise.CubicNoise2D(xx * 0.01f, zz * 0.01f );
+			switch (cChunkDef::GetBlock(a_BlockTypes, x, Top, z))
+			{
+				case E_BLOCK_GRASS:
+				{
+					float val3 = Noise.CubicNoise2D(xx * 0.01f + 10, zz * 0.01f + 10 );
+					float val4 = Noise.CubicNoise2D(xx * 0.05f + 20, zz * 0.05f + 20 );
+					if (val1 + val2 > 0.2f)
+					{
+						cChunkDef::SetBlock(a_BlockTypes, x, ++Top, z, E_BLOCK_YELLOW_FLOWER);
+					}
+					else if (val2 + val3 > 0.2f)
+					{
+						cChunkDef::SetBlock(a_BlockTypes, x, ++Top, z, E_BLOCK_RED_ROSE);
+					}
+					else if (val3 + val4 > 0.2f)
+					{
+						cChunkDef::SetBlock(a_BlockTypes, x, ++Top, z, E_BLOCK_RED_MUSHROOM);
+					}
+					else if (val1 + val4 > 0.2f)
+					{
+						cChunkDef::SetBlock(a_BlockTypes, x, ++Top, z, E_BLOCK_BROWN_MUSHROOM);
+					}
+					else if (val1 + val2 + val3 + val4 < -0.1)
+					{
+						cChunkDef::SetBlock (a_BlockTypes, x, ++Top, z, E_BLOCK_TALL_GRASS);
+						cChunkDef::SetNibble(a_BlockMeta,  x,   Top, z, E_META_TALL_GRASS_GRASS);
+					}
+					else if (TryAddSugarcane(a_ChunkX, a_ChunkZ, x, Top, z, a_BlockTypes, a_BlockMeta))
+					{
+						++Top;
+					}
+					else if ((val1 > 0.5) && (val2 < -0.5))
+					{
+						cChunkDef::SetBlock (a_BlockTypes, x, ++Top, z, E_BLOCK_PUMPKIN);
+						cChunkDef::SetNibble(a_BlockMeta,  x,   Top, z, (int)(val3 * 8) % 4);
+					}
+					break;
+				}  // case E_BLOCK_GRASS
+				
+				case E_BLOCK_SAND:
+				{
+					int y = Top + 1;
+					if (
+						(x > 0) && (x < cChunkDef::Width - 1) &&
+						(z > 0) && (z < cChunkDef::Width - 1) &&
+						(val1 + val2 > 0.5f) &&
+						(cChunkDef::GetBlock(a_BlockTypes, x + 1, y, z)     == E_BLOCK_AIR) &&
+						(cChunkDef::GetBlock(a_BlockTypes, x - 1, y, z)     == E_BLOCK_AIR) &&
+						(cChunkDef::GetBlock(a_BlockTypes, x,     y, z + 1) == E_BLOCK_AIR) &&
+						(cChunkDef::GetBlock(a_BlockTypes, x,     y, z - 1) == E_BLOCK_AIR)
+					)
+					{
+						cChunkDef::SetBlock(a_BlockTypes, x, ++Top, z, E_BLOCK_CACTUS);
+					}
+					else if (TryAddSugarcane(a_ChunkX, a_ChunkZ, x, Top, z, a_BlockTypes, a_BlockMeta))
+					{
+						++Top;
+					}
+					break;
+				}
+			}  // switch (TopBlock)
+			cChunkDef::SetHeight(a_HeightMap, x, z, Top);
+		}  // for y
+	}  // for z
+}
+
+
+
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// cFinishGenSnow:
+
+void cFinishGenSnow::GenFinish(
+	int a_ChunkX, int a_ChunkZ,
+	cChunkDef::BlockTypes & a_BlockTypes,    // Block types to read and change
+	cChunkDef::BlockNibbles & a_BlockMeta,   // Block meta to read and change
+	cChunkDef::HeightMap & a_HeightMap,      // Height map to read and change by the current data
+	const cChunkDef::BiomeMap & a_BiomeMap,  // Biomes to adhere to
+	cEntityList & a_Entities,                // Entities may be added or deleted
+	cBlockEntityList & a_BlockEntities       // Block entities may be added or deleted
+	)
+{
+	// Add a snow block in snowy biomes onto blocks that can be snowed over
+	for (int z = 0; z < cChunkDef::Width; z++)
+	{
+		for (int x = 0; x < cChunkDef::Width; x++)
+		{
+			switch (cChunkDef::GetBiome(a_BiomeMap, x, z))
+			{
+				case biIcePlains:
+				case biIceMountains:
+				case biTaiga:
+				case biTaigaHills:
+				case biFrozenRiver:
+				case biFrozenOcean:
+				{
+					int Height = cChunkDef::GetHeight(a_HeightMap, x, z);
+					if (g_BlockIsSnowable[cChunkDef::GetBlock(a_BlockTypes, x, Height, z)])
+					{
+						cChunkDef::SetBlock(a_BlockTypes, x, Height + 1, z, E_BLOCK_SNOW);
+						cChunkDef::SetHeight(a_HeightMap, x, z, Height + 1);
+					}
+					break;
+				}
+			}
+		}
+	}  // for z
+}
+
+
+
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// cFinishGenIce:
+
+void cFinishGenIce::GenFinish(
+	int a_ChunkX, int a_ChunkZ,
+	cChunkDef::BlockTypes & a_BlockTypes,    // Block types to read and change
+	cChunkDef::BlockNibbles & a_BlockMeta,   // Block meta to read and change
+	cChunkDef::HeightMap & a_HeightMap,      // Height map to read and change by the current data
+	const cChunkDef::BiomeMap & a_BiomeMap,  // Biomes to adhere to
+	cEntityList & a_Entities,                // Entities may be added or deleted
+	cBlockEntityList & a_BlockEntities       // Block entities may be added or deleted
+	)
+{
+	// Turn surface water into ice in icy biomes
+	for (int z = 0; z < cChunkDef::Width; z++)
+	{
+		for (int x = 0; x < cChunkDef::Width; x++)
+		{
+			switch (cChunkDef::GetBiome(a_BiomeMap, x, z))
+			{
+				case biIcePlains:
+				case biIceMountains:
+				case biTaiga:
+				case biTaigaHills:
+				case biFrozenRiver:
+				case biFrozenOcean:
+				{
+					int Height = cChunkDef::GetHeight(a_HeightMap, x, z);
+					switch (cChunkDef::GetBlock(a_BlockTypes, x, Height, z))
+					{
+						case E_BLOCK_WATER:
+						case E_BLOCK_STATIONARY_WATER:
+						{
+							cChunkDef::SetBlock(a_BlockTypes, x, Height, z, E_BLOCK_ICE);
+							break;
+						}
+					}
+					break;
+				}
+			}
+		}
+	}  // for z
+}
+
+
+
+