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

cleaned up, removed warning under MSVC2005 (Level 4)

Browse Source 
Mostly related to alignment and unused variables
This commit is contained in:
ejcoumans
2007-04-13 01:37:21 +00:00
parent 2cf026aae3
commit bc3f9535ad
71 changed files with 348 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
View File

@@ -29,6 +29,7 @@ m_triangle(triangle)
void SphereTriangleDetector::getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw)
{
(void)debugDraw;
const btTransform& transformA = input.m_transformA;
const btTransform& transformB = input.m_transformB;
@@ -149,11 +150,8 @@ bool SphereTriangleDetector::collide(const btVector3& sphereCenter,btVector3 &po
btScalar distanceSqr = contactToCentre.length2();
if (distanceSqr < (r - MAX_OVERLAP)*(r - MAX_OVERLAP)) {
btScalar distance = btSqrt(distanceSqr);
if (1)
{
resultNormal = contactToCentre;
resultNormal.normalize();
}
resultNormal = contactToCentre;
resultNormal.normalize();
point = contactPoint;
depth = -(r-distance);
return true;