From 2e4912b67a67f95cf0e74569b302e69b10fe7b67 Mon Sep 17 00:00:00 2001
From: ejcoumans <ejcoumans@08e121b0-ae19-0410-a57b-3be3395fd4fd>
Date: Fri, 7 Dec 2007 00:27:30 +0000
Subject: [PATCH] demo cleanup part 1

---
 .../ConvexDecompositionDemo.cpp                     | 13 +++++++++++--
 .../ConvexDecompositionDemo.h                       |  4 ++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp b/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp
index 2142c6dd6..a9b9082ab 100644
--- a/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp
+++ b/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp
@@ -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;
 
diff --git a/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.h b/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.h
index 63ec8aaf8..7d5af775c 100644
--- a/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.h
+++ b/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.h
@@ -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;