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

Timestamp:

Jan 1, 2009, 7:34:44 PM (16 years ago)

Author:

rgrieder

Message:

• Added WorldEntityCollisionShape to clarify when a CompoundCollisionShape belongs to a WE.
• Also fixed problems with the synchronisation of the CollisionShape hierarchy.

File:

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

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

@@ -53 +53 @@
             void updateAttachedShape(CollisionShape* shape);
 
-            void setWorldEntityParent(WorldEntity* parent);
-
-        protected:
-            virtual void updateParent();
-
         private:
             void updatePublicShape();
-            void parentChanged();
             inline virtual btCollisionShape* createNewShape() const
                 { assert(false); return 0; }
@@ -66 +60 @@
             btCompoundShape* compoundShape_;
             std::map<CollisionShape*, btCollisionShape*> attachedShapes_;
-            WorldEntity* worldEntityParent_;
     };
 }