Changeset 10415 for code/branches/core7/src/orxonox/collisionshapes/CollisionShape.cc

Timestamp:

May 3, 2015, 12:19:49 PM (9 years ago)

Author:

landauf

Message:

added check to detect if a collision shape is destroyed during a simulation step of bullet. this usually happens if a collision (or a 'hit') triggers an event which deletes an object. this yields undefined behavior and often leads to crashes.

File:

• code/branches/core7/src/orxonox/collisionshapes/CollisionShape.cc (modified) (2 diffs)

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

@@ -41 +41 @@
 #include "CompoundCollisionShape.h"
 #include "WorldEntityCollisionShape.h"
+#include "Scene.h"
 
 namespace orxonox
@@ -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" << endl;
+
+            if (this->parent_)
+                this->parent_->detach(this);
+        }
     }