demo cleanup part 1

This commit is contained in:
ejcoumans
2007-12-07 00:27:30 +00:00
parent 71fb40b775
commit 2e4912b67a
2 changed files with 15 additions and 2 deletions

View File

@@ -137,6 +137,7 @@ void ConvexDecompositionDemo::initPhysics(const char* filename)
{
btTriangleMesh* trimesh = new btTriangleMesh();
m_convexDemo->m_trimeshes.push_back(trimesh);
btVector3 localScaling(6.f,6.f,6.f);
@@ -278,6 +279,7 @@ void ConvexDecompositionDemo::initPhysics(const char* filename)
if (tcount)
{
btTriangleMesh* trimesh = new btTriangleMesh();
m_trimeshes.push_back(trimesh);
btVector3 localScaling(6.f,6.f,6.f);
@@ -417,12 +419,19 @@ void ConvexDecompositionDemo::exitPhysics()
}
//delete collision shapes
for (int j=0;j<m_collisionShapes.size();j++)
for (i=0;i<m_collisionShapes.size();i++)
{
btCollisionShape* shape = m_collisionShapes[j];
btCollisionShape* shape = m_collisionShapes[i];
delete shape;
}
for (i=0;i<m_trimeshes.size();i++)
{
btTriangleMesh* mesh = m_trimeshes[i];
delete mesh;
}
//delete dynamics world
delete m_dynamicsWorld;

View File

@@ -25,6 +25,7 @@ class btCollisionDispatcher;
class btConstraintSolver;
struct btCollisionAlgorithmCreateFunc;
class btDefaultCollisionConfiguration;
class btTriangleMesh;
///ConvexDecompositionDemo shows automatic convex decomposition of a concave mesh
class ConvexDecompositionDemo : public DemoApplication
@@ -32,9 +33,12 @@ class ConvexDecompositionDemo : public DemoApplication
public:
//keep the collision shapes, for deletion/cleanup
btAlignedObjectArray<btCollisionShape*> m_collisionShapes;
btAlignedObjectArray<btTriangleMesh*> m_trimeshes;
btBroadphaseInterface* m_broadphase;
btCollisionDispatcher* m_dispatcher;