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

Fix warning with -Wmisleading-indentation

Browse Source
This commit is contained in:
Daniele Bartolini
2018-03-14 23:19:23 +01:00
parent 282458684f
commit e4e82b05b9
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -151,8 +151,8 @@ static btScalar EdgeSeparation(const btBox2dShape* poly1, const btTransform& xf1
int index = 0; int index = 0;
btScalar minDot = BT_LARGE_FLOAT; btScalar minDot = BT_LARGE_FLOAT;
if( count2 > 0 ) if( count2 > 0 )
index = (int) normal1.minDot( vertices2, count2, minDot); index = (int) normal1.minDot( vertices2, count2, minDot);
btVector3 v1 = b2Mul(xf1, vertices1[edge1]); btVector3 v1 = b2Mul(xf1, vertices1[edge1]);
btVector3 v2 = b2Mul(xf2, vertices2[index]); btVector3 v2 = b2Mul(xf2, vertices2[index]);
@@ -175,8 +175,8 @@ static btScalar FindMaxSeparation(int* edgeIndex,
// Find edge normal on poly1 that has the largest projection onto d. // Find edge normal on poly1 that has the largest projection onto d.
int edge = 0; int edge = 0;
btScalar maxDot; btScalar maxDot;
if( count1 > 0 ) if( count1 > 0 )
edge = (int) dLocal1.maxDot( normals1, count1, maxDot); edge = (int) dLocal1.maxDot( normals1, count1, maxDot);
// Get the separation for the edge normal. // Get the separation for the edge normal.
btScalar s = EdgeSeparation(poly1, xf1, edge, poly2, xf2); btScalar s = EdgeSeparation(poly1, xf1, edge, poly2, xf2);

6
src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
View File

@@ -253,9 +253,9 @@ void btCompoundCollisionAlgorithm::processCollision (const btCollisionObjectWrap
m_compoundShapeRevision = compoundShape->getUpdateRevision(); m_compoundShapeRevision = compoundShape->getUpdateRevision();
} }
if (m_childCollisionAlgorithms.size()==0) if (m_childCollisionAlgorithms.size()==0)
return; return;
const btDbvt* tree = compoundShape->getDynamicAabbTree(); const btDbvt* tree = compoundShape->getDynamicAabbTree();
//use a dynamic aabb tree to cull potential child-overlaps //use a dynamic aabb tree to cull potential child-overlaps
btCompoundLeafCallback callback(colObjWrap,otherObjWrap,m_dispatcher,dispatchInfo,resultOut,&m_childCollisionAlgorithms[0],m_sharedManifold); btCompoundLeafCallback callback(colObjWrap,otherObjWrap,m_dispatcher,dispatchInfo,resultOut,&m_childCollisionAlgorithms[0],m_sharedManifold);