Changeset 2527 for code/branches/presentation/src/orxonox/objects/collisionshapes/CollisionShape.cc

Timestamp:

Dec 22, 2008, 10:23:29 PM (17 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/CollisionShape.cc (modified) (3 diffs)

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

@@ -62 +62 @@
         // Detach from parent
         if (this->isInitialized() && this->parent_)
-            this->parent_->removeChildShape(this);
+            this->parent_->detach(this);
     }
 
@@ -87 +87 @@
         CompoundCollisionShape* parent = dynamic_cast<CompoundCollisionShape*>(Synchronisable::getSynchronisable(this->parentID_));
         if (parent)
-            parent->addChildShape(this);
+            parent->attach(this);
     }
 
@@ -93 +93 @@
     {
         if (this->parent_)
-            this->parent_->updateChildShape(this);
+            this->parent_->updateAttachedShape(this);
     }