Changeset 2407 for code/branches/physics/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h

Timestamp:

Dec 11, 2008, 1:54:35 PM (15 years ago)

Author:

rgrieder

Message:

• Removed debug output
• Fixed a bug with parentID_ in CollisionShape
• Reactivated overwrite mechanism in ControllableEntity
• Build fix in WE for last commit.

File:

• code/branches/physics/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h (modified) (1 diff)

code/branches/physics/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h

@@ -45 +45 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
-            void addChildShape(CollisionShape* shape);
+            void addChildShape(CollisionShape* shape, bool bWorldEntityRoot = false);
             CollisionShape* getChildShape(unsigned int index) const;