diff options
Diffstat (limited to 'src/math/functions.cc')
-rw-r--r-- | src/math/functions.cc | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/src/math/functions.cc b/src/math/functions.cc index 0e394c1..53ce41e 100644 --- a/src/math/functions.cc +++ b/src/math/functions.cc @@ -1,39 +1,47 @@ /* common/functions.cc - This file is part of the Osirion project and is distributed under - the terms of the GNU General Public License version 2 + This file is part of the Osirion project and is distributed under + the terms of the GNU General Public License version 2 */ // project headers #include "math/functions.h" -namespace math { +namespace math +{ -float min(float a, float b) { +float min(float a, float b) +{ return (a < b ? a : b); } -float max(float a, float b) { +float max(float a, float b) +{ return (a > b ? a : b); } -int min(int a, int b) { +int min(int a, int b) +{ return (a < b ? a : b); } -int max(int a, int b) { +int max(int a, int b) +{ return (a > b ? a : b); } -float randomf(const float max) { +float randomf(const float max) +{ return ((float) rand() / (float) RAND_MAX) * max; } -unsigned randomi(const unsigned int max) { +unsigned randomi(const unsigned int max) +{ return ((unsigned int)(rand() % max)); } -float degrees180f(float angle) { +float degrees180f(float angle) +{ float r = angle; while (r <= -180.0f) r += 360.0f; @@ -42,7 +50,8 @@ float degrees180f(float angle) { return r; } -float degrees360f(float angle) { +float degrees360f(float angle) +{ float r = angle; while (r < 0.0f) r += 360.0f; @@ -53,9 +62,9 @@ float degrees360f(float angle) { float sgnf(float value) { - if (value < 0 ) + if (value < 0) return -1; - else if (value == 0 ) + else if (value == 0) return 0; return 1; |