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

Timestamp:

Jan 1, 2009, 7:34:44 PM (15 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/CollisionShape.h (modified) (3 diffs)

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

@@ -75 +75 @@
             bool hasTransform() const;
 
-            inline void setParent(CompoundCollisionShape* shape, unsigned int ID)
-                { this->parent_ = shape; this->parentID_ = ID; }
+            bool notifyBeingAttached(CompoundCollisionShape* newParent);
+            void notifyDetached();
 
         protected:
@@ -85 +85 @@
             btCollisionShape*       collisionShape_;
             CompoundCollisionShape* parent_;
+            unsigned int            parentID_;
 
         private:
@@ -90 +91 @@
             Quaternion              orientation_;
             Vector3                 scale_;
-            unsigned int            parentID_;
     };
 }