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

made access to mesh interface more consistent, so btConvexTriangleMeshShape uses also 'getMeshInterface', similar to btTriangleMeshShape.

Browse Source 
Thanks Et3D for pointing this out here: http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=1590
This commit is contained in:
ejcoumans
2007-10-21 21:04:04 +00:00
parent b888f2d994
commit c80d1532f6
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Demos/OpenGL/GL_ShapeDrawer.cpp
View File

@@ -572,7 +572,7 @@ void GL_ShapeDrawer::drawOpenGL(btScalar* m, const btCollisionShape* shape, cons
btVector3 aabbMax(btScalar(1e30),btScalar(1e30),btScalar(1e30)); btVector3 aabbMax(btScalar(1e30),btScalar(1e30),btScalar(1e30));
btVector3 aabbMin(-btScalar(1e30),-btScalar(1e30),-btScalar(1e30)); btVector3 aabbMin(-btScalar(1e30),-btScalar(1e30),-btScalar(1e30));
TriangleGlDrawcallback drawCallback; TriangleGlDrawcallback drawCallback;
convexMesh->getStridingMesh()->InternalProcessAllTriangles(&drawCallback,aabbMin,aabbMax); convexMesh->getMeshInterface()->InternalProcessAllTriangles(&drawCallback,aabbMin,aabbMax);
} }

6
src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
View File

@@ -16,7 +16,11 @@ class btConvexTriangleMeshShape : public btPolyhedralConvexShape
public: public:
btConvexTriangleMeshShape(btStridingMeshInterface* meshInterface); btConvexTriangleMeshShape(btStridingMeshInterface* meshInterface);
class btStridingMeshInterface* getStridingMesh() class btStridingMeshInterface* getMeshInterface()
{
return m_stridingMesh;
}
const class btStridingMeshInterface* getMeshInterface() const
{ {
return m_stridingMesh; return m_stridingMesh;
} }

2
src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
View File

@@ -926,7 +926,7 @@ void btDiscreteDynamicsWorld::debugDrawObject(const btTransform& worldTransform,
btVector3 aabbMin(btScalar(-1e30),btScalar(-1e30),btScalar(-1e30)); btVector3 aabbMin(btScalar(-1e30),btScalar(-1e30),btScalar(-1e30));
//DebugDrawcallback drawCallback; //DebugDrawcallback drawCallback;
DebugDrawcallback drawCallback(getDebugDrawer(),worldTransform,color); DebugDrawcallback drawCallback(getDebugDrawer(),worldTransform,color);
convexMesh->getStridingMesh()->InternalProcessAllTriangles(&drawCallback,aabbMin,aabbMax); convexMesh->getMeshInterface()->InternalProcessAllTriangles(&drawCallback,aabbMin,aabbMax);
} }