diff options
| author | Martin Poirier <theeth@yahoo.com> | 2009-03-13 21:04:38 +0300 |
|---|---|---|
| committer | Martin Poirier <theeth@yahoo.com> | 2009-03-13 21:04:38 +0300 |
| commit | 54a55827ecee7f25d6a52255d8a639498a678fa6 (patch) | |
| tree | 6311657bfab7e75fa59e6828e0381bdcd4ec9eda /extern/bullet2/src/BulletCollision/Gimpact/btBoxCollision.h | |
| parent | dff781c2a8c77f35fefe00b0a561235861d4d053 (diff) | |
| parent | 39acb4efa4c3f35806f5dc37124ff1028eb18215 (diff) | |
merging trunk 19093:19274etch-a-ton
Diffstat (limited to 'extern/bullet2/src/BulletCollision/Gimpact/btBoxCollision.h')
| -rw-r--r-- | extern/bullet2/src/BulletCollision/Gimpact/btBoxCollision.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/extern/bullet2/src/BulletCollision/Gimpact/btBoxCollision.h b/extern/bullet2/src/BulletCollision/Gimpact/btBoxCollision.h index cf43f487e24..827a3c89587 100644 --- a/extern/bullet2/src/BulletCollision/Gimpact/btBoxCollision.h +++ b/extern/bullet2/src/BulletCollision/Gimpact/btBoxCollision.h @@ -26,9 +26,6 @@ subject to the following restrictions: #include "LinearMath/btTransform.h" -/*! \defgroup BOUND_AABB_OPERATIONS -*/ -//! @{ ///Swap numbers #define BT_SWAP_NUMBERS(a,b){ \ @@ -41,7 +38,7 @@ subject to the following restrictions: #define BT_MAX(a,b) (a<b?b:a) #define BT_MIN(a,b) (a>b?b:a) -#define BT_GREATER(x, y) fabsf(x) > (y) +#define BT_GREATER(x, y) btFabs(x) > (y) #define BT_MAX3(a,b,c) BT_MAX(a,BT_MAX(b,c)) #define BT_MIN3(a,b,c) BT_MIN(a,BT_MIN(b,c)) @@ -181,7 +178,7 @@ public: { for(j=0;j<3;j++ ) { - m_AR[i][j] = 1e-6f + fabsf(m_R1to0[i][j]); + m_AR[i][j] = 1e-6f + btFabs(m_R1to0[i][j]); } } @@ -646,6 +643,5 @@ SIMD_FORCE_INLINE bool btCompareTransformsEqual(const btTransform & t1,const btT } -//! @} #endif // GIM_BOX_COLLISION_H_INCLUDED |