Changeset 10417 for code/branches/core7/src/orxonox

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/orxonox/collisionshapes

Files:

• CollisionShape.cc (modified) (1 diff)
• CompoundCollisionShape.cc (modified) (1 diff)
• WorldEntityCollisionShape.cc (modified) (1 diff)
• WorldEntityCollisionShape.h (modified) (1 diff)

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)