Changeset 2403 for code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/CompoundCollisionShape.cc

Timestamp:

Dec 10, 2008, 11:33:58 PM (17 years ago)

Author:

rgrieder

Message:

• Fixed issues with CollisionShape loading, handling and synchronisation.
• Added eol-style native to PlaneCollisionShape
• Unified treatment of configuring btCollisionShapes when parameters change

File:

• code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/CompoundCollisionShape.cc (modified) (3 diffs)

code/branches/physics/src/orxonox/objects/worldentities/collisionshapes/CompoundCollisionShape.cc

@@ -44 +44 @@
         RegisterObject(CompoundCollisionShape);
 
-        this->collisionShape_ = 0;
         this->compoundShape_  = new btCompoundShape();
     }
@@ -67 +66 @@
         if (this->collisionShape_)
             return this->collisionShape_;
-        else if (this->childShapes_.size() != 0)
+        else if (!this->empty())
             return this->compoundShape_;
         else
@@ -75 +74 @@
     void CompoundCollisionShape::addChildShape(CollisionShape* shape)
     {
-        if (!shape || !shape->getCollisionShape())
+        if (!shape)
             return;
-        assert(this->compoundShape_);
-        btTransform transf(omni_cast<btQuaternion>(shape->getOrientation()), omni_cast<btVector3>(shape->getPosition()));
-        this->compoundShape_->addChildShape(transf, shape->getCollisionShape());
+        this->childShapes_.push_back(shape);
 
-        if (this->childShapes_.size() == 1 && this->childShapes_[0] && !this->childShapes_[0]->hasTransform())
+        if (shape->getCollisionShape())
         {
-            // --> Only shape to be added, no transform; add it directly
-            this->collisionShape_ = shape->getCollisionShape();
-        }
-        else
-        {
-            // Make sure we use the compound shape
-            this->collisionShape_ = 0;
+            // Only actually attach if we didn't pick a CompoundCollisionShape with no content
+            btTransform transf(omni_cast<btQuaternion>(shape->getOrientation()), omni_cast<btVector3>(shape->getPosition()));
+            this->compoundShape_->addChildShape(transf, shape->getCollisionShape());
+
+            if (this->childShapes_.size() == 1 && !this->childShapes_[0]->hasTransform())
+            {
+                // --> Only shape to be added, no transform; add it directly
+                this->collisionShape_ = shape->getCollisionShape();
+            }
+            else
+            {
+                // Make sure we use the compound shape when returning the btCollisionShape
+                this->collisionShape_ = 0;
+            }
         }