Changeset 2469 for code/branches/presentation/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc

Timestamp:

Dec 15, 2008, 7:57:48 PM (15 years ago)

Author:

rgrieder

Message:

Resolved the issue with the collision shape synchronisation.

File:

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

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

@@ -47 +47 @@
 
         this->compoundShape_  = new btCompoundShape();
+        this->worldEntityParent_ = 0;
     }
 
@@ -66 +67 @@
     }
 
+    void CompoundCollisionShape::setWorldEntityParent(WorldEntity* parent)
+    {
+        // suppress synchronisation
+        this->setObjectMode(0x0);
+
+        this->worldEntityParent_ = parent;
+    }
+
     void CompoundCollisionShape::addChildShape(CollisionShape* shape)
     {
@@ -87 +96 @@
 
         // network synchro
-        shape->setParent(this, this->getObjectID());
+        if (this->worldEntityParent_)
+        {
+            // This compound collision shape belongs to a WE and doesn't get synchronised
+            // So set our parent to be the WE
+            shape->setParent(this, this->worldEntityParent_->getObjectID());
+        }
+        else
+            shape->setParent(this, this->getObjectID());
     }
 
@@ -176 +192 @@
         if (this->parent_)
             this->parent_->updateChildShape(this);
-        else
-        {
-            // We can do this, because the CompoundCollisionShape of a WorldEntity always belongs to it,
-            // as long as its lifetime.
-            WorldEntity* parent = dynamic_cast<WorldEntity*>(this->getCreator());
-            if (parent)
-                parent->notifyCollisionShapeChanged();
-        }
+        else if (this->worldEntityParent_)
+            this->worldEntityParent_->notifyCollisionShapeChanged();
     }