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

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/collisionshapes/CompoundCollisionShape.cc (modified) (8 diffs)

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

@@ -36 +36 @@
 #include "core/XMLPort.h"
 #include "tools/BulletConversions.h"
-#include "objects/worldentities/WorldEntity.h"
 
 namespace orxonox
@@ -47 +46 @@
 
         this->compoundShape_  = new btCompoundShape();
-        this->worldEntityParent_ = 0;
     }
 
@@ -59 +57 @@
             {
                 // make sure that the child doesn't want to detach itself --> speedup because of the missing update
-                it->first->setParent(0, OBJECTID_UNKNOWN);
+                it->first->notifyDetached();
                 delete it->first;
             }
@@ -74 +72 @@
     }
 
-    void CompoundCollisionShape::setWorldEntityParent(WorldEntity* parent)
-    {
-        // suppress synchronisation
-        this->setObjectMode(0x0);
-
-        this->worldEntityParent_ = parent;
-    }
-
     void CompoundCollisionShape::attach(CollisionShape* shape)
     {
@@ -91 +81 @@
             return;
         }
+
+        if (!shape->notifyBeingAttached(this))
+            return;
+
         this->attachedShapes_[shape] = shape->getCollisionShape();
 
@@ -101 +95 @@
             this->updatePublicShape();
         }
-
-        // network synchro
-        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());
     }
 
@@ -117 +101 @@
         if (this->attachedShapes_.find(shape) != this->attachedShapes_.end())
         {
-            shape->setParent(0, OBJECTID_UNKNOWN);
             this->attachedShapes_.erase(shape);
             if (shape->getCollisionShape())
                 this->compoundShape_->removeChildShape(shape->getCollisionShape());
+            shape->notifyDetached();
 
             this->updatePublicShape();
@@ -197 +181 @@
     }
 
-    void CompoundCollisionShape::updateParent()
-    {
-        if (this->parent_)
-            this->parent_->updateAttachedShape(this);
-        if (this->worldEntityParent_)
-            this->worldEntityParent_->notifyCollisionShapeChanged();
-    }
-
-    void CompoundCollisionShape::parentChanged()
-    {
-        if (!this->worldEntityParent_)
-            CollisionShape::parentChanged();
-    }
-
     CollisionShape* CompoundCollisionShape::getAttachedShape(unsigned int index) const
     {