Changeset 10003 for code/branches/modularships/src/orxonox/collisionshapes

Timestamp:

Mar 20, 2014, 3:46:06 PM (11 years ago)

Author:

noep

Message:

A Pawn being hit now prints it's Collisionshape-Structure, as well as the WorldEntity every on of those CollisionShapes belongs to.

File:

• code/branches/modularships/src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) (2 diffs)

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

@@ -39 +39 @@
 #include "core/XMLPort.h"
 #include "tools/BulletConversions.h"
+
+#include "collisionshapes/WorldEntityCollisionShape.h"
 
 namespace orxonox
@@ -118 +120 @@
             this->updatePublicShape();
         }
+
+        // If the shape to be attached is not a CompoundCollisionShape (thus an actual physical shape) & this is a WorldEntity's CollisionShape,
+        // set it's userPointer to the WorldEntity this CompoundCollisionShape belongs to.
+        if (!orxonox_cast<CompoundCollisionShape*>(shape) && orxonox_cast<WorldEntityCollisionShape*>(this))
+            shape->getCollisionShape()->setUserPointer(orxonox_cast<WorldEntityCollisionShape*>(this)->getWorldEntityOwner());
     }