diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2020-01-08 21:17:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-08 21:17:33 +0100 |
commit | b9a553f99de109427fc8ac62f7f3de0ec708a1b8 (patch) | |
tree | 9c34bff6630785389209ed8d87fb05cf392024c8 /thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btMprPenetration.h | |
parent | 39b1ea50181d84c6fdfcd219a390deb4d522f603 (diff) | |
parent | 29e07dfa4e42b871ee30e398b1c35d1aea68cd57 (diff) |
Merge pull request #34921 from akien-mga/bullet-2.89
bullet: Sync with upstream 2.89
Diffstat (limited to 'thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btMprPenetration.h')
-rw-r--r-- | thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btMprPenetration.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btMprPenetration.h b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btMprPenetration.h index 358bc95d81..534a66d3fa 100644 --- a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btMprPenetration.h +++ b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btMprPenetration.h @@ -309,11 +309,11 @@ inline void btMprSupport(const btConvexTemplate &a, const btConvexTemplate &b, const btMprCollisionDescription &colDesc, const btVector3 &dir, btMprSupport_t *supp) { - btVector3 seperatingAxisInA = dir * a.getWorldTransform().getBasis(); - btVector3 seperatingAxisInB = -dir * b.getWorldTransform().getBasis(); + btVector3 separatingAxisInA = dir * a.getWorldTransform().getBasis(); + btVector3 separatingAxisInB = -dir * b.getWorldTransform().getBasis(); - btVector3 pInA = a.getLocalSupportWithMargin(seperatingAxisInA); - btVector3 qInB = b.getLocalSupportWithMargin(seperatingAxisInB); + btVector3 pInA = a.getLocalSupportWithMargin(separatingAxisInA); + btVector3 qInB = b.getLocalSupportWithMargin(separatingAxisInB); supp->v1 = a.getWorldTransform()(pInA); supp->v2 = b.getWorldTransform()(qInB); @@ -467,7 +467,7 @@ static int btRefinePortal(const btConvexTemplate &a, const btConvexTemplate &b, for (int i = 0; i < BT_MPR_MAX_ITERATIONS; i++) //while (1) { - // compute direction outside the portal (from v0 throught v1,v2,v3 + // compute direction outside the portal (from v0 through v1,v2,v3 // face) btPortalDir(portal, &dir); |