Changeset 2527 for code/branches/presentation/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h

Timestamp:

Dec 22, 2008, 10:23:29 PM (15 years ago)

Author:

rgrieder

Message:

• Forgot to account for collision shape position and orientation when attaching WEs
• addChildShape —> attach in CompoundCollisionShape
• Fixed an issue which allowed WE's to detach themselves from non-parents.
• Fixed an issue that occurred when physics was not active before attaching
• Added some forgotten const in WE (physics)
• When attaching WE's the child doesn't get modified anymore. Alternative: notifyDetached() and notifyBeingAttached(this) —> the child does the work

File:

• code/branches/presentation/src/orxonox/objects/collisionshapes/CompoundCollisionShape.h (modified) (2 diffs)

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

@@ -46 +46 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
-            void addChildShape(CollisionShape* shape);
-            void removeChildShape(CollisionShape* shape);
-            void removeAllChildShapes();
-            CollisionShape* getChildShape(unsigned int index) const;
+            void attach(CollisionShape* shape);
+            void detach(CollisionShape* shape);
+            void detachAll();
+            CollisionShape* getAttachedShape(unsigned int index) const;
 
-            void updateChildShape(CollisionShape* shape);
+            void updateAttachedShape(CollisionShape* shape);
 
             void setWorldEntityParent(WorldEntity* parent);
@@ -65 +65 @@
 
             btCompoundShape* compoundShape_;
-            std::map<CollisionShape*, btCollisionShape*> childShapes_;
+            std::map<CollisionShape*, btCollisionShape*> attachedShapes_;
             WorldEntity* worldEntityParent_;
     };