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

Add tree generation for ExtemeHills and other biomes (#4713)

Browse Source
This commit is contained in:
mBornand
2020-05-06 17:31:52 +02:00
committed by GitHub
parent bdb8830b9c
commit b9f441294d
3 changed files with 132 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/Generating/Trees.cpp
View File

@@ -230,12 +230,12 @@ void GetTreeImageByBiome(Vector3i a_BlockPos, cNoise & a_Noise, int a_Seq, EMCSB
switch (a_Biome)
{
case biPlains:
case biExtremeHills:
case biExtremeHillsEdge:
case biForest:
case biMushroomIsland:
case biMushroomShore:
case biForestHills:
case biSunflowerPlains:
case biFlowerForest:
case biDeepOcean:
case biStoneBeach:
case biColdBeach:
@@ -252,10 +252,14 @@ void GetTreeImageByBiome(Vector3i a_BlockPos, cNoise & a_Noise, int a_Seq, EMCSB
return;
}
case biTaiga:
case biColdTaiga:
case biColdTaigaM:
case biColdTaigaHills:
case biIcePlains:
case biIceMountains:
case biTaiga:
case biTaigaHills:
case biTaigaM:
{
// Conifers
GetConiferTreeImage(a_BlockPos, a_Noise, a_Seq, a_LogBlocks, a_OtherBlocks);
@@ -273,6 +277,8 @@ void GetTreeImageByBiome(Vector3i a_BlockPos, cNoise & a_Noise, int a_Seq, EMCSB
case biJungle:
case biJungleHills:
case biJungleEdge:
case biJungleM:
case biJungleEdgeM:
{
// Apple bushes, large jungle trees, small jungle trees
if (a_Noise.IntNoise3DInt(a_BlockPos.addedY(16 * a_Seq).addedZ(16 * a_Seq)) < 0x6fffffff)
@@ -301,26 +307,34 @@ void GetTreeImageByBiome(Vector3i a_BlockPos, cNoise & a_Noise, int a_Seq, EMCSB
return;
}
case biColdTaiga:
case biColdTaigaHills:
case biMegaTaiga:
case biMegaTaigaHills:
case biExtremeHillsPlus:
case biSunflowerPlains:
case biDesertM:
case biExtremeHillsM:
case biFlowerForest:
case biTaigaM:
case biIcePlainsSpikes:
case biJungleM:
case biJungleEdgeM:
case biColdTaigaM:
{
// TODO: implement trees 2x2 huge conifers (spruce and pine)
return;
}
case biMegaSpruceTaiga:
case biMegaSpruceTaigaHills:
{
// TODO: implement trees 2x2 huge spruce
return;
}
case biExtremeHills:
case biExtremeHillsM:
case biExtremeHillsEdge:
case biExtremeHillsPlus:
case biExtremeHillsPlusM:
{
// TODO: These need their special trees
GetBirchTreeImage(a_BlockPos, a_Noise, a_Seq, a_LogBlocks, a_OtherBlocks);
if (a_Noise.IntNoise3DInt(a_BlockPos.addedY(16 * a_Seq).addedZ(16 * a_Seq)) < 0x6fffffff)
{
GetConiferTreeImage(a_BlockPos, a_Noise, a_Seq, a_LogBlocks, a_OtherBlocks);
}
else
{
GetAppleTreeImage(a_BlockPos, a_Noise, a_Seq, a_LogBlocks, a_OtherBlocks);
}
return;
}
@@ -352,6 +366,7 @@ void GetTreeImageByBiome(Vector3i a_BlockPos, cNoise & a_Noise, int a_Seq, EMCSB
case biDesert:
case biDesertHills:
case biDesertM:
case biRiver:
case biBeach:
case biHell:
@@ -359,6 +374,7 @@ void GetTreeImageByBiome(Vector3i a_BlockPos, cNoise & a_Noise, int a_Seq, EMCSB
case biOcean:
case biFrozenOcean:
case biFrozenRiver:
case biIcePlainsSpikes:
case biVariant:
case biNumBiomes:
case biNumVariantBiomes: