summaryrefslogtreecommitdiffstats
path: root/src/Generating/IntGen.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/Generating/IntGen.h')
-rw-r--r--src/Generating/IntGen.h555
1 files changed, 226 insertions, 329 deletions
diff --git a/src/Generating/IntGen.h b/src/Generating/IntGen.h
index b56567f9f..bfc489102 100644
--- a/src/Generating/IntGen.h
+++ b/src/Generating/IntGen.h
@@ -37,24 +37,22 @@ by using templates.
/** Constants representing the biome group designators. */
-const int bgOcean = 0;
-const int bgDesert = 1;
-const int bgTemperate = 2;
-const int bgMountains = 3;
-const int bgIce = 4;
+const int bgOcean = 0;
+const int bgDesert = 1;
+const int bgTemperate = 2;
+const int bgMountains = 3;
+const int bgIce = 4;
const int bgLandOceanMax = 4; // Maximum biome group value generated in the landOcean generator
-const int bgfRare = 1024; // Flag added to values to generate rare biomes for the group
+const int bgfRare = 1024; // Flag added to values to generate rare biomes for the group
/** Interface that all the generator classes provide. */
-template <int SizeX, int SizeZ = SizeX>
-class cIntGen
+template <int SizeX, int SizeZ = SizeX> class cIntGen
{
-public:
-
+ public:
using IntGenType = cIntGen<SizeX, SizeZ>;
/** Force a virtual destructor in all descendants.
@@ -66,67 +64,57 @@ public:
/** Generates the array of templated size into a_Values, based on given min coords. */
virtual void GetInts(int a_MinX, int a_MinZ, Values & a_Values) = 0;
-
};
// Code adapted from https://stackoverflow.com/questions/7858817/unpacking-a-tuple-to-call-a-matching-function-pointer
-template<int... >
-struct sSeq
+template <int...> struct sSeq
{
};
-template<int N, int... S>
-struct sGens : sGens<N - 1, N - 1, S...>
+template <int N, int... S> struct sGens : sGens<N - 1, N - 1, S...>
{
};
-template<int... S>
-struct sGens<0, S...>
+template <int... S> struct sGens<0, S...>
{
using type = sSeq<S...>;
};
-template<class Gen, class... Args>
-class cIntGenFactory
+template <class Gen, class... Args> class cIntGenFactory
{
-public:
-
+ public:
using Generator = Gen;
- cIntGenFactory(Args&&... a_args) :
+ cIntGenFactory(Args &&... a_args) :
m_args(std::make_tuple<Args...>(std::forward<Args>(a_args)...))
{
}
- template <class LhsGen>
- std::shared_ptr<Gen> construct(LhsGen&& a_Lhs)
+ template <class LhsGen> std::shared_ptr<Gen> construct(LhsGen && a_Lhs)
{
return construct_impl<LhsGen>(std::forward<LhsGen>(a_Lhs), typename sGens<sizeof...(Args)>::type());
}
-private:
+ private:
std::tuple<Args...> m_args;
- template <class LhsGen, int... S>
- std::shared_ptr<Gen> construct_impl(LhsGen&& a_Lhs, sSeq<S...>)
+ template <class LhsGen, int... S> std::shared_ptr<Gen> construct_impl(LhsGen && a_Lhs, sSeq<S...>)
{
return std::make_shared<Gen>(std::get<S>(m_args)..., std::forward<LhsGen>(a_Lhs));
}
-
};
-template<class T, class RhsGen, class... Args>
-std::shared_ptr<RhsGen> operator| (std::shared_ptr<T> a_Lhs, cIntGenFactory<RhsGen, Args...> a_Rhs)
+template <class T, class RhsGen, class... Args>
+std::shared_ptr<RhsGen> operator|(std::shared_ptr<T> a_Lhs, cIntGenFactory<RhsGen, Args...> a_Rhs)
{
return a_Rhs.construct(static_cast<std::shared_ptr<typename T::IntGenType>>(a_Lhs));
}
-template<class Gen, class... Args>
-cIntGenFactory<Gen, Args...> MakeIntGen(Args&&... a_Args)
+template <class Gen, class... Args> cIntGenFactory<Gen, Args...> MakeIntGen(Args &&... a_Args)
{
return cIntGenFactory<Gen, Args...>(std::forward<Args>(a_Args)...);
}
@@ -134,20 +122,17 @@ cIntGenFactory<Gen, Args...> MakeIntGen(Args&&... a_Args)
/** Provides additional cNoise member and its helper functions. */
-template <int SizeX, int SizeZ = SizeX>
-class cIntGenWithNoise:
- public cIntGen<SizeX, SizeZ>
+template <int SizeX, int SizeZ = SizeX> class cIntGenWithNoise : public cIntGen<SizeX, SizeZ>
{
using Super = cIntGen<SizeX, SizeZ>;
-public:
-
- cIntGenWithNoise(int a_Seed):
+ public:
+ cIntGenWithNoise(int a_Seed) :
m_Noise(a_Seed)
{
}
-protected:
+ protected:
cNoise m_Noise;
/** Chooses one of a_Val1 or a_Val2, based on m_Noise and the coordinates for querying the noise. */
@@ -176,15 +161,12 @@ protected:
/** Generates a 2D array of random integers in the specified range [0 .. Range). */
-template <int Range, int SizeX, int SizeZ = SizeX>
-class cIntGenChoice:
- public cIntGenWithNoise<SizeX, SizeZ>
+template <int Range, int SizeX, int SizeZ = SizeX> class cIntGenChoice : public cIntGenWithNoise<SizeX, SizeZ>
{
using Super = cIntGenWithNoise<SizeX, SizeZ>;
-public:
-
- cIntGenChoice(int a_Seed):
+ public:
+ cIntGenChoice(int a_Seed) :
Super(a_Seed)
{
}
@@ -210,17 +192,13 @@ public:
/** Decides between the ocean and landmass biomes.
Has a threshold (in percent) of how much land, the larger the threshold, the more land.
Generates 0 for ocean, biome group ID for landmass. */
-template <int SizeX, int SizeZ = SizeX>
-class cIntGenLandOcean:
- public cIntGenWithNoise<SizeX, SizeZ>
+template <int SizeX, int SizeZ = SizeX> class cIntGenLandOcean : public cIntGenWithNoise<SizeX, SizeZ>
{
using Super = cIntGenWithNoise<SizeX, SizeZ>;
-public:
-
- cIntGenLandOcean(int a_Seed, int a_Threshold):
- Super(a_Seed),
- m_Threshold(a_Threshold)
+ public:
+ cIntGenLandOcean(int a_Seed, int a_Threshold) :
+ Super(a_Seed), m_Threshold(a_Threshold)
{
}
@@ -244,7 +222,7 @@ public:
}
}
-protected:
+ protected:
int m_Threshold;
};
@@ -255,25 +233,20 @@ protected:
/** Zooms the underlying value array to twice the size. Uses random-neighbor for the pixels in-between.
This means that the zoome out image is randomly distorted. Applying zoom several times provides all
the distortion that the generators need. */
-template <int SizeX, int SizeZ = SizeX>
-class cIntGenZoom:
- public cIntGenWithNoise<SizeX, SizeZ>
+template <int SizeX, int SizeZ = SizeX> class cIntGenZoom : public cIntGenWithNoise<SizeX, SizeZ>
{
using Super = cIntGenWithNoise<SizeX, SizeZ>;
-protected:
-
+ protected:
static const int m_LowerSizeX = (SizeX / 2) + 2;
static const int m_LowerSizeZ = (SizeZ / 2) + 2;
-public:
-
+ public:
using Underlying = std::shared_ptr<cIntGen<m_LowerSizeX, m_LowerSizeZ>>;
- cIntGenZoom(int a_Seed, Underlying a_UnderlyingGen):
- Super(a_Seed),
- m_UnderlyingGen(a_UnderlyingGen)
+ cIntGenZoom(int a_Seed, Underlying a_UnderlyingGen) :
+ Super(a_Seed), m_UnderlyingGen(a_UnderlyingGen)
{
}
@@ -304,7 +277,7 @@ public:
int RndZ = (z + lowerMinZ) * 2;
cache[idx] = PrevZ0;
cache[idx + lowStepX] = Super::ChooseRandomOne(RndX, RndZ + 1, PrevZ0, PrevZ1);
- cache[idx + 1] = Super::ChooseRandomOne(RndX, RndZ - 1, PrevZ0, ValX1Z0);
+ cache[idx + 1] = Super::ChooseRandomOne(RndX, RndZ - 1, PrevZ0, ValX1Z0);
cache[idx + 1 + lowStepX] = Super::ChooseRandomOne(RndX, RndZ, PrevZ0, ValX1Z0, PrevZ1, ValX1Z1);
idx += 2;
PrevZ0 = ValX1Z0;
@@ -319,7 +292,7 @@ public:
}
}
-protected:
+ protected:
Underlying m_UnderlyingGen;
};
@@ -329,23 +302,19 @@ protected:
/** Smoothes out some artifacts generated by the zooming - mostly single-pixel values.
Compares each pixel to its neighbors and if the neighbors are equal, changes the pixel to their value. */
-template <int SizeX, int SizeZ = SizeX>
-class cIntGenSmooth:
- public cIntGenWithNoise<SizeX, SizeZ>
+template <int SizeX, int SizeZ = SizeX> class cIntGenSmooth : public cIntGenWithNoise<SizeX, SizeZ>
{
using Super = cIntGenWithNoise<SizeX, SizeZ>;
static const int m_LowerSizeX = SizeX + 2;
static const int m_LowerSizeZ = SizeZ + 2;
-public:
-
+ public:
using Underlying = std::shared_ptr<cIntGen<m_LowerSizeX, m_LowerSizeZ>>;
- cIntGenSmooth(int a_Seed, Underlying a_Underlying):
- Super(a_Seed),
- m_Underlying(a_Underlying)
+ cIntGenSmooth(int a_Seed, Underlying a_Underlying) :
+ Super(a_Seed), m_Underlying(a_Underlying)
{
}
@@ -363,10 +332,10 @@ public:
int NoiseZ = a_MinZ + z;
for (int x = 0; x < SizeX; x++)
{
- int val = lowerData[x + 1 + (z + 1) * m_LowerSizeX];
- int above = lowerData[x + 1 + z * m_LowerSizeX];
+ int val = lowerData[x + 1 + (z + 1) * m_LowerSizeX];
+ int above = lowerData[x + 1 + z * m_LowerSizeX];
int below = lowerData[x + 1 + (z + 2) * m_LowerSizeX];
- int left = lowerData[x + (z + 1) * m_LowerSizeX];
+ int left = lowerData[x + (z + 1) * m_LowerSizeX];
int right = lowerData[x + 2 + (z + 1) * m_LowerSizeX];
if ((left == right) && (above == below))
@@ -398,7 +367,7 @@ public:
}
}
-protected:
+ protected:
Underlying m_Underlying;
};
@@ -407,21 +376,18 @@ protected:
/** Converts land biomes at the edge of an ocean into the respective beach biome. */
-template <int SizeX, int SizeZ = SizeX>
-class cIntGenBeaches:
- public cIntGen<SizeX, SizeZ>
+template <int SizeX, int SizeZ = SizeX> class cIntGenBeaches : public cIntGen<SizeX, SizeZ>
{
using Super = cIntGen<SizeX, SizeZ>;
static const int m_UnderlyingSizeX = SizeX + 2;
static const int m_UnderlyingSizeZ = SizeZ + 2;
-public:
-
+ public:
using Underlying = std::shared_ptr<cIntGen<m_UnderlyingSizeX, m_UnderlyingSizeZ>>;
- cIntGenBeaches(Underlying a_Underlying):
+ cIntGenBeaches(Underlying a_Underlying) :
m_Underlying(a_Underlying)
{
}
@@ -430,8 +396,7 @@ public:
virtual void GetInts(int a_MinX, int a_MinZ, typename Super::Values & a_Values) override
{
// Map for biome -> its beach:
- static const int ToBeach[] =
- {
+ static const int ToBeach[] = {
/* biOcean */ biOcean,
/* biPlains */ biBeach,
/* biDesert */ biBeach,
@@ -483,10 +448,10 @@ public:
{
for (int x = 0; x < SizeX; x++)
{
- int val = lowerValues[x + 1 + (z + 1) * m_UnderlyingSizeX];
- int above = lowerValues[x + 1 + z * m_UnderlyingSizeX];
+ int val = lowerValues[x + 1 + (z + 1) * m_UnderlyingSizeX];
+ int above = lowerValues[x + 1 + z * m_UnderlyingSizeX];
int below = lowerValues[x + 1 + (z + 2) * m_UnderlyingSizeX];
- int left = lowerValues[x + (z + 1) * m_UnderlyingSizeX];
+ int left = lowerValues[x + (z + 1) * m_UnderlyingSizeX];
int right = lowerValues[x + 2 + (z + 1) * m_UnderlyingSizeX];
if (!IsBiomeOcean(val))
{
@@ -501,7 +466,7 @@ public:
}
}
-protected:
+ protected:
Underlying m_Underlying;
};
@@ -511,21 +476,16 @@ protected:
/** Generates the underlying numbers and then randomly changes some ocean group pixels into random land
biome group pixels, based on the predefined chance. */
-template <int SizeX, int SizeZ = SizeX>
-class cIntGenAddIslands:
- public cIntGenWithNoise<SizeX, SizeZ>
+template <int SizeX, int SizeZ = SizeX> class cIntGenAddIslands : public cIntGenWithNoise<SizeX, SizeZ>
{
using Super = cIntGenWithNoise<SizeX, SizeZ>;
-public:
-
+ public:
using Underlying = std::shared_ptr<cIntGen<SizeX, SizeZ>>;
- cIntGenAddIslands(int a_Seed, int a_Chance, Underlying a_Underlying):
- Super(a_Seed),
- m_Chance(a_Chance),
- m_Underlying(a_Underlying)
+ cIntGenAddIslands(int a_Seed, int a_Chance, Underlying a_Underlying) :
+ Super(a_Seed), m_Chance(a_Chance), m_Underlying(a_Underlying)
{
}
@@ -549,7 +509,7 @@ public:
} // for z
}
-protected:
+ protected:
/** Chance, in permille, of an island being generated in ocean. */
int m_Chance;
@@ -561,21 +521,18 @@ protected:
/** A filter that adds an edge biome group between two biome groups that need an edge between them. */
-template <int SizeX, int SizeZ = SizeX>
-class cIntGenBiomeGroupEdges:
- public cIntGen<SizeX, SizeZ>
+template <int SizeX, int SizeZ = SizeX> class cIntGenBiomeGroupEdges : public cIntGen<SizeX, SizeZ>
{
using Super = cIntGen<SizeX, SizeZ>;
static const int m_UnderlyingSizeX = SizeX + 2;
static const int m_UnderlyingSizeZ = SizeZ + 2;
-public:
-
+ public:
using Underlying = std::shared_ptr<cIntGen<m_UnderlyingSizeX, m_UnderlyingSizeZ>>;
- cIntGenBiomeGroupEdges(Underlying a_Underlying):
+ cIntGenBiomeGroupEdges(Underlying a_Underlying) :
m_Underlying(a_Underlying)
{
}
@@ -592,22 +549,18 @@ public:
{
for (int x = 0; x < SizeX; x++)
{
- int val = lowerValues[x + 1 + (z + 1) * m_UnderlyingSizeX];
- int above = lowerValues[x + 1 + z * m_UnderlyingSizeX];
+ int val = lowerValues[x + 1 + (z + 1) * m_UnderlyingSizeX];
+ int above = lowerValues[x + 1 + z * m_UnderlyingSizeX];
int below = lowerValues[x + 1 + (z + 2) * m_UnderlyingSizeX];
- int left = lowerValues[x + (z + 1) * m_UnderlyingSizeX];
+ int left = lowerValues[x + (z + 1) * m_UnderlyingSizeX];
int right = lowerValues[x + 2 + (z + 1) * m_UnderlyingSizeX];
switch (val)
{
// Desert should neighbor only oceans, desert and temperates; change to temperate when another:
case bgDesert:
{
- if (
- !isDesertCompatible(above) ||
- !isDesertCompatible(below) ||
- !isDesertCompatible(left) ||
- !isDesertCompatible(right)
- )
+ if (!isDesertCompatible(above) || !isDesertCompatible(below) || !isDesertCompatible(left) ||
+ !isDesertCompatible(right))
{
val = bgTemperate;
}
@@ -617,12 +570,7 @@ public:
// Ice should not neighbor deserts; change to temperate:
case bgIce:
{
- if (
- (above == bgDesert) ||
- (below == bgDesert) ||
- (left == bgDesert) ||
- (right == bgDesert)
- )
+ if ((above == bgDesert) || (below == bgDesert) || (left == bgDesert) || (right == bgDesert))
{
val = bgTemperate;
}
@@ -634,7 +582,7 @@ public:
} // for z
}
-protected:
+ protected:
Underlying m_Underlying;
@@ -663,20 +611,16 @@ protected:
/** Turns biome group indices into real biomes.
For each pixel, takes its biome group and chooses a random biome from that group; replaces the value with
that biome. */
-template <int SizeX, int SizeZ = SizeX>
-class cIntGenBiomes:
- public cIntGenWithNoise<SizeX, SizeZ>
+template <int SizeX, int SizeZ = SizeX> class cIntGenBiomes : public cIntGenWithNoise<SizeX, SizeZ>
{
using Super = cIntGenWithNoise<SizeX, SizeZ>;
-public:
-
+ public:
using Underlying = std::shared_ptr<cIntGen<SizeX, SizeZ>>;
- cIntGenBiomes(int a_Seed, Underlying a_Underlying):
- Super(a_Seed),
- m_Underlying(a_Underlying)
+ cIntGenBiomes(int a_Seed, Underlying a_Underlying) :
+ Super(a_Seed), m_Underlying(a_Underlying)
{
}
@@ -684,74 +628,88 @@ public:
virtual void GetInts(int a_MinX, int a_MinZ, typename Super::Values & a_Values) override
{
// Define the per-biome-group biomes:
- static const int oceanBiomes[] =
- {
+ static const int oceanBiomes[] = {
biOcean, // biDeepOcean,
};
// Same as oceanBiomes, there are no rare oceanic biomes (mushroom islands are handled separately)
- static const int rareOceanBiomes[] =
- {
+ static const int rareOceanBiomes[] = {
biOcean,
};
- static const int desertBiomes[] =
- {
- biDesert, biDesert, biDesert, biDesert, biDesert, biDesert, biSavanna, biSavanna, biPlains,
+ static const int desertBiomes[] = {
+ biDesert,
+ biDesert,
+ biDesert,
+ biDesert,
+ biDesert,
+ biDesert,
+ biSavanna,
+ biSavanna,
+ biPlains,
};
- static const int rareDesertBiomes[] =
- {
- biMesaPlateau, biMesaPlateauF,
+ static const int rareDesertBiomes[] = {
+ biMesaPlateau,
+ biMesaPlateauF,
};
- static const int temperateBiomes[] =
- {
- biForest, biForest, biRoofedForest, biExtremeHills, biPlains, biBirchForest, biSwampland,
+ static const int temperateBiomes[] = {
+ biForest,
+ biForest,
+ biRoofedForest,
+ biExtremeHills,
+ biPlains,
+ biBirchForest,
+ biSwampland,
};
- static const int rareTemperateBiomes[] =
- {
+ static const int rareTemperateBiomes[] = {
biJungle, // Jungle is not strictly temperate, but let's piggyback it here
};
- static const int mountainBiomes[] =
- {
- biExtremeHills, biForest, biTaiga, biPlains,
+ static const int mountainBiomes[] = {
+ biExtremeHills,
+ biForest,
+ biTaiga,
+ biPlains,
};
- static const int rareMountainBiomes[] =
- {
+ static const int rareMountainBiomes[] = {
biMegaTaiga,
};
- static const int iceBiomes[] =
- {
- biIcePlains, biIcePlains, biIcePlains, biIcePlains, biColdTaiga,
+ static const int iceBiomes[] = {
+ biIcePlains,
+ biIcePlains,
+ biIcePlains,
+ biIcePlains,
+ biColdTaiga,
};
// Same as iceBiomes, there's no rare ice biome
- static const int rareIceBiomes[] =
- {
- biIcePlains, biIcePlains, biIcePlains, biIcePlains, biColdTaiga,
+ static const int rareIceBiomes[] = {
+ biIcePlains,
+ biIcePlains,
+ biIcePlains,
+ biIcePlains,
+ biColdTaiga,
};
- static const cBiomesInGroups biomesInGroups[] =
- {
- /* bgOcean */ { static_cast<int>(ARRAYCOUNT(oceanBiomes)), oceanBiomes},
- /* bgDesert */ { static_cast<int>(ARRAYCOUNT(desertBiomes)), desertBiomes},
- /* bgTemperate */ { static_cast<int>(ARRAYCOUNT(temperateBiomes)), temperateBiomes},
- /* bgMountains */ { static_cast<int>(ARRAYCOUNT(mountainBiomes)), mountainBiomes},
- /* bgIce */ { static_cast<int>(ARRAYCOUNT(iceBiomes)), iceBiomes},
+ static const cBiomesInGroups biomesInGroups[] = {
+ /* bgOcean */ {static_cast<int>(ARRAYCOUNT(oceanBiomes)), oceanBiomes},
+ /* bgDesert */ {static_cast<int>(ARRAYCOUNT(desertBiomes)), desertBiomes},
+ /* bgTemperate */ {static_cast<int>(ARRAYCOUNT(temperateBiomes)), temperateBiomes},
+ /* bgMountains */ {static_cast<int>(ARRAYCOUNT(mountainBiomes)), mountainBiomes},
+ /* bgIce */ {static_cast<int>(ARRAYCOUNT(iceBiomes)), iceBiomes},
};
- static const cBiomesInGroups rareBiomesInGroups[] =
- {
- /* bgOcean */ { static_cast<int>(ARRAYCOUNT(rareOceanBiomes)), rareOceanBiomes},
- /* bgDesert */ { static_cast<int>(ARRAYCOUNT(rareDesertBiomes)), rareDesertBiomes},
- /* bgTemperate */ { static_cast<int>(ARRAYCOUNT(rareTemperateBiomes)), rareTemperateBiomes},
- /* bgMountains */ { static_cast<int>(ARRAYCOUNT(rareMountainBiomes)), rareMountainBiomes},
- /* bgIce */ { static_cast<int>(ARRAYCOUNT(rareIceBiomes)), rareIceBiomes},
+ static const cBiomesInGroups rareBiomesInGroups[] = {
+ /* bgOcean */ {static_cast<int>(ARRAYCOUNT(rareOceanBiomes)), rareOceanBiomes},
+ /* bgDesert */ {static_cast<int>(ARRAYCOUNT(rareDesertBiomes)), rareDesertBiomes},
+ /* bgTemperate */ {static_cast<int>(ARRAYCOUNT(rareTemperateBiomes)), rareTemperateBiomes},
+ /* bgMountains */ {static_cast<int>(ARRAYCOUNT(rareMountainBiomes)), rareMountainBiomes},
+ /* bgIce */ {static_cast<int>(ARRAYCOUNT(rareIceBiomes)), rareIceBiomes},
};
// Generate the underlying values, representing biome groups:
@@ -764,17 +722,16 @@ public:
for (int x = 0; x < SizeX; x++)
{
size_t val = static_cast<size_t>(a_Values[x + IdxZ]);
- const cBiomesInGroups & Biomes = (val > bgfRare) ?
- rareBiomesInGroups[(val & (bgfRare - 1)) % ARRAYCOUNT(rareBiomesInGroups)] :
- biomesInGroups[val % ARRAYCOUNT(biomesInGroups)];
+ const cBiomesInGroups & Biomes = (val > bgfRare)
+ ? rareBiomesInGroups[(val & (bgfRare - 1)) % ARRAYCOUNT(rareBiomesInGroups)]
+ : biomesInGroups[val % ARRAYCOUNT(biomesInGroups)];
int rnd = (Super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7);
a_Values[x + IdxZ] = Biomes.Biomes[rnd % Biomes.Count];
}
}
}
-protected:
-
+ protected:
struct cBiomesInGroups
{
const int Count;
@@ -791,23 +748,16 @@ protected:
/** Randomly replaces pixels of one value to another value, using the given chance. */
-template <int SizeX, int SizeZ = SizeX>
-class cIntGenReplaceRandomly:
- public cIntGenWithNoise<SizeX, SizeZ>
+template <int SizeX, int SizeZ = SizeX> class cIntGenReplaceRandomly : public cIntGenWithNoise<SizeX, SizeZ>
{
using Super = cIntGenWithNoise<SizeX, SizeZ>;
-public:
-
+ public:
using Underlying = std::shared_ptr<cIntGen<SizeX, SizeZ>>;
- cIntGenReplaceRandomly(int a_From, int a_To, int a_Chance, int a_Seed, Underlying a_Underlying):
- Super(a_Seed),
- m_From(a_From),
- m_To(a_To),
- m_Chance(a_Chance),
- m_Underlying(a_Underlying)
+ cIntGenReplaceRandomly(int a_From, int a_To, int a_Chance, int a_Seed, Underlying a_Underlying) :
+ Super(a_Seed), m_From(a_From), m_To(a_To), m_Chance(a_Chance), m_Underlying(a_Underlying)
{
}
@@ -837,7 +787,7 @@ public:
}
-protected:
+ protected:
/** The original value to be replaced. */
int m_From;
@@ -858,20 +808,16 @@ protected:
It first checks for oceans, if there is an ocean in the Biomes, it keeps the ocean.
If there's no ocean, it checks Rivers for a river, if there is a river, it uses the Biomes to select either
regular river or frozen river, based on the biome. */
-template <int SizeX, int SizeZ = SizeX>
-class cIntGenMixRivers:
- public cIntGen<SizeX, SizeZ>
+template <int SizeX, int SizeZ = SizeX> class cIntGenMixRivers : public cIntGen<SizeX, SizeZ>
{
using Super = cIntGen<SizeX, SizeZ>;
-public:
-
+ public:
using Underlying = std::shared_ptr<cIntGen<SizeX, SizeZ>>;
- cIntGenMixRivers(Underlying a_Biomes, Underlying a_Rivers):
- m_Biomes(a_Biomes),
- m_Rivers(a_Rivers)
+ cIntGenMixRivers(Underlying a_Biomes, Underlying a_Rivers) :
+ m_Biomes(a_Biomes), m_Rivers(a_Rivers)
{
}
@@ -914,7 +860,7 @@ public:
} // for z
}
-protected:
+ protected:
Underlying m_Biomes;
Underlying m_Rivers;
};
@@ -926,23 +872,19 @@ protected:
/** Generates a river based on the underlying data.
This is basically an edge detector over the underlying data. The rivers are the edges where the underlying data
changes from one pixel to its neighbor. */
-template <int SizeX, int SizeZ = SizeX>
-class cIntGenRiver:
- public cIntGenWithNoise<SizeX, SizeZ>
+template <int SizeX, int SizeZ = SizeX> class cIntGenRiver : public cIntGenWithNoise<SizeX, SizeZ>
{
using Super = cIntGenWithNoise<SizeX, SizeZ>;
static const int UnderlyingSizeX = SizeX + 2;
static const int UnderlyingSizeZ = SizeZ + 2;
-public:
-
+ public:
using Underlying = std::shared_ptr<cIntGen<UnderlyingSizeX, UnderlyingSizeZ>>;
- cIntGenRiver(int a_Seed, Underlying a_Underlying):
- Super(a_Seed),
- m_Underlying(a_Underlying)
+ cIntGenRiver(int a_Seed, Underlying a_Underlying) :
+ Super(a_Seed), m_Underlying(a_Underlying)
{
}
@@ -960,9 +902,9 @@ public:
{
int Above = Cache[x + 1 + z * UnderlyingSizeX];
int Below = Cache[x + 1 + (z + 2) * UnderlyingSizeX];
- int Left = Cache[x + (z + 1) * UnderlyingSizeX];
+ int Left = Cache[x + (z + 1) * UnderlyingSizeX];
int Right = Cache[x + 2 + (z + 1) * UnderlyingSizeX];
- int val = Cache[x + 1 + (z + 1) * UnderlyingSizeX];
+ int val = Cache[x + 1 + (z + 1) * UnderlyingSizeX];
if ((val == Above) && (val == Below) && (val == Left) && (val == Right))
{
@@ -977,7 +919,7 @@ public:
} // for z
}
-protected:
+ protected:
Underlying m_Underlying;
};
@@ -987,25 +929,19 @@ protected:
/** Turns some of the oceans into the specified biome. Used for mushroom and deep ocean.
The biome is only placed if at least 3 of its neighbors are ocean and only with the specified chance. */
-template <int SizeX, int SizeZ = SizeX>
-class cIntGenAddToOcean:
- public cIntGenWithNoise<SizeX, SizeZ>
+template <int SizeX, int SizeZ = SizeX> class cIntGenAddToOcean : public cIntGenWithNoise<SizeX, SizeZ>
{
using Super = cIntGenWithNoise<SizeX, SizeZ>;
static const int UnderlyingSizeX = SizeX + 2;
static const int UnderlyingSizeZ = SizeZ + 2;
-public:
-
+ public:
using Underlying = std::shared_ptr<cIntGen<UnderlyingSizeX, UnderlyingSizeZ>>;
- cIntGenAddToOcean(int a_Seed, int a_Chance, int a_ToValue, Underlying a_Underlying):
- Super(a_Seed),
- m_Chance(a_Chance),
- m_ToValue(a_ToValue),
- m_Underlying(a_Underlying)
+ cIntGenAddToOcean(int a_Seed, int a_Chance, int a_ToValue, Underlying a_Underlying) :
+ Super(a_Seed), m_Chance(a_Chance), m_ToValue(a_ToValue), m_Underlying(a_Underlying)
{
}
@@ -1031,7 +967,7 @@ public:
// Count the ocean neighbors:
int Above = Cache[x + 1 + z * UnderlyingSizeX];
int Below = Cache[x + 1 + (z + 2) * UnderlyingSizeX];
- int Left = Cache[x + (z + 1) * UnderlyingSizeX];
+ int Left = Cache[x + (z + 1) * UnderlyingSizeX];
int Right = Cache[x + 2 + (z + 1) * UnderlyingSizeX];
int NumOceanNeighbors = 0;
if (IsBiomeOcean(Above))
@@ -1052,10 +988,8 @@ public:
}
// If at least 3 ocean neighbors and the chance is right, change:
- if (
- (NumOceanNeighbors >= 3) &&
- ((Super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7) % 1000 < m_Chance)
- )
+ if ((NumOceanNeighbors >= 3) &&
+ ((Super::m_Noise.IntNoise2DInt(x + a_MinX, z + a_MinZ) / 7) % 1000 < m_Chance))
{
a_Values[x + z * SizeX] = m_ToValue;
}
@@ -1067,7 +1001,7 @@ public:
} // for z
}
-protected:
+ protected:
/** Chance, in permille, of changing the biome. */
int m_Chance;
@@ -1082,22 +1016,16 @@ protected:
/** Changes random pixels of the underlying data to the specified value. */
-template <int SizeX, int SizeZ = SizeX>
-class cIntGenSetRandomly:
- public cIntGenWithNoise<SizeX, SizeZ>
+template <int SizeX, int SizeZ = SizeX> class cIntGenSetRandomly : public cIntGenWithNoise<SizeX, SizeZ>
{
using Super = cIntGenWithNoise<SizeX, SizeZ>;
-public:
-
+ public:
using Underlying = std::shared_ptr<cIntGen<SizeX, SizeZ>>;
- cIntGenSetRandomly(int a_Seed, int a_Chance, int a_ToValue, Underlying a_Underlying):
- Super(a_Seed),
- m_Chance(a_Chance),
- m_ToValue(a_ToValue),
- m_Underlying(a_Underlying)
+ cIntGenSetRandomly(int a_Seed, int a_Chance, int a_ToValue, Underlying a_Underlying) :
+ Super(a_Seed), m_Chance(a_Chance), m_ToValue(a_ToValue), m_Underlying(a_Underlying)
{
}
@@ -1121,7 +1049,7 @@ public:
}
}
-protected:
+ protected:
/** Chance, in permille, of changing each pixel. */
int m_Chance;
@@ -1136,21 +1064,16 @@ protected:
/** Adds a "rare" flag to random biome groups, based on the given chance. */
-template <int SizeX, int SizeZ = SizeX>
-class cIntGenRareBiomeGroups:
- public cIntGenWithNoise<SizeX, SizeZ>
+template <int SizeX, int SizeZ = SizeX> class cIntGenRareBiomeGroups : public cIntGenWithNoise<SizeX, SizeZ>
{
using Super = cIntGenWithNoise<SizeX, SizeZ>;
-public:
-
+ public:
using Underlying = std::shared_ptr<cIntGen<SizeX, SizeZ>>;
- cIntGenRareBiomeGroups(int a_Seed, int a_Chance, Underlying a_Underlying):
- Super(a_Seed),
- m_Chance(a_Chance),
- m_Underlying(a_Underlying)
+ cIntGenRareBiomeGroups(int a_Seed, int a_Chance, Underlying a_Underlying) :
+ Super(a_Seed), m_Chance(a_Chance), m_Underlying(a_Underlying)
{
}
@@ -1175,7 +1098,7 @@ public:
}
}
-protected:
+ protected:
/** Chance, in permille, of changing each pixel into the rare biome group. */
int m_Chance;
@@ -1189,21 +1112,16 @@ protected:
/** Changes biomes in the parent data into an alternate versions (usually "hill" variants), in such places
that have their alterations set. */
-template <int SizeX, int SizeZ = SizeX>
-class cIntGenAlternateBiomes:
- public cIntGenWithNoise<SizeX, SizeZ>
+template <int SizeX, int SizeZ = SizeX> class cIntGenAlternateBiomes : public cIntGenWithNoise<SizeX, SizeZ>
{
using Super = cIntGenWithNoise<SizeX, SizeZ>;
-public:
-
+ public:
using Underlying = std::shared_ptr<cIntGen<SizeX, SizeZ>>;
- cIntGenAlternateBiomes(int a_Seed, Underlying a_Alterations, Underlying a_BaseBiomes):
- Super(a_Seed),
- m_Alterations(a_Alterations),
- m_BaseBiomes(a_BaseBiomes)
+ cIntGenAlternateBiomes(int a_Seed, Underlying a_Alterations, Underlying a_BaseBiomes) :
+ Super(a_Seed), m_Alterations(a_Alterations), m_BaseBiomes(a_BaseBiomes)
{
}
@@ -1229,26 +1147,26 @@ public:
switch (val)
{
case biBirchForest: val = biBirchForestHills; break;
- case biDesert: val = biDesertHills; break;
+ case biDesert: val = biDesertHills; break;
case biExtremeHills: val = biExtremeHillsPlus; break;
- case biForest: val = biForestHills; break;
- case biIcePlains: val = biIceMountains; break;
- case biJungle: val = biJungleHills; break;
- case biMegaTaiga: val = biMegaTaigaHills; break;
- case biMesaPlateau: val = biMesa; break;
- case biMesaPlateauF: val = biMesa; break;
- case biMesaPlateauM: val = biMesa; break;
- case biMesaPlateauFM: val = biMesa; break;
- case biPlains: val = biForest; break;
- case biRoofedForest: val = biPlains; break;
- case biSavanna: val = biSavannaPlateau; break;
- case biTaiga: val = biTaigaHills; break;
+ case biForest: val = biForestHills; break;
+ case biIcePlains: val = biIceMountains; break;
+ case biJungle: val = biJungleHills; break;
+ case biMegaTaiga: val = biMegaTaigaHills; break;
+ case biMesaPlateau: val = biMesa; break;
+ case biMesaPlateauF: val = biMesa; break;
+ case biMesaPlateauM: val = biMesa; break;
+ case biMesaPlateauFM: val = biMesa; break;
+ case biPlains: val = biForest; break;
+ case biRoofedForest: val = biPlains; break;
+ case biSavanna: val = biSavannaPlateau; break;
+ case biTaiga: val = biTaigaHills; break;
}
a_Values[idx] = val;
} // for idx - a_Values[]
}
-protected:
+ protected:
Underlying m_Alterations;
Underlying m_BaseBiomes;
};
@@ -1258,23 +1176,19 @@ protected:
/** Adds an edge between two specifically incompatible biomes, such as mesa and forest. */
-template <int SizeX, int SizeZ = SizeX>
-class cIntGenBiomeEdges:
- public cIntGenWithNoise<SizeX, SizeZ>
+template <int SizeX, int SizeZ = SizeX> class cIntGenBiomeEdges : public cIntGenWithNoise<SizeX, SizeZ>
{
using Super = cIntGenWithNoise<SizeX, SizeZ>;
static const int m_LowerSizeX = SizeX + 2;
static const int m_LowerSizeZ = SizeZ + 2;
-public:
-
+ public:
using Underlying = std::shared_ptr<cIntGen<m_LowerSizeX, m_LowerSizeZ>>;
- cIntGenBiomeEdges(int a_Seed, Underlying a_Underlying):
- Super(a_Seed),
- m_Underlying(a_Underlying)
+ cIntGenBiomeEdges(int a_Seed, Underlying a_Underlying) :
+ Super(a_Seed), m_Underlying(a_Underlying)
{
}
@@ -1291,9 +1205,9 @@ public:
for (int x = 0; x < SizeX; x++)
{
int biome = lowerValues[x + 1 + (z + 1) * m_LowerSizeX];
- int above = lowerValues[x + 1 + z * m_LowerSizeX];
+ int above = lowerValues[x + 1 + z * m_LowerSizeX];
int below = lowerValues[x + 1 + (z + 2) * m_LowerSizeX];
- int left = lowerValues[x + (z + 1) * m_LowerSizeX];
+ int left = lowerValues[x + (z + 1) * m_LowerSizeX];
int right = lowerValues[x + 2 + (z + 1) * m_LowerSizeX];
switch (biome)
@@ -1302,12 +1216,10 @@ public:
case biDesertM:
case biDesertHills:
{
- if (
- IsBiomeVeryCold(static_cast<EMCSBiome>(above)) ||
+ if (IsBiomeVeryCold(static_cast<EMCSBiome>(above)) ||
IsBiomeVeryCold(static_cast<EMCSBiome>(below)) ||
- IsBiomeVeryCold(static_cast<EMCSBiome>(left)) ||
- IsBiomeVeryCold(static_cast<EMCSBiome>(right))
- )
+ IsBiomeVeryCold(static_cast<EMCSBiome>(left)) ||
+ IsBiomeVeryCold(static_cast<EMCSBiome>(right)))
{
biome = biPlains;
}
@@ -1319,12 +1231,8 @@ public:
case biMesaPlateauFM:
case biMesaPlateauM:
{
- if (
- !isMesaCompatible(above) ||
- !isMesaCompatible(below) ||
- !isMesaCompatible(left) ||
- !isMesaCompatible(right)
- )
+ if (!isMesaCompatible(above) || !isMesaCompatible(below) || !isMesaCompatible(left) ||
+ !isMesaCompatible(right))
{
biome = biDesert;
}
@@ -1334,12 +1242,8 @@ public:
case biJungle:
case biJungleM:
{
- if (
- !isJungleCompatible(above) ||
- !isJungleCompatible(below) ||
- !isJungleCompatible(left) ||
- !isJungleCompatible(right)
- )
+ if (!isJungleCompatible(above) || !isJungleCompatible(below) || !isJungleCompatible(left) ||
+ !isJungleCompatible(right))
{
biome = (biome == biJungle) ? biJungleEdge : biJungleEdgeM;
}
@@ -1349,12 +1253,10 @@ public:
case biSwampland:
case biSwamplandM:
{
- if (
- IsBiomeNoDownfall(static_cast<EMCSBiome>(above)) ||
+ if (IsBiomeNoDownfall(static_cast<EMCSBiome>(above)) ||
IsBiomeNoDownfall(static_cast<EMCSBiome>(below)) ||
- IsBiomeNoDownfall(static_cast<EMCSBiome>(left)) ||
- IsBiomeNoDownfall(static_cast<EMCSBiome>(right))
- )
+ IsBiomeNoDownfall(static_cast<EMCSBiome>(left)) ||
+ IsBiomeNoDownfall(static_cast<EMCSBiome>(right)))
{
biome = biPlains;
}
@@ -1368,7 +1270,7 @@ public:
}
-protected:
+ protected:
Underlying m_Underlying;
@@ -1422,21 +1324,16 @@ protected:
/** Changes biomes in the parent data into their alternate versions ("M" variants), in such places that
have their alterations set. */
-template <int SizeX, int SizeZ = SizeX>
-class cIntGenMBiomes:
- public cIntGenWithNoise<SizeX, SizeZ>
+template <int SizeX, int SizeZ = SizeX> class cIntGenMBiomes : public cIntGenWithNoise<SizeX, SizeZ>
{
using Super = cIntGenWithNoise<SizeX, SizeZ>;
-public:
-
+ public:
using Underlying = std::shared_ptr<cIntGen<SizeX, SizeZ>>;
- cIntGenMBiomes(int a_Seed, Underlying a_Alteration, Underlying a_Underlying):
- Super(a_Seed),
- m_Underlying(a_Underlying),
- m_Alteration(a_Alteration)
+ cIntGenMBiomes(int a_Seed, Underlying a_Alteration, Underlying a_Underlying) :
+ Super(a_Seed), m_Underlying(a_Underlying), m_Alteration(a_Alteration)
{
}
@@ -1459,31 +1356,31 @@ public:
// Ice spikes biome was removed from here, because it was generated way too often
switch (a_Values[idx])
{
- case biPlains: a_Values[idx] = biSunflowerPlains; break;
- case biDesert: a_Values[idx] = biDesertM; break;
- case biExtremeHills: a_Values[idx] = biExtremeHillsM; break;
- case biForest: a_Values[idx] = biFlowerForest; break;
- case biTaiga: a_Values[idx] = biTaigaM; break;
- case biSwampland: a_Values[idx] = biSwamplandM; break;
- case biJungle: a_Values[idx] = biJungleM; break;
- case biJungleEdge: a_Values[idx] = biJungleEdgeM; break;
- case biBirchForest: a_Values[idx] = biBirchForestM; break;
- case biBirchForestHills: a_Values[idx] = biBirchForestHillsM; break;
- case biRoofedForest: a_Values[idx] = biRoofedForestM; break;
- case biColdTaiga: a_Values[idx] = biColdTaigaM; break;
- case biMegaSpruceTaiga: a_Values[idx] = biMegaSpruceTaiga; break;
+ case biPlains: a_Values[idx] = biSunflowerPlains; break;
+ case biDesert: a_Values[idx] = biDesertM; break;
+ case biExtremeHills: a_Values[idx] = biExtremeHillsM; break;
+ case biForest: a_Values[idx] = biFlowerForest; break;
+ case biTaiga: a_Values[idx] = biTaigaM; break;
+ case biSwampland: a_Values[idx] = biSwamplandM; break;
+ case biJungle: a_Values[idx] = biJungleM; break;
+ case biJungleEdge: a_Values[idx] = biJungleEdgeM; break;
+ case biBirchForest: a_Values[idx] = biBirchForestM; break;
+ case biBirchForestHills: a_Values[idx] = biBirchForestHillsM; break;
+ case biRoofedForest: a_Values[idx] = biRoofedForestM; break;
+ case biColdTaiga: a_Values[idx] = biColdTaigaM; break;
+ case biMegaSpruceTaiga: a_Values[idx] = biMegaSpruceTaiga; break;
case biMegaSpruceTaigaHills: a_Values[idx] = biMegaSpruceTaigaHills; break;
- case biExtremeHillsPlus: a_Values[idx] = biExtremeHillsPlusM; break;
- case biSavanna: a_Values[idx] = biSavannaM; break;
- case biSavannaPlateau: a_Values[idx] = biSavannaPlateauM; break;
- case biMesa: a_Values[idx] = biMesaBryce; break;
- case biMesaPlateauF: a_Values[idx] = biMesaPlateauFM; break;
- case biMesaPlateau: a_Values[idx] = biMesaBryce; break;
+ case biExtremeHillsPlus: a_Values[idx] = biExtremeHillsPlusM; break;
+ case biSavanna: a_Values[idx] = biSavannaM; break;
+ case biSavannaPlateau: a_Values[idx] = biSavannaPlateauM; break;
+ case biMesa: a_Values[idx] = biMesaBryce; break;
+ case biMesaPlateauF: a_Values[idx] = biMesaPlateauFM; break;
+ case biMesaPlateau: a_Values[idx] = biMesaBryce; break;
}
} // for idx - a_Values[] / alterations[]
}
-protected:
+ protected:
Underlying m_Underlying;
Underlying m_Alteration;
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 14:36:39 +0100