Fix typos and compiler warnings (see comments to 2b3afd95a23f).

This commit is contained in:
vrld
2012-09-11 14:29:05 +02:00
parent 4ec7609d37
commit 8ba6c2b523
2 changed files with 7 additions and 6 deletions
+4 -4
View File
@@ -4,9 +4,9 @@
namespace namespace
{ {
// The BoxMuller transform generates two random numbers, one of which we cache here. // The BoxMuller transform generates two random numbers, one of which we
// A value +infinity is used to signal the cache is invalid and that new numbers have // cache here. A value of +infinity is used to signal the cache is invalid
// to be generated. // and that new numbers have to be generated.
float last_randnormal = std::numeric_limits<float>::infinity(); float last_randnormal = std::numeric_limits<float>::infinity();
} }
@@ -25,7 +25,7 @@ float random_normal(float o)
// else: generate numbers using the Box-Muller transform // else: generate numbers using the Box-Muller transform
float a = sqrt(-2.0f * log(random())); float a = sqrt(-2.0f * log(random()));
float b = LOVE_M_PI * 2.0f * random(); float b = float(LOVE_M_PI) * 2.0f * random();
last_randnormal = a * cos(b); last_randnormal = a * cos(b);
return a * sin(b) * o; return a * sin(b) * o;
} }
+3 -2
View File
@@ -87,7 +87,8 @@ inline float next_p2(float x)
*/ */
inline float random() inline float random()
{ {
return float(rand()) / (float(RAND_MAX) + 1.0f); // to satisfy picky compilers...
return float(double(rand() % RAND_MAX) / double(RAND_MAX));
} }
/** /**
@@ -114,7 +115,7 @@ inline float random(float min, float max)
* @returns Normal distributed random number with mean 0 and variance o^2. * @returns Normal distributed random number with mean 0 and variance o^2.
*/ */
float random_normal(float o = 1.); float random_normal(float o = 1.);
#define random_gaussion random_normal #define random_gaussian random_normal
} // love } // love