1
0

Merge pull request #1786 from mc-server/pipelineSyntax

Added pipelining syntax for generators
This commit is contained in:
worktycho
2015-03-21 21:08:33 +00:00
3 changed files with 88 additions and 22 deletions

View File

@@ -941,21 +941,21 @@ public:
cBioGenGrown(int a_Seed)
{
auto FinalRivers =
std::make_shared<cIntGenSmooth<8>> (a_Seed + 1,
std::make_shared<cIntGenZoom <10>> (a_Seed + 2,
std::make_shared<cIntGenRiver <7>> (a_Seed + 3,
std::make_shared<cIntGenZoom <9>> (a_Seed + 4,
std::make_shared<cIntGenSmooth<6>> (a_Seed + 5,
std::make_shared<cIntGenZoom <8>> (a_Seed + 8,
std::make_shared<cIntGenSmooth<6>> (a_Seed + 5,
std::make_shared<cIntGenZoom <8>> (a_Seed + 9,
std::make_shared<cIntGenSmooth<6>> (a_Seed + 5,
std::make_shared<cIntGenZoom <8>> (a_Seed + 10,
std::make_shared<cIntGenSmooth<6>> (a_Seed + 5,
std::make_shared<cIntGenSmooth<8>> (a_Seed + 6,
std::make_shared<cIntGenZoom <10>> (a_Seed + 11,
std::make_shared<cIntGenChoice<2, 7>>(a_Seed + 12
))))))))))))));
std::make_shared<cIntGenChoice<2, 7>>(a_Seed + 12)
| MakeIntGen<cIntGenZoom <10>>(a_Seed + 11)
| MakeIntGen<cIntGenSmooth<8>>(a_Seed + 6)
| MakeIntGen<cIntGenSmooth<6>>(a_Seed + 5)
| MakeIntGen<cIntGenZoom <8>>(a_Seed + 10)
| MakeIntGen<cIntGenSmooth<6>>(a_Seed + 5)
| MakeIntGen<cIntGenZoom <8>>(a_Seed + 9)
| MakeIntGen<cIntGenSmooth<6>>(a_Seed + 5)
| MakeIntGen<cIntGenZoom <8>>(a_Seed + 8)
| MakeIntGen<cIntGenSmooth<6>>(a_Seed + 5)
| MakeIntGen<cIntGenZoom <9>>(a_Seed + 4)
| MakeIntGen<cIntGenRiver <7>>(a_Seed + 3)
| MakeIntGen<cIntGenZoom <10>>(a_Seed + 2)
| MakeIntGen<cIntGenSmooth<8>>(a_Seed + 1);
auto alteration =
std::make_shared<cIntGenZoom <8>>(a_Seed,
@@ -1000,9 +1000,9 @@ public:
std::make_shared<cIntGenReplaceRandomly<6>> (a_Seed + 101, bgIce, bgTemperate, 150,
std::make_shared<cIntGenAddIslands <6>> (a_Seed + 2000, 200,
std::make_shared<cIntGenSetRandomly <6>> (a_Seed + 9, 50, bgOcean,
std::make_shared<cIntGenZoom <6>> (a_Seed + 10,
std::make_shared<cIntGenLandOcean <5>> (a_Seed + 100, 30
)))))))))))))))))))))))))))))));
std::make_shared<cIntGenLandOcean <5>> (a_Seed + 100, 30)
| MakeIntGen<cIntGenZoom <6>> (a_Seed + 10)
)))))))))))))))))))))))))))));
m_Gen =
std::make_shared<cIntGenSmooth <16>>(a_Seed,