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

Timestamp:

Mar 12, 2014, 6:39:46 PM (11 years ago)

Author:

noep

Message:

Added functions to print the collisionshape-structure of a Pawn which gets hit. Doesn't quite work yet.

Location:

code/branches/modularships/src/orxonox/collisionshapes

Files:

• CollisionShape.h (modified) (1 diff)
• CompoundCollisionShape.cc (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()
+                { return this->parentID_; }
+
         protected:
             virtual void updateParent(); // Updates the CompoundCollisionShape the CollisionShape belongs to, after the CollisionShape has changed.

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

@@ -297 +297 @@
         this->updatePublicShape();*/
     }
+
+    int CompoundCollisionShape::getNumChildShapes()
+    {
+        return this->compoundShape_->getNumChildShapes();
+    }
 }

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

@@ -71 +71 @@
 
             virtual void changedScale();
+            int getNumChildShapes();
 
         private: