demo cleanup part 1
This commit is contained in:
@@ -137,6 +137,7 @@ void ConvexDecompositionDemo::initPhysics(const char* filename)
|
|||||||
{
|
{
|
||||||
|
|
||||||
btTriangleMesh* trimesh = new btTriangleMesh();
|
btTriangleMesh* trimesh = new btTriangleMesh();
|
||||||
|
m_convexDemo->m_trimeshes.push_back(trimesh);
|
||||||
|
|
||||||
btVector3 localScaling(6.f,6.f,6.f);
|
btVector3 localScaling(6.f,6.f,6.f);
|
||||||
|
|
||||||
@@ -278,6 +279,7 @@ void ConvexDecompositionDemo::initPhysics(const char* filename)
|
|||||||
if (tcount)
|
if (tcount)
|
||||||
{
|
{
|
||||||
btTriangleMesh* trimesh = new btTriangleMesh();
|
btTriangleMesh* trimesh = new btTriangleMesh();
|
||||||
|
m_trimeshes.push_back(trimesh);
|
||||||
|
|
||||||
btVector3 localScaling(6.f,6.f,6.f);
|
btVector3 localScaling(6.f,6.f,6.f);
|
||||||
|
|
||||||
@@ -417,12 +419,19 @@ void ConvexDecompositionDemo::exitPhysics()
|
|||||||
}
|
}
|
||||||
|
|
||||||
//delete collision shapes
|
//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;
|
delete shape;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (i=0;i<m_trimeshes.size();i++)
|
||||||
|
{
|
||||||
|
btTriangleMesh* mesh = m_trimeshes[i];
|
||||||
|
delete mesh;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
//delete dynamics world
|
//delete dynamics world
|
||||||
delete m_dynamicsWorld;
|
delete m_dynamicsWorld;
|
||||||
|
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ class btCollisionDispatcher;
|
|||||||
class btConstraintSolver;
|
class btConstraintSolver;
|
||||||
struct btCollisionAlgorithmCreateFunc;
|
struct btCollisionAlgorithmCreateFunc;
|
||||||
class btDefaultCollisionConfiguration;
|
class btDefaultCollisionConfiguration;
|
||||||
|
class btTriangleMesh;
|
||||||
|
|
||||||
///ConvexDecompositionDemo shows automatic convex decomposition of a concave mesh
|
///ConvexDecompositionDemo shows automatic convex decomposition of a concave mesh
|
||||||
class ConvexDecompositionDemo : public DemoApplication
|
class ConvexDecompositionDemo : public DemoApplication
|
||||||
@@ -32,9 +33,12 @@ class ConvexDecompositionDemo : public DemoApplication
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
|
|
||||||
//keep the collision shapes, for deletion/cleanup
|
//keep the collision shapes, for deletion/cleanup
|
||||||
btAlignedObjectArray<btCollisionShape*> m_collisionShapes;
|
btAlignedObjectArray<btCollisionShape*> m_collisionShapes;
|
||||||
|
|
||||||
|
btAlignedObjectArray<btTriangleMesh*> m_trimeshes;
|
||||||
|
|
||||||
btBroadphaseInterface* m_broadphase;
|
btBroadphaseInterface* m_broadphase;
|
||||||
|
|
||||||
btCollisionDispatcher* m_dispatcher;
|
btCollisionDispatcher* m_dispatcher;
|
||||||
|
|||||||
Reference in New Issue
Block a user