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

Timestamp:

Mar 13, 2014, 3:52:23 PM (11 years ago)

Author:

noep

Message:

Tried (and failed) to fix output of CollisionShape-structure

Location:

code/branches/modularships/src/orxonox/collisionshapes

Files:

• CollisionShape.h (modified) (1 diff)
• CompoundCollisionShape.h (modified) (1 diff)

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

@@ -170 +170 @@
             void notifyDetached(); // Notifies the CollisionShape of being detached from a CompoundCollisionShape.
 
-            inline unsigned int getparentID()
+            inline unsigned int getParentID()
                 { return this->parentID_; }
+
+            inline CompoundCollisionShape* getParent()
+                { return this->parent_; }
 
         protected:

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

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