TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1409 from Azaezel/LinuxLongLoopiness

Browse source 
U32 MRandomLCG::randI() was using longs
This commit is contained in:
Areloch 2015-09-16 21:27:56 -05:00
commit 70c7a67456
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/math/mRandom.cpp
View file

@ -88,13 +88,13 @@ void MRandomLCG::setSeed(S32 s)
U32 MRandomLCG::randI() U32 MRandomLCG::randI()
{ {
if ( mSeed <= msQuotient ) if ( mSeed <= msQuotient )
mSeed = (mSeed * 16807L) % S32_MAX; mSeed = (mSeed * 16807) % S32_MAX;
else else
{ {
S32 high_part = mSeed / msQuotient; S32 high_part = mSeed / msQuotient;
S32 low_part = mSeed % msQuotient; S32 low_part = mSeed % msQuotient;
S32 test = (16807L * low_part) - (msRemainder * high_part); S32 test = (16807 * low_part) - (msRemainder * high_part);
if ( test > 0 ) if ( test > 0 )
mSeed = test; mSeed = test;

2
Engine/source/math/mRandom.h
View file

@ -54,7 +54,7 @@ public:
inline F32 MRandomGenerator::randF() inline F32 MRandomGenerator::randF()
{ {
// default: multiply by 1/(2^31) // default: multiply by 1/(2^31)
return F32(randI()) * (1.0f/2147483647.0f); return F32(randI()) * (1.0f / S32_MAX);
} }
inline S32 MRandomGenerator::randI(S32 i, S32 n) inline S32 MRandomGenerator::randI(S32 i, S32 n)