2012-06-14 09:06:06 -04:00
|
|
|
|
|
|
|
// CompoGen.cpp
|
|
|
|
|
|
|
|
/* Implements the various terrain composition generators:
|
|
|
|
- cCompoGenSameBlock
|
|
|
|
- cCompoGenDebugBiomes
|
|
|
|
- cCompoGenClassic
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "Globals.h"
|
|
|
|
#include "CompoGen.h"
|
2012-09-23 16:14:04 -04:00
|
|
|
#include "../BlockID.h"
|
2013-05-12 13:55:49 -04:00
|
|
|
#include "../LinearUpscale.h"
|
2012-06-14 09:06:06 -04:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
// cCompoGenSameBlock:
|
|
|
|
|
2013-03-17 13:55:03 -04:00
|
|
|
void cCompoGenSameBlock::ComposeTerrain(cChunkDesc & a_ChunkDesc)
|
2012-06-14 09:06:06 -04:00
|
|
|
{
|
2013-03-19 04:32:02 -04:00
|
|
|
a_ChunkDesc.FillBlocks(E_BLOCK_AIR, 0);
|
2012-06-14 09:06:06 -04:00
|
|
|
for (int z = 0; z < cChunkDef::Width; z++)
|
|
|
|
{
|
|
|
|
for (int x = 0; x < cChunkDef::Width; x++)
|
|
|
|
{
|
|
|
|
int Start;
|
|
|
|
if (m_IsBedrocked)
|
|
|
|
{
|
2013-03-17 13:55:03 -04:00
|
|
|
a_ChunkDesc.SetBlockType(x, 0, z, E_BLOCK_BEDROCK);
|
2012-06-14 09:06:06 -04:00
|
|
|
Start = 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
Start = 0;
|
|
|
|
}
|
2013-03-17 13:55:03 -04:00
|
|
|
for (int y = a_ChunkDesc.GetHeight(x, z); y >= Start; y--)
|
2012-06-14 09:06:06 -04:00
|
|
|
{
|
2013-03-17 13:55:03 -04:00
|
|
|
a_ChunkDesc.SetBlockType(x, y, z, m_BlockType);
|
2012-06-14 09:06:06 -04:00
|
|
|
} // for y
|
|
|
|
} // for z
|
|
|
|
} // for x
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
// cCompoGenDebugBiomes:
|
|
|
|
|
2013-03-17 13:55:03 -04:00
|
|
|
void cCompoGenDebugBiomes::ComposeTerrain(cChunkDesc & a_ChunkDesc)
|
2012-06-14 09:06:06 -04:00
|
|
|
{
|
|
|
|
static BLOCKTYPE Blocks[] =
|
|
|
|
{
|
|
|
|
E_BLOCK_STONE,
|
|
|
|
E_BLOCK_COBBLESTONE,
|
|
|
|
E_BLOCK_LOG,
|
|
|
|
E_BLOCK_PLANKS,
|
|
|
|
E_BLOCK_SANDSTONE,
|
2013-02-16 06:12:56 -05:00
|
|
|
E_BLOCK_WOOL,
|
2012-06-14 09:06:06 -04:00
|
|
|
E_BLOCK_COAL_ORE,
|
|
|
|
E_BLOCK_IRON_ORE,
|
|
|
|
E_BLOCK_GOLD_ORE,
|
|
|
|
E_BLOCK_DIAMOND_ORE,
|
|
|
|
E_BLOCK_LAPIS_ORE,
|
|
|
|
E_BLOCK_REDSTONE_ORE,
|
|
|
|
E_BLOCK_IRON_BLOCK,
|
|
|
|
E_BLOCK_GOLD_BLOCK,
|
|
|
|
E_BLOCK_DIAMOND_BLOCK,
|
|
|
|
E_BLOCK_LAPIS_BLOCK,
|
|
|
|
E_BLOCK_BRICK,
|
|
|
|
E_BLOCK_MOSSY_COBBLESTONE,
|
|
|
|
E_BLOCK_OBSIDIAN,
|
|
|
|
E_BLOCK_NETHERRACK,
|
|
|
|
E_BLOCK_SOULSAND,
|
|
|
|
E_BLOCK_NETHER_BRICK,
|
|
|
|
E_BLOCK_BEDROCK,
|
|
|
|
} ;
|
|
|
|
|
2013-03-19 04:32:02 -04:00
|
|
|
a_ChunkDesc.FillBlocks(E_BLOCK_AIR, 0);
|
2012-06-14 09:06:06 -04:00
|
|
|
|
|
|
|
for (int z = 0; z < cChunkDef::Width; z++)
|
|
|
|
{
|
|
|
|
for (int x = 0; x < cChunkDef::Width; x++)
|
|
|
|
{
|
2013-03-17 13:55:03 -04:00
|
|
|
BLOCKTYPE BlockType = Blocks[a_ChunkDesc.GetBiome(x, z)];
|
|
|
|
for (int y = a_ChunkDesc.GetHeight(x, z); y >= 0; y--)
|
2012-06-14 09:06:06 -04:00
|
|
|
{
|
2013-03-17 13:55:03 -04:00
|
|
|
a_ChunkDesc.SetBlockType(x, y, z, BlockType);
|
2012-06-14 09:06:06 -04:00
|
|
|
} // for y
|
|
|
|
} // for z
|
|
|
|
} // for x
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
// cCompoGenClassic:
|
|
|
|
|
|
|
|
cCompoGenClassic::cCompoGenClassic(
|
|
|
|
int a_SeaLevel, int a_BeachHeight, int a_BeachDepth,
|
|
|
|
BLOCKTYPE a_BlockTop, BLOCKTYPE a_BlockMiddle, BLOCKTYPE a_BlockBottom,
|
|
|
|
BLOCKTYPE a_BlockBeach, BLOCKTYPE a_BlockBeachBottom, BLOCKTYPE a_BlockSea
|
|
|
|
) :
|
|
|
|
m_SeaLevel(a_SeaLevel),
|
|
|
|
m_BeachHeight(a_BeachHeight),
|
|
|
|
m_BeachDepth(a_BeachDepth),
|
|
|
|
m_BlockTop(a_BlockTop),
|
|
|
|
m_BlockMiddle(a_BlockMiddle),
|
|
|
|
m_BlockBottom(a_BlockBottom),
|
|
|
|
m_BlockBeach(a_BlockBeach),
|
|
|
|
m_BlockBeachBottom(a_BlockBeachBottom),
|
|
|
|
m_BlockSea(a_BlockSea)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-03-17 13:55:03 -04:00
|
|
|
void cCompoGenClassic::ComposeTerrain(cChunkDesc & a_ChunkDesc)
|
2012-06-14 09:06:06 -04:00
|
|
|
{
|
|
|
|
/* The classic composition means:
|
|
|
|
- 1 layer of grass, 3 of dirt and the rest stone, if the height > sealevel + beachheight
|
|
|
|
- 3 sand and a 1 sandstone, rest stone if between sealevel and sealevel + beachheight
|
|
|
|
- water from waterlevel to height, then 3 sand, 1 sandstone, the rest stone, if water depth < beachdepth
|
|
|
|
- water from waterlevel, then 3 dirt, the rest stone otherwise
|
|
|
|
- bedrock at the bottom
|
|
|
|
*/
|
|
|
|
|
2013-03-19 04:32:02 -04:00
|
|
|
a_ChunkDesc.FillBlocks(E_BLOCK_AIR, 0);
|
2012-06-14 09:06:06 -04:00
|
|
|
|
|
|
|
// The patterns to use for different situations, must be same length!
|
2013-03-17 13:55:03 -04:00
|
|
|
const BLOCKTYPE PatternGround[] = {m_BlockTop, m_BlockMiddle, m_BlockMiddle, m_BlockMiddle} ;
|
|
|
|
const BLOCKTYPE PatternBeach[] = {m_BlockBeach, m_BlockBeach, m_BlockBeach, m_BlockBeachBottom} ;
|
|
|
|
const BLOCKTYPE PatternOcean[] = {m_BlockMiddle, m_BlockMiddle, m_BlockMiddle, m_BlockBottom} ;
|
2012-06-14 09:06:06 -04:00
|
|
|
static int PatternLength = ARRAYCOUNT(PatternGround);
|
|
|
|
ASSERT(ARRAYCOUNT(PatternGround) == ARRAYCOUNT(PatternBeach));
|
|
|
|
ASSERT(ARRAYCOUNT(PatternGround) == ARRAYCOUNT(PatternOcean));
|
|
|
|
|
|
|
|
for (int z = 0; z < cChunkDef::Width; z++)
|
|
|
|
{
|
|
|
|
for (int x = 0; x < cChunkDef::Width; x++)
|
|
|
|
{
|
2013-03-17 13:55:03 -04:00
|
|
|
int Height = a_ChunkDesc.GetHeight(x, z);
|
2012-06-14 09:06:06 -04:00
|
|
|
const BLOCKTYPE * Pattern;
|
|
|
|
if (Height > m_SeaLevel + m_BeachHeight)
|
|
|
|
{
|
|
|
|
Pattern = PatternGround;
|
|
|
|
}
|
|
|
|
else if (Height > m_SeaLevel - m_BeachDepth)
|
|
|
|
{
|
|
|
|
Pattern = PatternBeach;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
Pattern = PatternOcean;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Fill water from sealevel down to height (if any):
|
|
|
|
for (int y = m_SeaLevel; y >= Height; --y)
|
|
|
|
{
|
2013-03-17 13:55:03 -04:00
|
|
|
a_ChunkDesc.SetBlockType(x, y, z, m_BlockSea);
|
2012-06-14 09:06:06 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// Fill from height till the bottom:
|
|
|
|
for (int y = Height; y >= 1; y--)
|
|
|
|
{
|
2013-03-17 13:55:03 -04:00
|
|
|
a_ChunkDesc.SetBlockType(x, y, z, (Height - y < PatternLength) ? Pattern[Height - y] : m_BlockBottom);
|
2012-06-14 09:06:06 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// The last layer is always bedrock:
|
2013-03-17 13:55:03 -04:00
|
|
|
a_ChunkDesc.SetBlockType(x, 0, z, E_BLOCK_BEDROCK);
|
2012-06-14 09:06:06 -04:00
|
|
|
} // for x
|
|
|
|
} // for z
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
// cCompoGenBiomal:
|
|
|
|
|
2013-03-17 13:55:03 -04:00
|
|
|
void cCompoGenBiomal::ComposeTerrain(cChunkDesc & a_ChunkDesc)
|
2012-06-14 09:06:06 -04:00
|
|
|
{
|
2013-03-19 04:32:02 -04:00
|
|
|
a_ChunkDesc.FillBlocks(E_BLOCK_AIR, 0);
|
2013-03-17 13:55:03 -04:00
|
|
|
|
|
|
|
int ChunkX = a_ChunkDesc.GetChunkX();
|
|
|
|
int ChunkZ = a_ChunkDesc.GetChunkZ();
|
2013-04-22 15:27:15 -04:00
|
|
|
|
|
|
|
/*
|
|
|
|
_X 2013_04_22:
|
|
|
|
There's no point in generating the whole cubic noise at once, because the noise values are used in
|
|
|
|
only about 20 % of the cases, so the speed gained by precalculating is lost by precalculating too much data
|
|
|
|
*/
|
|
|
|
|
2012-06-14 09:06:06 -04:00
|
|
|
for (int z = 0; z < cChunkDef::Width; z++)
|
|
|
|
{
|
|
|
|
for (int x = 0; x < cChunkDef::Width; x++)
|
|
|
|
{
|
2013-03-17 13:55:03 -04:00
|
|
|
int Height = a_ChunkDesc.GetHeight(x, z);
|
2012-06-14 09:06:06 -04:00
|
|
|
if (Height > m_SeaLevel)
|
|
|
|
{
|
2013-03-17 13:55:03 -04:00
|
|
|
switch (a_ChunkDesc.GetBiome(x, z))
|
2012-06-14 09:06:06 -04:00
|
|
|
{
|
|
|
|
case biOcean:
|
|
|
|
case biPlains:
|
|
|
|
case biExtremeHills:
|
|
|
|
case biForest:
|
|
|
|
case biTaiga:
|
|
|
|
case biSwampland:
|
|
|
|
case biRiver:
|
|
|
|
case biFrozenOcean:
|
|
|
|
case biFrozenRiver:
|
|
|
|
case biIcePlains:
|
|
|
|
case biIceMountains:
|
|
|
|
case biForestHills:
|
|
|
|
case biTaigaHills:
|
|
|
|
case biExtremeHillsEdge:
|
|
|
|
case biJungle:
|
|
|
|
case biJungleHills:
|
|
|
|
{
|
2013-03-17 13:55:03 -04:00
|
|
|
FillColumnGrass(x, z, Height, a_ChunkDesc.GetBlockTypes());
|
2012-06-14 09:06:06 -04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case biDesertHills:
|
|
|
|
case biDesert:
|
|
|
|
case biBeach:
|
|
|
|
{
|
2013-03-17 13:55:03 -04:00
|
|
|
FillColumnSand(x, z, Height, a_ChunkDesc.GetBlockTypes());
|
2012-06-14 09:06:06 -04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case biMushroomIsland:
|
|
|
|
case biMushroomShore:
|
|
|
|
{
|
2013-03-17 13:55:03 -04:00
|
|
|
FillColumnMycelium(x, z, Height, a_ChunkDesc.GetBlockTypes());
|
2012-06-14 09:06:06 -04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
{
|
|
|
|
// TODO
|
|
|
|
ASSERT(!"CompoGenBiomal: Biome not implemented yet!");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-03-17 13:55:03 -04:00
|
|
|
switch (a_ChunkDesc.GetBiome(x, z))
|
2012-06-14 09:06:06 -04:00
|
|
|
{
|
|
|
|
case biDesert:
|
|
|
|
case biBeach:
|
|
|
|
{
|
|
|
|
// Fill with water, sand, sandstone and stone
|
2013-03-17 13:55:03 -04:00
|
|
|
FillColumnWaterSand(x, z, Height, a_ChunkDesc.GetBlockTypes());
|
2012-06-14 09:06:06 -04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
{
|
|
|
|
// Fill with water, sand/dirt/clay mix and stone
|
2013-04-22 15:59:41 -04:00
|
|
|
if (m_Noise.CubicNoise2D(0.3f * (cChunkDef::Width * ChunkX + x), 0.3f * (cChunkDef::Width * ChunkZ + z)) < 0)
|
2013-04-22 15:27:15 -04:00
|
|
|
{
|
|
|
|
FillColumnWaterSand(x, z, Height, a_ChunkDesc.GetBlockTypes());
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
FillColumnWaterDirt(x, z, Height, a_ChunkDesc.GetBlockTypes());
|
|
|
|
}
|
2012-06-14 09:06:06 -04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
} // switch (biome)
|
2013-05-05 12:33:58 -04:00
|
|
|
a_ChunkDesc.SetHeight(x, z, m_SeaLevel + 1);
|
2012-06-14 09:06:06 -04:00
|
|
|
} // else (under water)
|
2013-03-17 13:55:03 -04:00
|
|
|
a_ChunkDesc.SetBlockType(x, 0, z, E_BLOCK_BEDROCK);
|
2012-06-14 09:06:06 -04:00
|
|
|
} // for x
|
|
|
|
} // for z
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void cCompoGenBiomal::FillColumnGrass(int a_RelX, int a_RelZ, int a_Height, cChunkDef::BlockTypes & a_BlockTypes)
|
|
|
|
{
|
|
|
|
BLOCKTYPE Pattern[] =
|
|
|
|
{
|
|
|
|
E_BLOCK_GRASS,
|
|
|
|
E_BLOCK_DIRT,
|
|
|
|
E_BLOCK_DIRT,
|
|
|
|
E_BLOCK_DIRT,
|
|
|
|
} ;
|
|
|
|
FillColumnPattern(a_RelX, a_RelZ, a_Height, a_BlockTypes, Pattern, ARRAYCOUNT(Pattern));
|
|
|
|
|
|
|
|
for (int y = a_Height - ARRAYCOUNT(Pattern); y > 0; y--)
|
|
|
|
{
|
|
|
|
cChunkDef::SetBlock(a_BlockTypes, a_RelX, y, a_RelZ, E_BLOCK_STONE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void cCompoGenBiomal::FillColumnSand(int a_RelX, int a_RelZ, int a_Height, cChunkDef::BlockTypes & a_BlockTypes)
|
|
|
|
{
|
|
|
|
BLOCKTYPE Pattern[] =
|
|
|
|
{
|
|
|
|
E_BLOCK_SAND,
|
|
|
|
E_BLOCK_SAND,
|
|
|
|
E_BLOCK_SAND,
|
|
|
|
E_BLOCK_SANDSTONE,
|
|
|
|
} ;
|
|
|
|
FillColumnPattern(a_RelX, a_RelZ, a_Height, a_BlockTypes, Pattern, ARRAYCOUNT(Pattern));
|
|
|
|
|
|
|
|
for (int y = a_Height - ARRAYCOUNT(Pattern); y > 0; y--)
|
|
|
|
{
|
|
|
|
cChunkDef::SetBlock(a_BlockTypes, a_RelX, y, a_RelZ, E_BLOCK_STONE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void cCompoGenBiomal::FillColumnMycelium (int a_RelX, int a_RelZ, int a_Height, cChunkDef::BlockTypes & a_BlockTypes)
|
|
|
|
{
|
|
|
|
BLOCKTYPE Pattern[] =
|
|
|
|
{
|
|
|
|
E_BLOCK_MYCELIUM,
|
|
|
|
E_BLOCK_DIRT,
|
|
|
|
E_BLOCK_DIRT,
|
|
|
|
E_BLOCK_DIRT,
|
|
|
|
} ;
|
|
|
|
FillColumnPattern(a_RelX, a_RelZ, a_Height, a_BlockTypes, Pattern, ARRAYCOUNT(Pattern));
|
|
|
|
|
|
|
|
for (int y = a_Height - ARRAYCOUNT(Pattern); y > 0; y--)
|
|
|
|
{
|
|
|
|
cChunkDef::SetBlock(a_BlockTypes, a_RelX, y, a_RelZ, E_BLOCK_STONE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void cCompoGenBiomal::FillColumnWaterSand(int a_RelX, int a_RelZ, int a_Height, cChunkDef::BlockTypes & a_BlockTypes)
|
|
|
|
{
|
|
|
|
FillColumnSand(a_RelX, a_RelZ, a_Height, a_BlockTypes);
|
|
|
|
for (int y = a_Height + 1; y <= m_SeaLevel + 1; y++)
|
|
|
|
{
|
2012-10-14 13:05:00 -04:00
|
|
|
cChunkDef::SetBlock(a_BlockTypes, a_RelX, y, a_RelZ, E_BLOCK_STATIONARY_WATER);
|
2012-06-14 09:06:06 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-04-22 15:27:15 -04:00
|
|
|
void cCompoGenBiomal::FillColumnWaterDirt(int a_RelX, int a_RelZ, int a_Height, cChunkDef::BlockTypes & a_BlockTypes)
|
2012-06-14 09:06:06 -04:00
|
|
|
{
|
2013-04-22 15:27:15 -04:00
|
|
|
// Dirt
|
|
|
|
BLOCKTYPE Pattern[] =
|
|
|
|
{
|
|
|
|
E_BLOCK_DIRT,
|
|
|
|
E_BLOCK_DIRT,
|
|
|
|
E_BLOCK_DIRT,
|
|
|
|
E_BLOCK_DIRT,
|
|
|
|
} ;
|
|
|
|
FillColumnPattern(a_RelX, a_RelZ, a_Height, a_BlockTypes, Pattern, ARRAYCOUNT(Pattern));
|
|
|
|
|
|
|
|
for (int y = a_Height - ARRAYCOUNT(Pattern); y > 0; y--)
|
2012-06-14 09:06:06 -04:00
|
|
|
{
|
2013-04-22 15:27:15 -04:00
|
|
|
cChunkDef::SetBlock(a_BlockTypes, a_RelX, y, a_RelZ, E_BLOCK_STONE);
|
2012-06-14 09:06:06 -04:00
|
|
|
}
|
2013-04-22 15:27:15 -04:00
|
|
|
for (int y = a_Height + 1; y <= m_SeaLevel + 1; y++)
|
2012-06-14 09:06:06 -04:00
|
|
|
{
|
2013-04-22 15:27:15 -04:00
|
|
|
cChunkDef::SetBlock(a_BlockTypes, a_RelX, y, a_RelZ, E_BLOCK_STATIONARY_WATER);
|
2012-06-14 09:06:06 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void cCompoGenBiomal::FillColumnPattern(int a_RelX, int a_RelZ, int a_Height, cChunkDef::BlockTypes & a_BlockTypes, const BLOCKTYPE * a_Pattern, int a_PatternSize)
|
|
|
|
{
|
|
|
|
for (int y = a_Height, idx = 0; (y >= 0) && (idx < a_PatternSize); y--, idx++)
|
|
|
|
{
|
|
|
|
cChunkDef::SetBlock(a_BlockTypes, a_RelX, y, a_RelZ, a_Pattern[idx]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-03-11 13:15:34 -04:00
|
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
// cCompoGenNether:
|
|
|
|
|
|
|
|
cCompoGenNether::cCompoGenNether(int a_Seed) :
|
|
|
|
m_Noise1(a_Seed + 10),
|
|
|
|
m_Noise2(a_Seed * a_Seed * 10 + a_Seed * 1000 + 6000),
|
|
|
|
m_Threshold(0)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-03-17 13:55:03 -04:00
|
|
|
void cCompoGenNether::ComposeTerrain(cChunkDesc & a_ChunkDesc)
|
2013-03-11 13:15:34 -04:00
|
|
|
{
|
2013-03-17 13:55:03 -04:00
|
|
|
HEIGHTTYPE MaxHeight = a_ChunkDesc.GetMaxHeight();
|
2013-03-11 13:15:34 -04:00
|
|
|
|
|
|
|
const int SEGMENT_HEIGHT = 8;
|
|
|
|
const int INTERPOL_X = 16; // Must be a divisor of 16
|
|
|
|
const int INTERPOL_Z = 16; // Must be a divisor of 16
|
2013-03-17 13:55:03 -04:00
|
|
|
// Interpolate the chunk in 16 * SEGMENT_HEIGHT * 16 "segments", each SEGMENT_HEIGHT blocks high and each linearly interpolated separately.
|
2013-03-11 13:15:34 -04:00
|
|
|
// Have two buffers, one for the lowest floor and one for the highest floor, so that Y-interpolation can be done between them
|
|
|
|
// Then swap the buffers and use the previously-top one as the current-bottom, without recalculating it.
|
|
|
|
|
|
|
|
int FloorBuf1[17 * 17];
|
|
|
|
int FloorBuf2[17 * 17];
|
|
|
|
int * FloorHi = FloorBuf1;
|
|
|
|
int * FloorLo = FloorBuf2;
|
2013-03-17 13:55:03 -04:00
|
|
|
int BaseX = a_ChunkDesc.GetChunkX() * cChunkDef::Width;
|
|
|
|
int BaseZ = a_ChunkDesc.GetChunkZ() * cChunkDef::Width;
|
2013-03-11 13:15:34 -04:00
|
|
|
|
|
|
|
// Interpolate the lowest floor:
|
|
|
|
for (int z = 0; z <= 16 / INTERPOL_Z; z++) for (int x = 0; x <= 16 / INTERPOL_X; x++)
|
|
|
|
{
|
|
|
|
FloorLo[INTERPOL_X * x + 17 * INTERPOL_Z * z] =
|
|
|
|
m_Noise1.IntNoise3DInt(BaseX + INTERPOL_X * x, 0, BaseZ + INTERPOL_Z * z) *
|
|
|
|
m_Noise2.IntNoise3DInt(BaseX + INTERPOL_X * x, 0, BaseZ + INTERPOL_Z * z) /
|
|
|
|
256;
|
|
|
|
} // for x, z - FloorLo[]
|
2013-05-12 17:11:25 -04:00
|
|
|
ArrayLinearUpscale2DInPlace(FloorLo, 17, 17, INTERPOL_X, INTERPOL_Z);
|
2013-03-11 13:15:34 -04:00
|
|
|
|
|
|
|
// Interpolate segments:
|
|
|
|
for (int Segment = 0; Segment < MaxHeight; Segment += SEGMENT_HEIGHT)
|
|
|
|
{
|
|
|
|
// First update the high floor:
|
|
|
|
for (int z = 0; z <= 16 / INTERPOL_Z; z++) for (int x = 0; x <= 16 / INTERPOL_X; x++)
|
|
|
|
{
|
|
|
|
FloorHi[INTERPOL_X * x + 17 * INTERPOL_Z * z] =
|
|
|
|
m_Noise1.IntNoise3DInt(BaseX + INTERPOL_X * x, Segment + SEGMENT_HEIGHT, BaseZ + INTERPOL_Z * z) *
|
|
|
|
m_Noise2.IntNoise3DInt(BaseX + INTERPOL_Z * x, Segment + SEGMENT_HEIGHT, BaseZ + INTERPOL_Z * z) /
|
|
|
|
256;
|
|
|
|
} // for x, z - FloorLo[]
|
2013-05-12 17:11:25 -04:00
|
|
|
ArrayLinearUpscale2DInPlace(FloorHi, 17, 17, INTERPOL_X, INTERPOL_Z);
|
2013-03-11 13:15:34 -04:00
|
|
|
|
|
|
|
// Interpolate between FloorLo and FloorHi:
|
|
|
|
for (int z = 0; z < 16; z++) for (int x = 0; x < 16; x++)
|
|
|
|
{
|
|
|
|
int Lo = FloorLo[x + 17 * z] / 256;
|
|
|
|
int Hi = FloorHi[x + 17 * z] / 256;
|
|
|
|
for (int y = 0; y < SEGMENT_HEIGHT; y++)
|
|
|
|
{
|
|
|
|
int Val = Lo + (Hi - Lo) * y / SEGMENT_HEIGHT;
|
2013-03-17 13:55:03 -04:00
|
|
|
a_ChunkDesc.SetBlockType(x, y + Segment, z, (Val < m_Threshold) ? E_BLOCK_NETHERRACK : E_BLOCK_AIR);
|
2013-03-11 13:15:34 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Swap the floors:
|
|
|
|
std::swap(FloorLo, FloorHi);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Bedrock at the bottom and at the top:
|
|
|
|
for (int z = 0; z < 16; z++) for (int x = 0; x < 16; x++)
|
|
|
|
{
|
2013-03-17 13:55:03 -04:00
|
|
|
a_ChunkDesc.SetBlockType(x, 0, z, E_BLOCK_BEDROCK);
|
|
|
|
a_ChunkDesc.SetBlockType(x, a_ChunkDesc.GetHeight(x, z), z, E_BLOCK_BEDROCK);
|
2013-03-11 13:15:34 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-05-05 15:56:45 -04:00
|
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
// cCompoGenCache:
|
|
|
|
|
|
|
|
cCompoGenCache::cCompoGenCache(cTerrainCompositionGen * a_Underlying, int a_CacheSize) :
|
|
|
|
m_Underlying(a_Underlying),
|
|
|
|
m_CacheSize(a_CacheSize),
|
|
|
|
m_CacheOrder(new int[a_CacheSize]),
|
|
|
|
m_CacheData(new sCacheData[a_CacheSize]),
|
|
|
|
m_NumHits(0),
|
|
|
|
m_NumMisses(0),
|
|
|
|
m_TotalChain(0)
|
|
|
|
{
|
|
|
|
for (int i = 0; i < m_CacheSize; i++)
|
|
|
|
{
|
|
|
|
m_CacheOrder[i] = i;
|
|
|
|
m_CacheData[i].m_ChunkX = 0x7fffffff;
|
|
|
|
m_CacheData[i].m_ChunkZ = 0x7fffffff;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
cCompoGenCache::~cCompoGenCache()
|
|
|
|
{
|
|
|
|
delete[] m_CacheData;
|
|
|
|
delete[] m_CacheOrder;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void cCompoGenCache::ComposeTerrain(cChunkDesc & a_ChunkDesc)
|
|
|
|
{
|
|
|
|
//*
|
|
|
|
if (((m_NumHits + m_NumMisses) % 1024) == 10)
|
|
|
|
{
|
|
|
|
LOGD("CompoGenCache: %d hits, %d misses, saved %.2f %%", m_NumHits, m_NumMisses, 100.0 * m_NumHits / (m_NumHits + m_NumMisses));
|
|
|
|
LOGD("CompoGenCache: Avg cache chain length: %.2f", (float)m_TotalChain / m_NumHits);
|
|
|
|
}
|
|
|
|
//*/
|
|
|
|
|
|
|
|
int ChunkX = a_ChunkDesc.GetChunkX();
|
|
|
|
int ChunkZ = a_ChunkDesc.GetChunkZ();
|
|
|
|
|
|
|
|
for (int i = 0; i < m_CacheSize; i++)
|
|
|
|
{
|
|
|
|
if (
|
|
|
|
(m_CacheData[m_CacheOrder[i]].m_ChunkX != ChunkX) ||
|
|
|
|
(m_CacheData[m_CacheOrder[i]].m_ChunkZ != ChunkZ)
|
|
|
|
)
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
// Found it in the cache
|
|
|
|
int Idx = m_CacheOrder[i];
|
|
|
|
|
|
|
|
// Move to front:
|
|
|
|
for (int j = i; j > 0; j--)
|
|
|
|
{
|
|
|
|
m_CacheOrder[j] = m_CacheOrder[j - 1];
|
|
|
|
}
|
|
|
|
m_CacheOrder[0] = Idx;
|
|
|
|
|
|
|
|
// Use the cached data:
|
|
|
|
memcpy(a_ChunkDesc.GetBlockTypes(), m_CacheData[Idx].m_BlockTypes, sizeof(a_ChunkDesc.GetBlockTypes()));
|
|
|
|
memcpy(a_ChunkDesc.GetBlockMetasUncompressed(), m_CacheData[Idx].m_BlockMetas, sizeof(a_ChunkDesc.GetBlockMetasUncompressed()));
|
|
|
|
|
|
|
|
m_NumHits++;
|
|
|
|
m_TotalChain += i;
|
|
|
|
return;
|
|
|
|
} // for i - cache
|
|
|
|
|
|
|
|
// Not in the cache:
|
|
|
|
m_NumMisses++;
|
|
|
|
m_Underlying->ComposeTerrain(a_ChunkDesc);
|
|
|
|
|
|
|
|
// Insert it as the first item in the MRU order:
|
|
|
|
int Idx = m_CacheOrder[m_CacheSize - 1];
|
|
|
|
for (int i = m_CacheSize - 1; i > 0; i--)
|
|
|
|
{
|
|
|
|
m_CacheOrder[i] = m_CacheOrder[i - 1];
|
|
|
|
} // for i - m_CacheOrder[]
|
|
|
|
m_CacheOrder[0] = Idx;
|
|
|
|
memcpy(m_CacheData[Idx].m_BlockTypes, a_ChunkDesc.GetBlockTypes(), sizeof(a_ChunkDesc.GetBlockTypes()));
|
|
|
|
memcpy(m_CacheData[Idx].m_BlockMetas, a_ChunkDesc.GetBlockMetasUncompressed(), sizeof(a_ChunkDesc.GetBlockMetasUncompressed()));
|
|
|
|
m_CacheData[Idx].m_ChunkX = ChunkX;
|
|
|
|
m_CacheData[Idx].m_ChunkZ = ChunkZ;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|