Changeset 10624 for code/trunk/src/orxonox/collisionshapes

Timestamp:

Oct 4, 2015, 9:12:21 PM (9 years ago)

Author:

landauf

Message:

merged branch core7 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/collisionshapes/CollisionShape.cc (modified) (2 diffs)
• src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) (1 diff)
• src/orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified) (2 diffs)
• src/orxonox/collisionshapes/WorldEntityCollisionShape.h (modified) (1 diff)

code/trunk/src/orxonox/collisionshapes/CollisionShape.cc

@@ -41 +41 @@
 #include "CompoundCollisionShape.h"
 #include "WorldEntityCollisionShape.h"
+#include "Scene.h"
 
 namespace orxonox
 {
-    RegisterAbstractClass(CollisionShape).inheritsFrom(Class(BaseObject)).inheritsFrom(Class(Synchronisable));
+    RegisterAbstractClass(CollisionShape).inheritsFrom<BaseObject>().inheritsFrom<Synchronisable>();
 
     /**
@@ -74 +75 @@
     {
         // Detach from parent CompoundCollisionShape.
-        if (this->isInitialized() && this->parent_)
-            this->parent_->detach(this);
+        if (this->isInitialized())
+        {
+            if (this->getScene() && this->getScene()->isUpdatingPhysics())
+                orxout(internal_error) << "Don't destroy collision shapes while the physics is updated! This will lead to crashes. Try to use destroyLater() instead" << endl;
+
+            if (this->parent_)
+                this->parent_->detach(this);
+
+            if (this->collisionShape_)
+                delete this->collisionShape_;
+        }
     }
 

code/trunk/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/trunk/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc

@@ -37 +37 @@
 namespace orxonox
 {
+    RegisterClass(WorldEntityCollisionShape);
+
     WorldEntityCollisionShape::WorldEntityCollisionShape(Context* context) : CompoundCollisionShape(context)
     {
@@ -44 +46 @@
         // suppress synchronisation
         this->setSyncMode(ObjectDirection::None);
-    }
-
-    WorldEntityCollisionShape::~WorldEntityCollisionShape()
-    {
-        // Called always by WE destructor
     }
 

code/trunk/src/orxonox/collisionshapes/WorldEntityCollisionShape.h

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