Changeset 2562 for code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.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/worldentities/WorldEntity.h (modified) (3 diffs)

code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.h

@@ -43 +43 @@
 #include "core/BaseObject.h"
 #include "network/synchronisable/Synchronisable.h"
-#include "objects/collisionshapes/CompoundCollisionShape.h"
 
 namespace orxonox
@@ -69 +68 @@
         You can get more information at the corresponding set function.
 
-        Collision shapes: These are controlled by the internal CompoundCollisionShape. @see CompoundCollisionShape.
+        Collision shapes: These are controlled by the internal WorldEntityCollisionShape. @see WorldEntityCollisionShape.
     */
     class _OrxonoxExport WorldEntity : public BaseObject, public Synchronisable, public btMotionState
@@ -399 +398 @@
             //! When attaching objects hierarchically this variable tells this object (as child) whether physics was activated before attaching (because the deactivate physics while being attached).
             bool                         bPhysicsActiveBeforeAttaching_;
-            CompoundCollisionShape       collisionShape_;                //!< Attached collision shapes go here
+            WorldEntityCollisionShape*   collisionShape_;                //!< Attached collision shapes go here
             btScalar                     mass_;                          //!< @see setMass
             btVector3                    localInertia_;                  //!< @see getLocalInertia