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

fix another bug caused by error-prone btCollisionShape 'getShapeType' refactoring.

Browse Source 
Thanks a lot to Alex Silverman for the report and fix:
http://code.google.com/p/bullet/issues/detail?id=170
This commit is contained in:
erwin.coumans
2009-01-19 07:19:24 +00:00
parent fb15a0ab27
commit 994224c94f
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
View File

@@ -31,10 +31,12 @@ public:
BT_DECLARE_ALIGNED_ALLOCATOR(); BT_DECLARE_ALIGNED_ALLOCATOR();
btMultimaterialTriangleMeshShape(): btBvhTriangleMeshShape() {} btMultimaterialTriangleMeshShape(): btBvhTriangleMeshShape() {m_shapeType = MULTIMATERIAL_TRIANGLE_MESH_PROXYTYPE;}
btMultimaterialTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression, bool buildBvh = true): btMultimaterialTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression, bool buildBvh = true):
btBvhTriangleMeshShape(meshInterface, useQuantizedAabbCompression, buildBvh) btBvhTriangleMeshShape(meshInterface, useQuantizedAabbCompression, buildBvh)
{ {
m_shapeType = MULTIMATERIAL_TRIANGLE_MESH_PROXYTYPE;
btVector3 m_triangle[3]; btVector3 m_triangle[3];
const unsigned char *vertexbase; const unsigned char *vertexbase;
int numverts; int numverts;
@@ -67,6 +69,8 @@ public:
btMultimaterialTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression,const btVector3& bvhAabbMin,const btVector3& bvhAabbMax, bool buildBvh = true): btMultimaterialTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression,const btVector3& bvhAabbMin,const btVector3& bvhAabbMax, bool buildBvh = true):
btBvhTriangleMeshShape(meshInterface, useQuantizedAabbCompression, bvhAabbMin, bvhAabbMax, buildBvh) btBvhTriangleMeshShape(meshInterface, useQuantizedAabbCompression, bvhAabbMin, bvhAabbMax, buildBvh)
{ {
m_shapeType = MULTIMATERIAL_TRIANGLE_MESH_PROXYTYPE;
btVector3 m_triangle[3]; btVector3 m_triangle[3];
const unsigned char *vertexbase; const unsigned char *vertexbase;
int numverts; int numverts;
@@ -107,11 +111,6 @@ public:
m_materialLookup = NULL; m_materialLookup = NULL;
*/ */
} }
virtual int getShapeType() const
{
return MULTIMATERIAL_TRIANGLE_MESH_PROXYTYPE;
}
//debugging //debugging
virtual const char* getName()const {return "MULTIMATERIALTRIANGLEMESH";} virtual const char* getName()const {return "MULTIMATERIALTRIANGLEMESH";}