Skip to content
Permalink
Browse files

Fix thread safety of PcgRandom use in BiomeGen

  • Loading branch information
sfan5 authored and nerzhul committed May 5, 2020
1 parent ab06880 commit f3e87c53a5afc264e657acd99d3a39fbec3b63c9
Showing with 7 additions and 4 deletions.
  1. +7 −4 src/mapgen/mg_biome.cpp
@@ -154,9 +154,11 @@ const Biome *BiomeManager::getBiomeFromNoiseOriginal(float heat,
}
}

mysrand(pos.Y + (heat + humidity) * 0.9f);
const u64 seed = pos.Y + (heat + humidity) * 0.9f;
PcgRandom rng(seed);

if (biome_closest_blend && dist_min_blend <= dist_min &&
myrand_range(0, biome_closest_blend->vertical_blend) >=
rng.range(0, biome_closest_blend->vertical_blend) >=
pos.Y - biome_closest_blend->max_pos.Y)
return biome_closest_blend;

@@ -319,10 +321,11 @@ Biome *BiomeGenOriginal::calcBiomeFromNoise(float heat, float humidity, v3s16 po
// Carefully tune pseudorandom seed variation to avoid single node dither
// and create larger scale blending patterns similar to horizontal biome
// blend.
mysrand(pos.Y + (heat + humidity) * 0.9f);
const u64 seed = pos.Y + (heat + humidity) * 0.9f;
PcgRandom rng(seed);

if (biome_closest_blend && dist_min_blend <= dist_min &&
myrand_range(0, biome_closest_blend->vertical_blend) >=
rng.range(0, biome_closest_blend->vertical_blend) >=
pos.Y - biome_closest_blend->max_pos.Y)
return biome_closest_blend;

0 comments on commit f3e87c5

Please sign in to comment.
You can’t perform that action at this time.