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

Fix src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp

Browse Source 
See Issue 643, thanks to Laurent at liquiddragon for the patch.
Fix warning, See Issue 655
This commit is contained in:
erwin.coumans
2012-10-04 20:32:04 +00:00
parent 416b8477b3
commit 394bb103f0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
View File

@@ -615,7 +615,7 @@ void btAxisSweep3Internal<BP_FP_INT_TYPE>::removeHandle(BP_FP_INT_TYPE handle,bt
} }
template <typename BP_FP_INT_TYPE> template <typename BP_FP_INT_TYPE>
void btAxisSweep3Internal<BP_FP_INT_TYPE>::resetPool(btDispatcher* dispatcher) void btAxisSweep3Internal<BP_FP_INT_TYPE>::resetPool(btDispatcher* /*dispatcher*/)
{ {
if (m_numHandles == 0) if (m_numHandles == 0)
{ {

2
src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
View File

@@ -132,7 +132,7 @@ bool btSphereBoxCollisionAlgorithm::getSphereDistance(const btCollisionObjectWra
btScalar distance; btScalar distance;
//special case if the sphere center is inside the box //special case if the sphere center is inside the box
if (dist2 == 0.0f) if (dist2 <= SIMD_EPSILON)
{ {
distance = -getSpherePenetration(boxHalfExtent, sphereRelPos, closestPoint, normal); distance = -getSpherePenetration(boxHalfExtent, sphereRelPos, closestPoint, normal);
} }