Changeset 10205 for code/branches/presentationFS14/src/orxonox/collisionshapes

Timestamp:

Jan 26, 2015, 12:22:57 AM (10 years ago)

Author:

landauf

Message:

the previous commit was not correct. re-added the call to setUserPointer, but I may have found a better place for it.

File:

• code/branches/presentationFS14/src/orxonox/collisionshapes/CollisionShape.cc (modified) (1 diff)

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

@@ -121 +121 @@
         WorldEntityCollisionShape* parentWECCS = orxonox_cast<WorldEntityCollisionShape*>(newParent);
         if (parentWECCS)
+        {
             this->parentID_ = parentWECCS->getWorldEntityOwner()->getObjectID();
-        // Else it is set to the objectID of the CompoundCollisionShape.
+
+            // If this shape is not a CompoundCollisionShape (thus an actual physical shape) & the parent is a WorldEntity's CollisionShape,
+            // set it's userPointer to the WorldEntity this CompoundCollisionShape belongs to.
+            if (!orxonox_cast<CompoundCollisionShape*>(this))
+                this->getCollisionShape()->setUserPointer(parentWECCS->getWorldEntityOwner());
+        }
         else
+        {
+            // Else it is set to the objectID of the CompoundCollisionShape.
             this->parentID_ = newParent->getObjectID();
+        }
 
         return true;