BT_USE_DOUBLE_PRECISION was missing from bullet.pc using cmake

Thanks to Sigluy, see Issue 471

Default constructor for btBvhTriangleMeshShape causes NULL dereference, so removed obsolete constructor.
Thanks to exarkun, see Issue 465
This commit is contained in:
erwin.coumans 2011-01-07 17:50:36 +00:00
parent f10846ed7a
commit 9098e82004
4 changed files with 3 additions and 3 deletions

View File

@ -190,6 +190,7 @@ ENDIF (INTERNAL_UPDATE_SERIALIZATION_STRUCTURES)
IF (USE_DOUBLE_PRECISION)
ADD_DEFINITIONS( -DBT_USE_DOUBLE_PRECISION)
SET( BULLET_DOUBLE_DEF "-DBT_USE_DOUBLE_PRECISION")
ENDIF (USE_DOUBLE_PRECISION)
IF(USE_GRAPHICAL_BENCHMARK)

View File

@ -3,4 +3,4 @@ Description: Bullet Continuous Collision Detection and Physics Library
Requires:
Version: @BULLET_VERSION@
Libs: -L@LIB_DESTINATION@ -lBulletSoftBody -lBulletDynamics -lBulletCollision -lLinearMath
Cflags: -I@INCLUDE_INSTALL_DIR@
Cflags: @BULLET_DOUBLE_DEF@ -I@INCLUDE_INSTALL_DIR@

View File

@ -39,7 +39,7 @@ public:
BT_DECLARE_ALIGNED_ALLOCATOR();
btBvhTriangleMeshShape() : btTriangleMeshShape(0),m_bvh(0),m_triangleInfoMap(0),m_ownsBvh(false) {m_shapeType = TRIANGLE_MESH_SHAPE_PROXYTYPE;};
btBvhTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression, bool buildBvh = true);
///optionally pass in a larger bvh aabb, used for quantization. This allows for deformations within this aabb

View File

@ -31,7 +31,6 @@ public:
BT_DECLARE_ALIGNED_ALLOCATOR();
btMultimaterialTriangleMeshShape(): btBvhTriangleMeshShape() {m_shapeType = MULTIMATERIAL_TRIANGLE_MESH_PROXYTYPE;}
btMultimaterialTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression, bool buildBvh = true):
btBvhTriangleMeshShape(meshInterface, useQuantizedAabbCompression, buildBvh)
{