Vertical biome blend: Tune blend patterns

paramat · paramat · commit f9ad0619103c · 2018-02-20T15:28:52.000Z
diff --git a/src/mapgen/mg_biome.cpp b/src/mapgen/mg_biome.cpp
@@ -133,7 +133,7 @@ Biome *BiomeManager::getBiomeFromNoiseOriginal(float heat, float humidity, s16 y
 		}
 	}
 
-	mysrand(y + (heat - humidity) * 2);
+	mysrand(y + (heat + humidity) / 2);
 	if (biome_closest_blend &&
 			myrand_range(0, biome_closest_blend->vertical_blend) >=
 			y - biome_closest_blend->y_max)
@@ -196,7 +196,7 @@ BiomeGenOriginal::~BiomeGenOriginal()
 	delete noise_humidity_blend;
 }
 
-
+// Only usable in a mapgen thread
 Biome *BiomeGenOriginal::calcBiomeAtPoint(v3s16 pos) const
 {
 	float heat =
@@ -286,8 +286,9 @@ Biome *BiomeGenOriginal::calcBiomeFromNoise(float heat, float humidity, s16 y) c
 	}
 
 	// Carefully tune pseudorandom seed variation to avoid single node dither
-	// and create larger scale blending patterns.
-	mysrand(y + (heat - humidity) * 2);
+	// and create larger scale blending patterns similar to horizontal biome
+	// blend.
+	mysrand(y + (heat + humidity) / 2);
 
 	if (biome_closest_blend &&
 			myrand_range(0, biome_closest_blend->vertical_blend) >=

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ Biome *BiomeManager::getBiomeFromNoiseOriginal(float heat, float humidity, s16 y`
`133`	`133`	`}`
`134`	`134`	`}`
`135`	`135`
`136`		`- mysrand(y + (heat - humidity) * 2);`
	`136`	`+ mysrand(y + (heat + humidity) / 2);`
`137`	`137`	`if (biome_closest_blend &&`
`138`	`138`	`myrand_range(0, biome_closest_blend->vertical_blend) >=`
`139`	`139`	`y - biome_closest_blend->y_max)`
`@@ -196,7 +196,7 @@ BiomeGenOriginal::~BiomeGenOriginal()`
`196`	`196`	`delete noise_humidity_blend;`
`197`	`197`	`}`
`198`	`198`
`199`		`-`
	`199`	`+// Only usable in a mapgen thread`
`200`	`200`	`Biome *BiomeGenOriginal::calcBiomeAtPoint(v3s16 pos) const`
`201`	`201`	`{`
`202`	`202`	`float heat =`
`@@ -286,8 +286,9 @@ Biome *BiomeGenOriginal::calcBiomeFromNoise(float heat, float humidity, s16 y) c`
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`// Carefully tune pseudorandom seed variation to avoid single node dither`
`289`		`- // and create larger scale blending patterns.`
`290`		`- mysrand(y + (heat - humidity) * 2);`
	`289`	`+ // and create larger scale blending patterns similar to horizontal biome`
	`290`	`+ // blend.`
	`291`	`+ mysrand(y + (heat + humidity) / 2);`
`291`	`292`
`292`	`293`	`if (biome_closest_blend &&`
`293`	`294`	`myrand_range(0, biome_closest_blend->vertical_blend) >=`