From 0723448895d9ee480dd9f8493ff47097c2983111 Mon Sep 17 00:00:00 2001 From: ejcoumans Date: Thu, 1 Nov 2007 23:59:22 +0000 Subject: [PATCH] disabled btTriangleMeshShape, to avoid usage, it is very slow performing for larger triangle meshes. Please use the derived btBvhTriangleMeshShape instead. --- .../CollisionShapes/btTriangleMeshShape.cpp | 3 ++- src/BulletCollision/CollisionShapes/btTriangleMeshShape.h | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp b/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp index 89f9f15b4..e69be3544 100644 --- a/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp +++ b/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp @@ -20,7 +20,6 @@ subject to the following restrictions: #include "LinearMath/btAabbUtil2.h" #include "BulletCollision/CollisionShapes/btCollisionMargin.h" -#include "stdio.h" btTriangleMeshShape::btTriangleMeshShape(btStridingMeshInterface* meshInterface) : m_meshInterface(meshInterface) @@ -138,6 +137,7 @@ const btVector3& btTriangleMeshShape::getLocalScaling() const //#define DEBUG_TRIANGLE_MESH +/* void btTriangleMeshShape::processAllTriangles(btTriangleCallback* callback,const btVector3& aabbMin,const btVector3& aabbMax) const { struct FilteredCallback : public btInternalTriangleIndexCallback @@ -171,6 +171,7 @@ void btTriangleMeshShape::processAllTriangles(btTriangleCallback* callback,const } +*/ diff --git a/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h b/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h index b178a0f98..d1ebb527d 100644 --- a/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h +++ b/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h @@ -20,7 +20,7 @@ subject to the following restrictions: #include "btStridingMeshInterface.h" -///Concave triangle mesh. Uses an interface to access the triangles to allow for sharing graphics/physics triangles. +///Concave triangle mesh interface. Don't use this class directly, use btBvhTriangleMeshShape instead. class btTriangleMeshShape : public btConcaveShape { protected: @@ -51,7 +51,12 @@ public: virtual void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const; +//this is a brute force processAllTriangles implementation to compare/unit test the btBvhTriangleMeshShape. +//it has been disabled, so that users will not mistakenly use this class. +//Don't use btTriangleMeshShape but use btBvhTriangleMeshShape instead! +/* virtual void processAllTriangles(btTriangleCallback* callback,const btVector3& aabbMin,const btVector3& aabbMax) const; +*/ virtual void calculateLocalInertia(btScalar mass,btVector3& inertia) const;