From 22b7c9dfa80d0f7abca40f061865c2ab3c136a74 Mon Sep 17 00:00:00 2001 From: Oussama Date: Thu, 3 Jan 2019 14:26:51 +0100 Subject: Update Bullet to the latest commit 126b676 --- .../NarrowPhaseCollision/b3Config.h | 40 ++++++++++------------ 1 file changed, 19 insertions(+), 21 deletions(-) (limited to 'thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/b3Config.h') diff --git a/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/b3Config.h b/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/b3Config.h index 65d4a21613..518da89c54 100644 --- a/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/b3Config.h +++ b/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/b3Config.h @@ -1,41 +1,39 @@ #ifndef B3_CONFIG_H #define B3_CONFIG_H -struct b3Config +struct b3Config { - int m_maxConvexBodies; - int m_maxConvexShapes; - int m_maxBroadphasePairs; + int m_maxConvexBodies; + int m_maxConvexShapes; + int m_maxBroadphasePairs; int m_maxContactCapacity; int m_compoundPairCapacity; int m_maxVerticesPerFace; int m_maxFacesPerShape; - int m_maxConvexVertices; + int m_maxConvexVertices; int m_maxConvexIndices; int m_maxConvexUniqueEdges; - - int m_maxCompoundChildShapes; - + + int m_maxCompoundChildShapes; + int m_maxTriConvexPairCapacity; b3Config() - :m_maxConvexBodies(128*1024), - m_maxVerticesPerFace(64), - m_maxFacesPerShape(12), - m_maxConvexVertices(8192), - m_maxConvexIndices(81920), - m_maxConvexUniqueEdges(8192), - m_maxCompoundChildShapes(8192), - m_maxTriConvexPairCapacity(256*1024) + : m_maxConvexBodies(128 * 1024), + m_maxVerticesPerFace(64), + m_maxFacesPerShape(12), + m_maxConvexVertices(8192), + m_maxConvexIndices(81920), + m_maxConvexUniqueEdges(8192), + m_maxCompoundChildShapes(8192), + m_maxTriConvexPairCapacity(256 * 1024) { m_maxConvexShapes = m_maxConvexBodies; - m_maxBroadphasePairs = 16*m_maxConvexBodies; + m_maxBroadphasePairs = 16 * m_maxConvexBodies; m_maxContactCapacity = m_maxBroadphasePairs; - m_compoundPairCapacity = 1024*1024; + m_compoundPairCapacity = 1024 * 1024; } }; - -#endif//B3_CONFIG_H - +#endif //B3_CONFIG_H -- cgit v1.2.3