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

Fix FastRandom seeding

Browse Source 
Fixes #1815
Fixes #2021
This commit is contained in:
worktycho 2015-05-17 10:53:16 +01:00 committed by tycho
parent a22f0795f6
commit c94134ec5e
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/FastRandom.cpp
View File

@ -6,12 +6,28 @@
#include "Globals.h" #include "Globals.h"
#include "FastRandom.h" #include "FastRandom.h"
#include <random>
#ifdef _WIN32 #ifdef _WIN32
#define thread_local __declspec(thread) #define thread_local static __declspec(thread)
#elseif __OSX__
#define thread_local static __thread
#endif #endif
thread_local unsigned int m_Counter = 0; static unsigned int GetRandomSeed()
{
thread_local bool SeedCounterInitialized = 0;
thread_local unsigned int SeedCounter = 0;
if (!SeedCounterInitialized)
{
std::random_device rd;
std::uniform_int_distribution<unsigned int> dist;
SeedCounter = dist(rd);
SeedCounterInitialized = true;
}
return ++SeedCounter;
}
@ -92,7 +108,7 @@ public:
cFastRandom::cFastRandom(void) : cFastRandom::cFastRandom(void) :
m_LinearRand(m_Counter++) m_LinearRand(GetRandomSeed())
{ {
} }
@ -136,7 +152,7 @@ int cFastRandom::GenerateRandomInteger(int a_Begin, int a_End)
// MTRand: // MTRand:
MTRand::MTRand() : MTRand::MTRand() :
m_MersenneRand(m_Counter++) m_MersenneRand(GetRandomSeed())
{ {
} }