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

Timestamp:

Dec 21, 2008, 2:44:00 PM (17 years ago)

Author:

rgrieder

Message:

Resolved four issues with the collision shapes:

• NetworkCallback will of course not call functions virtually
• CompoundCollisionShapes with a WorldEntity parent don't have to attach themselves when synchronised
• Just in case: When changing a CollisionShape, the old gets destroyed AFTER everything has been updated
• CompoundCollisionShapes with a WorldEntity parent now update both the WE and the CompoundCollisionShape when something changes

Other changes

• Also replaced some redundant code while at it (updating the shapes was done individually)
• Like in WE, the CompoundCollisionShape deletes all its children when being destroyed itself. This requires in WE that the children get detached before the CompoundCollisionShape gets deleted.

File:

• code/branches/presentation/src/orxonox/objects/collisionshapes/CollisionShape.cc (modified) (4 diffs)

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

@@ -42 +42 @@
 namespace orxonox
 {
-    CreateFactory(CollisionShape);
-
     CollisionShape::CollisionShape(BaseObject* creator)
         : BaseObject(creator)
@@ -62 +60 @@
     CollisionShape::~CollisionShape()
     {
+        // Detach from parent
+        if (this->isInitialized() && this->parent_)
+            this->parent_->removeChildShape(this);
     }
 
@@ -79 +80 @@
     void CollisionShape::registerVariables()
     {
-        registerVariable(this->parentID_, variableDirection::toclient, new NetworkCallback<CollisionShape>(this, &CollisionShape::parentChanged));
+        registerVariable(this->parentID_, variableDirection::toclient, new NetworkCallback<CollisionShape>(this, &CollisionShape::parentChangedCallback));
     }
 
     void CollisionShape::parentChanged()
     {
-        Synchronisable* synchronisable = Synchronisable::getSynchronisable(this->parentID_);
-        CompoundCollisionShape* CCSparent = dynamic_cast<CompoundCollisionShape*>(synchronisable);
-        if (CCSparent)
-            CCSparent->addChildShape(this);
-        else
-        {
-            WorldEntity* WEparent = dynamic_cast<WorldEntity*>(synchronisable);
-            if (WEparent)
-                WEparent->attachCollisionShape(this);
-        }
+        CompoundCollisionShape* parent = dynamic_cast<CompoundCollisionShape*>(Synchronisable::getSynchronisable(this->parentID_));
+        if (parent)
+            parent->addChildShape(this);
     }
 
@@ -118 +112 @@
     }
 
+    void CollisionShape::updateShape()
+    {
+        btCollisionShape* oldShape = this->collisionShape_;
+        this->collisionShape_ = this->createNewShape();
+        // When we recreate the shape, we have to inform the parent about this to update the shape
+        this->updateParent();
+        if (oldShape)
+            delete oldShape;
+    }
+
     void CollisionShape::calculateLocalInertia(btScalar mass, btVector3& inertia) const
     {