Changeset 10417

Timestamp:

May 3, 2015, 1:31:18 PM (10 years ago)

Author:

landauf

Message:

moved destruction of bullet collision shape to ~CollisionShape(). CompoundCollisionShape needs some trickery to avoid that a shape gets deleted twice because it does some magic (i.e. assignments) in CompoundCollisionShape::updatePublicShape()

Location:

code/branches/core7/src

Files:

• modules/objects/collisionshapes/BoxCollisionShape.cc (modified) (1 diff)
• modules/objects/collisionshapes/BoxCollisionShape.h (modified) (1 diff)
• modules/objects/collisionshapes/ConeCollisionShape.cc (modified) (1 diff)
• modules/objects/collisionshapes/ConeCollisionShape.h (modified) (1 diff)
• modules/objects/collisionshapes/CylinderCollisionShape.cc (modified) (1 diff)
• modules/objects/collisionshapes/CylinderCollisionShape.h (modified) (1 diff)
• modules/objects/collisionshapes/PlaneCollisionShape.cc (modified) (1 diff)
• modules/objects/collisionshapes/PlaneCollisionShape.h (modified) (1 diff)
• modules/objects/collisionshapes/SphereCollisionShape.cc (modified) (1 diff)
• modules/objects/collisionshapes/SphereCollisionShape.h (modified) (1 diff)
• orxonox/collisionshapes/CollisionShape.cc (modified) (1 diff)
• orxonox/collisionshapes/CompoundCollisionShape.cc (modified) (1 diff)
• orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified) (1 diff)
• orxonox/collisionshapes/WorldEntityCollisionShape.h (modified) (1 diff)

code/branches/core7/src/modules/objects/collisionshapes/BoxCollisionShape.cc

@@ -58 +58 @@
     }
 
-    BoxCollisionShape::~BoxCollisionShape()
-    {
-        // TODO: Move to CollisionShape?
-        if (this->isInitialized())
-            delete this->collisionShape_;
-    }
-
     void BoxCollisionShape::registerVariables()
     {

code/branches/core7/src/modules/objects/collisionshapes/BoxCollisionShape.h

@@ -58 +58 @@
         public:
             BoxCollisionShape(Context* context);
-            virtual ~BoxCollisionShape();
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);

code/branches/core7/src/modules/objects/collisionshapes/ConeCollisionShape.cc

@@ -54 +54 @@
     }
 
-    ConeCollisionShape::~ConeCollisionShape()
-    {
-        if (this->isInitialized())
-            delete this->collisionShape_;
-    }
-
     /**
     @brief

code/branches/core7/src/modules/objects/collisionshapes/ConeCollisionShape.h

@@ -56 +56 @@
         public:
             ConeCollisionShape(Context* context);
-            virtual ~ConeCollisionShape();
 
         private:

code/branches/core7/src/modules/objects/collisionshapes/CylinderCollisionShape.cc

@@ -54 +54 @@
     }
 
-    CylinderCollisionShape::~CylinderCollisionShape()
-    {
-        if (this->isInitialized())
-            delete this->collisionShape_;
-    }
-
     /**
     @brief

code/branches/core7/src/modules/objects/collisionshapes/CylinderCollisionShape.h

@@ -53 +53 @@
         public:
             CylinderCollisionShape(Context* context);
-            virtual ~CylinderCollisionShape();
 
         private:

code/branches/core7/src/modules/objects/collisionshapes/PlaneCollisionShape.cc

@@ -59 +59 @@
     }
 
-    PlaneCollisionShape::~PlaneCollisionShape()
-    {
-        if (this->isInitialized())
-            delete this->collisionShape_;
-    }
-
     void PlaneCollisionShape::registerVariables()
     {

code/branches/core7/src/modules/objects/collisionshapes/PlaneCollisionShape.h

@@ -58 +58 @@
         public:
             PlaneCollisionShape(Context* context);
-            virtual ~PlaneCollisionShape();
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);

code/branches/core7/src/modules/objects/collisionshapes/SphereCollisionShape.cc

@@ -58 +58 @@
     }
 
-    SphereCollisionShape::~SphereCollisionShape()
-    {
-        if (this->isInitialized())
-            delete this->collisionShape_;
-    }
-
     void SphereCollisionShape::registerVariables()
     {

code/branches/core7/src/modules/objects/collisionshapes/SphereCollisionShape.h

@@ -56 +56 @@
         public:
             SphereCollisionShape(Context* context);
-            virtual ~SphereCollisionShape();
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);

code/branches/core7/src/orxonox/collisionshapes/CollisionShape.cc

@@ -82 +82 @@
             if (this->parent_)
                 this->parent_->detach(this);
+
+            if (this->collisionShape_)
+                delete this->collisionShape_;
         }
     }

code/branches/core7/src/orxonox/collisionshapes/CompoundCollisionShape.cc

@@ -71 +71 @@
                 it->first->notifyDetached();
                 it->first->destroy();
+                if (this->collisionShape_ == it->second)
+                    this->collisionShape_ = NULL; // don't destroy it twice
             }
 
             delete this->compoundShape_;
+            if (this->collisionShape_ == this->compoundShape_)
+                this->collisionShape_ = NULL; // don't destroy it twice
         }
     }

code/branches/core7/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc

@@ -48 +48 @@
     }
 
-    WorldEntityCollisionShape::~WorldEntityCollisionShape()
-    {
-        // Called always by WE destructor
-    }
-
     void WorldEntityCollisionShape::updateParent()
     {

code/branches/core7/src/orxonox/collisionshapes/WorldEntityCollisionShape.h

@@ -39 +39 @@
         public:
             WorldEntityCollisionShape(Context* context);
-            virtual ~WorldEntityCollisionShape();
 
             inline void setWorldEntityOwner(WorldEntity* worldEntityOwner)