diff options
Diffstat (limited to 'indra/llcommon/llrand.cpp')
| -rw-r--r-- | indra/llcommon/llrand.cpp | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/indra/llcommon/llrand.cpp b/indra/llcommon/llrand.cpp index 0192111574..25d75af568 100644 --- a/indra/llcommon/llrand.cpp +++ b/indra/llcommon/llrand.cpp @@ -1,25 +1,25 @@ -/** +/** * @file llrand.cpp * @brief Global random generator. * * $LicenseInfo:firstyear=2000&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2010, Linden Research, Inc. - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; * version 2.1 of the License only. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -69,25 +69,25 @@ inline REAL ll_internal_random(); template <> inline F64 ll_internal_random<F64>() { - // *HACK: Through experimentation, we have found that dual core - // CPUs (or at least multi-threaded processes) seem to - // occasionally give an obviously incorrect random number -- like - // 5^15 or something. Sooooo, clamp it as described above. - F64 rv{ gRandomGenerator() }; - if(!((rv >= 0.0) && (rv < 1.0))) return fmod(rv, 1.0); - return rv; + // *HACK: Through experimentation, we have found that dual core + // CPUs (or at least multi-threaded processes) seem to + // occasionally give an obviously incorrect random number -- like + // 5^15 or something. Sooooo, clamp it as described above. + F64 rv{ gRandomGenerator() }; + if(!((rv >= 0.0) && (rv < 1.0))) return fmod(rv, 1.0); + return rv; } template <> inline F32 ll_internal_random<F32>() { - // *HACK: clamp the result as described above. - // Per Monty, it's important to clamp using the correct fmodf() rather - // than expanding to F64 for fmod() and then truncating back to F32. Prior - // to this change, we were getting sporadic ll_frand() == 1.0 results. - F32 rv{ narrow<F32>(gRandomGenerator()) }; - if(!((rv >= 0.0f) && (rv < 1.0f))) return fmodf(rv, 1.0f); - return rv; + // *HACK: clamp the result as described above. + // Per Monty, it's important to clamp using the correct fmodf() rather + // than expanding to F64 for fmod() and then truncating back to F32. Prior + // to this change, we were getting sporadic ll_frand() == 1.0 results. + F32 rv{ narrow<F32>(gRandomGenerator()) }; + if(!((rv >= 0.0f) && (rv < 1.0f))) return fmodf(rv, 1.0f); + return rv; } /*------------------------------ F64 aliases -------------------------------*/ @@ -98,7 +98,7 @@ inline F64 ll_internal_random_double() F64 ll_drand() { - return ll_internal_random_double(); + return ll_internal_random_double(); } /*------------------------------ F32 aliases -------------------------------*/ @@ -109,37 +109,37 @@ inline F32 ll_internal_random_float() F32 ll_frand() { - return ll_internal_random_float(); + return ll_internal_random_float(); } /*-------------------------- clamped random range --------------------------*/ S32 ll_rand() { - return ll_rand(RAND_MAX); + return ll_rand(RAND_MAX); } S32 ll_rand(S32 val) { - // The clamping rules are described above. - S32 rv = (S32)(ll_internal_random_double() * val); - if(rv == val) return 0; - return rv; + // The clamping rules are described above. + S32 rv = (S32)(ll_internal_random_double() * val); + if(rv == val) return 0; + return rv; } template <typename REAL> REAL ll_grand(REAL val) { - // The clamping rules are described above. - REAL rv = ll_internal_random<REAL>() * val; - if(val > 0) - { - if(rv >= val) return REAL(); - } - else - { - if(rv <= val) return REAL(); - } - return rv; + // The clamping rules are described above. + REAL rv = ll_internal_random<REAL>() * val; + if(val > 0) + { + if(rv >= val) return REAL(); + } + else + { + if(rv <= val) return REAL(); + } + return rv; } F32 ll_frand(F32 val) |