From 633e80cded155919dd01a7f33f2181ce68e6b327 Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Sun, 25 Mar 2012 16:12:23 +0200
Subject: [PATCH] Issue #225: Added cleanup of maps used in PhysicEngine.

---
 libs/openengine/bullet/physic.cpp | 53 +++++++++++++++++++++++++++----
 libs/openengine/bullet/physic.hpp | 10 ++++--
 2 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/libs/openengine/bullet/physic.cpp b/libs/openengine/bullet/physic.cpp
index 07bad3053..756f3b0c6 100644
--- a/libs/openengine/bullet/physic.cpp
+++ b/libs/openengine/bullet/physic.cpp
@@ -173,6 +173,7 @@ namespace Physic
         mShapeLoader = shapeLoader;
 
         isDebugCreated = false;
+        mDebugDrawer = NULL;
     }
 
     void PhysicEngine::createDebugRendering()
@@ -202,6 +203,35 @@ namespace Physic
 
     PhysicEngine::~PhysicEngine()
     {
+
+        RigidBodyContainer::iterator rb_it = RigidBodyMap.begin();
+        for (; rb_it != RigidBodyMap.end(); ++rb_it)
+        {
+            if (rb_it->second != NULL)
+            {
+                dynamicsWorld->removeRigidBody(rb_it->second);
+
+                delete rb_it->second;
+                rb_it->second = NULL;
+            }
+        }
+
+        PhysicActorContainer::iterator pa_it = PhysicActorMap.begin();
+        for (; pa_it != PhysicActorMap.end(); ++pa_it)
+        {
+            if (pa_it->second != NULL)
+            {
+                dynamicsWorld->removeCollisionObject(pa_it->second->externalGhostObject);
+                dynamicsWorld->removeCollisionObject(pa_it->second->internalGhostObject);
+                dynamicsWorld->removeAction(pa_it->second->mCharacter);
+
+                delete pa_it->second;
+                pa_it->second = NULL;
+            }
+        }
+
+        delete mDebugDrawer;
+
         delete dynamicsWorld;
         delete solver;
         delete collisionConfiguration;
@@ -239,32 +269,39 @@ namespace Physic
             dynamicsWorld->addRigidBody(body,COL_WORLD,COL_NOTHING);
         }
         body->setActivationState(DISABLE_DEACTIVATION);
+        RigidBody* oldBody = RigidBodyMap[body->mName];
+        if (oldBody != NULL)
+        {
+            dynamicsWorld->removeRigidBody(oldBody);
+            delete oldBody;
+        }
+
         RigidBodyMap[body->mName] = body;
     }
 
     void PhysicEngine::removeRigidBody(std::string name)
     {
-        std::map<std::string,RigidBody*>::iterator it = RigidBodyMap.find(name);
+        RigidBodyContainer::iterator it = RigidBodyMap.find(name);
         if (it != RigidBodyMap.end() )
         {
             RigidBody* body = it->second;
             if(body != NULL)
             {
                 // broadphase->getOverlappingPairCache()->removeOverlappingPairsContainingProxy(body->getBroadphaseProxy(),dispatcher);
-                /*std::map<std::string,PhysicActor*>::iterator it2 = PhysicActorMap.begin();
+                /*PhysicActorContainer::iterator it2 = PhysicActorMap.begin();
                   for(;it2!=PhysicActorMap.end();it++)
                   {
                   it2->second->internalGhostObject->getOverlappingPairCache()->removeOverlappingPairsContainingProxy(body->getBroadphaseProxy(),dispatcher);
                   it2->second->externalGhostObject->getOverlappingPairCache()->removeOverlappingPairsContainingProxy(body->getBroadphaseProxy(),dispatcher);
                   }*/
-                dynamicsWorld->removeRigidBody(RigidBodyMap[name]);
+                dynamicsWorld->removeRigidBody(body);
             }
         }
     }
 
     void PhysicEngine::deleteRigidBody(std::string name)
     {
-        std::map<std::string,RigidBody*>::iterator it = RigidBodyMap.find(name);
+        RigidBodyContainer::iterator it = RigidBodyMap.find(name);
         if (it != RigidBodyMap.end() )
         {
             RigidBody* body = it->second;
@@ -293,6 +330,10 @@ namespace Physic
 
     void PhysicEngine::addCharacter(std::string name)
     {
+        // Remove character with given name, so we don't make memory
+        // leak when character would be added twice
+        removeCharacter(name);
+
         PhysicActor* newActor = new PhysicActor(name);
         dynamicsWorld->addCollisionObject( newActor->externalGhostObject, COL_ACTOR_EXTERNAL, COL_WORLD |COL_ACTOR_EXTERNAL );
         dynamicsWorld->addCollisionObject( newActor->internalGhostObject, COL_ACTOR_INTERNAL, COL_WORLD |COL_ACTOR_INTERNAL );
@@ -303,7 +344,7 @@ namespace Physic
     void PhysicEngine::removeCharacter(std::string name)
     {
         //std::cout << "remove";
-        std::map<std::string,PhysicActor*>::iterator it = PhysicActorMap.find(name);
+        PhysicActorContainer::iterator it = PhysicActorMap.find(name);
         if (it != PhysicActorMap.end() )
         {
             PhysicActor* act = it->second;
@@ -311,7 +352,7 @@ namespace Physic
             {
                 /*broadphase->getOverlappingPairCache()->removeOverlappingPairsContainingProxy(act->externalGhostObject->getBroadphaseHandle(),dispatcher);
                   broadphase->getOverlappingPairCache()->removeOverlappingPairsContainingProxy(act->internalGhostObject->getBroadphaseHandle(),dispatcher);
-                  std::map<std::string,PhysicActor*>::iterator it2 = PhysicActorMap.begin();
+                  PhysicActorContainer::iterator it2 = PhysicActorMap.begin();
                   for(;it2!=PhysicActorMap.end();it++)
                   {
                   it->second->internalGhostObject->getOverlappingPairCache()->removeOverlappingPairsContainingProxy(act->externalGhostObject->getBroadphaseHandle(),dispatcher);
diff --git a/libs/openengine/bullet/physic.hpp b/libs/openengine/bullet/physic.hpp
index 88e3699ae..200b96207 100644
--- a/libs/openengine/bullet/physic.hpp
+++ b/libs/openengine/bullet/physic.hpp
@@ -42,6 +42,8 @@ namespace Physic
             :btPairCachingGhostObject(),mName(name)
         {
         }
+        virtual ~PairCachingGhostObject(){}
+
         std::string mName;
     };
 
@@ -106,6 +108,7 @@ namespace Physic
     {
     public:
         RigidBody(btRigidBody::btRigidBodyConstructionInfo& CI,std::string name);
+        virtual ~RigidBody() {}
         std::string mName;
 
         //is this body used for raycasting only?
@@ -217,8 +220,11 @@ namespace Physic
         //the NIF file loader.
         BulletShapeLoader* mShapeLoader;
 
-        std::map<std::string,RigidBody*> RigidBodyMap;
-        std::map<std::string,PhysicActor*> PhysicActorMap;
+        typedef std::map<std::string,RigidBody*> RigidBodyContainer;
+        RigidBodyContainer RigidBodyMap;
+
+        typedef std::map<std::string, PhysicActor*>  PhysicActorContainer;
+        PhysicActorContainer PhysicActorMap;
 
         //debug rendering
         BtOgre::DebugDrawer* mDebugDrawer;