From 87e5128ba812220ff2605632e0eba6711a410a23 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Fri, 11 Mar 2016 17:47:00 -0800 Subject: [PATCH] fix some typos (need to merge into a single implementation later!) --- src/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.cpp | 6 +++--- src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.cpp b/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.cpp index 625abd2bc..d636f983c 100644 --- a/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.cpp +++ b/src/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.cpp @@ -34,7 +34,7 @@ namespace gjkepa2_impl2 /* GJK */ #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_DUPLICATED_EPS ((b3Scalar)0.0001) #define GJK_SIMPLEX2_EPS ((b3Scalar)0.0) @@ -216,7 +216,7 @@ namespace gjkepa2_impl2 /* Check for termination */ const b3Scalar omega=b3Dot(m_ray,w)/rl; alpha=b3Max(omega,alpha); - if(((rl-alpha)-(GJK_ACCURARY*rl))<=0) + if(((rl-alpha)-(GJK_ACCURACY*rl))<=0) {/* Return old simplex */ removevertice(m_simplices[m_current]); break; @@ -998,7 +998,7 @@ bool b3GjkEpaSolver2::SignedDistance(const btConvexShape* shape0, /* Symbols cleanup */ #undef GJK_MAX_ITERATIONS -#undef GJK_ACCURARY +#undef GJK_ACCURACY #undef GJK_MIN_DISTANCE #undef GJK_DUPLICATED_EPS #undef GJK_SIMPLEX2_EPS diff --git a/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp b/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp index fd8b2dc40..eefb974bb 100644 --- a/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp +++ b/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp @@ -43,11 +43,11 @@ namespace gjkepa2_impl #define GJK_MAX_ITERATIONS 128 #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_DUPLICATED_EPS ((btScalar)1e-12) #else - #define GJK_ACCURARY ((btScalar)0.0001) + #define GJK_ACCURACY ((btScalar)0.0001) #define GJK_MIN_DISTANCE ((btScalar)0.0001) #define GJK_DUPLICATED_EPS ((btScalar)0.0001) #endif //BT_USE_DOUBLE_PRECISION @@ -259,7 +259,7 @@ namespace gjkepa2_impl /* Check for termination */ const btScalar omega=btDot(m_ray,w)/rl; alpha=btMax(omega,alpha); - if(((rl-alpha)-(GJK_ACCURARY*rl))<=0) + if(((rl-alpha)-(GJK_ACCURACY*rl))<=0) {/* Return old simplex */ removevertice(m_simplices[m_current]); break; @@ -1032,7 +1032,7 @@ bool btGjkEpaSolver2::SignedDistance(const btConvexShape* shape0, /* Symbols cleanup */ #undef GJK_MAX_ITERATIONS -#undef GJK_ACCURARY +#undef GJK_ACCURACY #undef GJK_MIN_DISTANCE #undef GJK_DUPLICATED_EPS #undef GJK_SIMPLEX2_EPS