diff options
Diffstat (limited to 'Client/Source/Phy2DLite/Math.h')
| -rw-r--r-- | Client/Source/Phy2DLite/Math.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Client/Source/Phy2DLite/Math.h b/Client/Source/Phy2DLite/Math.h index 9c0ff8f..7e10b73 100644 --- a/Client/Source/Phy2DLite/Math.h +++ b/Client/Source/Phy2DLite/Math.h @@ -6,6 +6,7 @@ #include <string> #include "Settings.h" +#include "Constants.h" namespace Phy2D { @@ -69,8 +70,8 @@ namespace Phy2D number a = col1.x, b = col2.x, c = col1.y, d = col2.y; Mat22 B; number det = a * d - b * c; - assert(det != 0.0f); - det = (number)1.0f / det; + assert(det != _0); + det = (number)_1 / det; B.col1.x = det * d; B.col2.x = -det * b; B.col1.y = -det * c; B.col2.y = det * a; return B; @@ -131,7 +132,7 @@ namespace Phy2D inline number Abs(number a) { - return a > 0.0f ? a : -a; + return a > _0 ? a : -a; } inline Vec2 Abs(const Vec2& a) @@ -146,7 +147,7 @@ namespace Phy2D inline number Sign(number x) { - return (float) x < 0.0f ? -1.0f : 1.0f; + return x < _0 ? -_1 : _1; } inline number Min(number a, number b) @@ -176,7 +177,7 @@ namespace Phy2D //{ // number r = (number)rand(); // r /= RAND_MAX; - // r = (number)2.0f * r - 1.0f; + // r = (number)2.0f * r - _1; // return r; //} |