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

Timestamp:

May 22, 2014, 2:49:16 PM (11 years ago)

Author:

smerkli

Message:

Merged modularships branch

Location:

code/branches/presentationFS14

Files:

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

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

@@ -170 +170 @@
             void notifyDetached(); // Notifies the CollisionShape of being detached from a CompoundCollisionShape.
 
+            inline unsigned int getParentID()
+                { return this->parentID_; }
+
+            inline CompoundCollisionShape* getParent()
+                { return this->parent_; }
+
         protected:
             virtual void updateParent(); // Updates the CompoundCollisionShape the CollisionShape belongs to, after the CollisionShape has changed.

code/branches/presentationFS14/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());
     }
 
@@ -297 +304 @@
         this->updatePublicShape();*/
     }
+
+    int CompoundCollisionShape::getNumChildShapes()
+    {
+        return this->compoundShape_->getNumChildShapes();
+    }
 }

code/branches/presentationFS14/src/orxonox/collisionshapes/CompoundCollisionShape.h

@@ -71 +71 @@
 
             virtual void changedScale();
+            int getNumChildShapes();
+
+            inline std::map<CollisionShape*, btCollisionShape*> getShapesMap()
+            {
+                return attachedShapes_;
+            }
 
         private: