Changeset 8554 for code/branches/pickup/src/orxonox

Timestamp:

May 23, 2011, 11:26:08 PM (13 years ago)

Author:

dafrick

Message:

Some cleanup. Ready for merge.

Location:

code/branches/pickup/src/orxonox

Files:

• collisionshapes/CompoundCollisionShape.cc (modified) (2 diffs)
• collisionshapes/CompoundCollisionShape.h (modified) (1 diff)
• worldentities/WorldEntity.cc (modified) (1 diff)

code/branches/pickup/src/orxonox/collisionshapes/CompoundCollisionShape.cc

@@ -261 +261 @@
         CollisionShape::changedScale();
 
-        // Iterate through all attached CollisionShapes.
+        std::vector<CollisionShape*> shapes;
+        // Iterate through all attached CollisionShapes and add them to the list of shapes.
+        for(std::map<CollisionShape*, btCollisionShape*>::iterator it = this->attachedShapes_.begin(); it != this->attachedShapes_.end(); it++)
+            shapes.push_back(it->first);
+
+        // Delete the compound shape and create a new one.
+        delete this->compoundShape_;
+        this->compoundShape_ = new btCompoundShape();
+
+        // Re-attach all CollisionShapes.
+        for(std::vector<CollisionShape*>::iterator it = shapes.begin(); it != shapes.end(); it++)
+        {
+            CollisionShape* shape = *it;
+            shape->setScale3D(this->getScale3D());
+            // Only actually attach if we didn't pick a CompoundCollisionShape with no content.
+            if (shape->getCollisionShape())
+            {
+                btTransform transf(multi_cast<btQuaternion>(shape->getOrientation()), multi_cast<btVector3>(shape->getPosition()));
+                // Add the btCollisionShape of the CollisionShape as a child shape to the btCompoundShape of the CompoundCollisionShape.
+                this->compoundShape_->addChildShape(transf, shape->getCollisionShape());
+            }
+        }
+
+        this->updatePublicShape();
+
+        /*
+        // Iterate through all attached CollisionShapes
         for(std::map<CollisionShape*, btCollisionShape*>::const_iterator it = this->attachedShapes_.begin(); it != this->attachedShapes_.end(); it++)
         {
@@ -269 +295 @@
         }
 
-        this->updatePublicShape();
+        this->updatePublicShape();*/
     }
 }

code/branches/pickup/src/orxonox/collisionshapes/CompoundCollisionShape.h

@@ -52 +52 @@
         Reto Grieder
 
+    @see btCompoundShape
     @ingroup Collisionshapes
     */

code/branches/pickup/src/orxonox/worldentities/WorldEntity.cc

@@ -643 +643 @@
     {
         // If physics is enabled scale the attached CollisionShape.
-        if (false && this->hasPhysics() && this->collisionShape_ != NULL)
+        /*if (this->hasPhysics() && this->collisionShape_ != NULL)
         {
             this->collisionShape_->setScale3D(scale);
-        }
+        }*/
 
         this->node_->setScale(scale);