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

apply clang-format (on Mac, slightly different than running it on Windows)

Browse Source
This commit is contained in:
Erwin Coumans
2018-09-30 11:43:57 -07:00
parent 5bcd43711a
commit 42ae4e81a8
15 changed files with 87 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -292,9 +292,9 @@ btCollisionShape* btCollisionWorldImporter::convertCollisionShape(btCollisionSha
}
break;
}
#endif //SUPPORT_GIMPACT_SHAPE_IMPORT
//The btCapsuleShape* API has issue passing the margin/scaling/halfextents unmodified through the API
//so deal with this
#endif //SUPPORT_GIMPACT_SHAPE_IMPORT \
//The btCapsuleShape* API has issue passing the margin/scaling/halfextents unmodified through the API \
//so deal with this
case CAPSULE_SHAPE_PROXYTYPE:
{
btCapsuleShapeData* capData = (btCapsuleShapeData*)shapeData;

2
src/BulletCollision/Gimpact/gim_linear_math.h
View File

@@ -967,7 +967,7 @@ Last column is added as the position
GREAL len; \
\
/* do nothing if off-diagonals are zero and diagonals are \
* equal */ \
* equal */ \
if ((m[0][1] != 0.0) || (m[1][0] != 0.0) || (m[0][0] != m[1][1])) \
{ \
p[0] = m[1][1] * v[0] - m[1][0] * v[1]; \