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

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

@@ -244 +244 @@
             CollisionShape* getAttachedCollisionShape(unsigned int index) const;
 
-            inline CompoundCollisionShape* getCollisionShape()
+            inline CompoundCollisionShape* getCollisionShape() const
                 { return this->collisionShape_; }
-            inline btRigidBody* getPhysicalBody()
+            inline btRigidBody* getPhysicalBody() const
                 { return this->physicalBody_; }
 
@@ -259 +259 @@
             inline void disableCollisionCallback()
                 { this->bCollisionCallbackActive_ = false; this->collisionCallbackActivityChanged(); }
-            inline bool isCollisionCallbackActive()
+            inline bool isCollisionCallbackActive() const
                 { return this->bCollisionCallbackActive_; }
 
@@ -271 +271 @@
             void recalculateMassProps();
             void resetPhysicsProps();
+
+            bool notifyBeingAttached(WorldEntity* newParent);
+            void notifyDetached();
 
             // network callbacks
@@ -293 +296 @@
             bool                         bPhysicsActive_;
             bool                         bPhysicsActiveSynchronised_;
+            bool                         bPhysicsActiveBeforeAttaching_;
             CompoundCollisionShape*      collisionShape_;
             btScalar                     mass_;