Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix some typos (need to merge into a single implementation later!)

Browse Source
This commit is contained in:
Erwin Coumans
2016-03-11 17:47:00 -08:00
parent 625ea96a3e
commit 87e5128ba8
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.cpp
View File

@@ -34,7 +34,7 @@ namespace gjkepa2_impl2
/* GJK */ /* GJK */
#define GJK_MAX_ITERATIONS 128 #define GJK_MAX_ITERATIONS 128
#define GJK_ACCURARY ((b3Scalar)0.0001) #define GJK_ACCURACY ((b3Scalar)0.0001)
#define GJK_MIN_DISTANCE ((b3Scalar)0.0001) #define GJK_MIN_DISTANCE ((b3Scalar)0.0001)
#define GJK_DUPLICATED_EPS ((b3Scalar)0.0001) #define GJK_DUPLICATED_EPS ((b3Scalar)0.0001)
#define GJK_SIMPLEX2_EPS ((b3Scalar)0.0) #define GJK_SIMPLEX2_EPS ((b3Scalar)0.0)
@@ -216,7 +216,7 @@ namespace gjkepa2_impl2
/* Check for termination */ /* Check for termination */
const b3Scalar omega=b3Dot(m_ray,w)/rl; const b3Scalar omega=b3Dot(m_ray,w)/rl;
alpha=b3Max(omega,alpha); alpha=b3Max(omega,alpha);
if(((rl-alpha)-(GJK_ACCURARY*rl))<=0) if(((rl-alpha)-(GJK_ACCURACY*rl))<=0)
{/* Return old simplex */ {/* Return old simplex */
removevertice(m_simplices[m_current]); removevertice(m_simplices[m_current]);
break; break;
@@ -998,7 +998,7 @@ bool b3GjkEpaSolver2::SignedDistance(const btConvexShape* shape0,
/* Symbols cleanup */ /* Symbols cleanup */
#undef GJK_MAX_ITERATIONS #undef GJK_MAX_ITERATIONS
#undef GJK_ACCURARY #undef GJK_ACCURACY
#undef GJK_MIN_DISTANCE #undef GJK_MIN_DISTANCE
#undef GJK_DUPLICATED_EPS #undef GJK_DUPLICATED_EPS
#undef GJK_SIMPLEX2_EPS #undef GJK_SIMPLEX2_EPS

8
src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
View File

@@ -43,11 +43,11 @@ namespace gjkepa2_impl
#define GJK_MAX_ITERATIONS 128 #define GJK_MAX_ITERATIONS 128
#ifdef BT_USE_DOUBLE_PRECISION #ifdef BT_USE_DOUBLE_PRECISION
#define GJK_ACCURARY ((btScalar)1e-12) #define GJK_ACCURACY ((btScalar)1e-12)
#define GJK_MIN_DISTANCE ((btScalar)1e-12) #define GJK_MIN_DISTANCE ((btScalar)1e-12)
#define GJK_DUPLICATED_EPS ((btScalar)1e-12) #define GJK_DUPLICATED_EPS ((btScalar)1e-12)
#else #else
#define GJK_ACCURARY ((btScalar)0.0001) #define GJK_ACCURACY ((btScalar)0.0001)
#define GJK_MIN_DISTANCE ((btScalar)0.0001) #define GJK_MIN_DISTANCE ((btScalar)0.0001)
#define GJK_DUPLICATED_EPS ((btScalar)0.0001) #define GJK_DUPLICATED_EPS ((btScalar)0.0001)
#endif //BT_USE_DOUBLE_PRECISION #endif //BT_USE_DOUBLE_PRECISION
@@ -259,7 +259,7 @@ namespace gjkepa2_impl
/* Check for termination */ /* Check for termination */
const btScalar omega=btDot(m_ray,w)/rl; const btScalar omega=btDot(m_ray,w)/rl;
alpha=btMax(omega,alpha); alpha=btMax(omega,alpha);
if(((rl-alpha)-(GJK_ACCURARY*rl))<=0) if(((rl-alpha)-(GJK_ACCURACY*rl))<=0)
{/* Return old simplex */ {/* Return old simplex */
removevertice(m_simplices[m_current]); removevertice(m_simplices[m_current]);
break; break;
@@ -1032,7 +1032,7 @@ bool btGjkEpaSolver2::SignedDistance(const btConvexShape* shape0,
/* Symbols cleanup */ /* Symbols cleanup */
#undef GJK_MAX_ITERATIONS #undef GJK_MAX_ITERATIONS
#undef GJK_ACCURARY #undef GJK_ACCURACY
#undef GJK_MIN_DISTANCE #undef GJK_MIN_DISTANCE
#undef GJK_DUPLICATED_EPS #undef GJK_DUPLICATED_EPS
#undef GJK_SIMPLEX2_EPS #undef GJK_SIMPLEX2_EPS