asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6751 from SuperUserNameMan/new_PRNG_for_rand_from_seed

Browse source 
xorshift32 PRNG for Math::rand_from_seed()
This commit is contained in:
Rémi Verschelde 2016-10-30 10:49:22 +01:00 committed by GitHub
commit 89001369e7
1 changed files with 8 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
core/math/math_funcs.cpp
View file

@ -41,37 +41,16 @@ static uint32_t Q[4096];
#endif
uint32_t Math::rand_from_seed(uint32_t *seed) {
#if 1
uint32_t k;
uint32_t s = (*seed);
if (s == 0)
s = 0x12345987;
k = s / 127773;
s = 16807 * (s - k * 127773) - 2836 * k;
// if (s < 0)
// s += 2147483647;
(*seed) = s;
return (s & Math::RANDOM_MAX);
#else
*seed = *seed * 1103515245 + 12345;
return (*seed % ((unsigned int)RANDOM_MAX + 1));
#endif
// Xorshift31 PRNG
if ( *seed == 0 ) *seed = Math::RANDOM_MAX;
(*seed) ^= (*seed) << 13;
(*seed) ^= (*seed) >> 17;
(*seed) ^= (*seed) << 5;
return (*seed) & Math::RANDOM_MAX;
}
void Math::seed(uint32_t x) {
#if 0
int i;
Q[0] = x;
Q[1] = x + PHI;
Q[2] = x + PHI + PHI;
for (i = 3; i < 4096; i++)
Q[i] = Q[i - 3] ^ Q[i - 2] ^ PHI ^ i;
#else
default_seed=x;
#endif
}
void Math::randomize() {
@ -82,12 +61,12 @@ void Math::randomize() {
uint32_t Math::rand() {
return rand_from_seed(&default_seed)&0x7FFFFFFF;
return rand_from_seed(&default_seed);
}
double Math::randf() {
return (double)rand() / (double)RANDOM_MAX;
return (double)rand() / (double)Math::RANDOM_MAX;
}
double Math::sin(double p_x) {