Changeset 3125 for code/branches/pch/src/orxonox/objects/collisionshapes

Timestamp:

Jun 9, 2009, 2:48:32 PM (16 years ago)

Author:

rgrieder

Message:

Renamed stupid omni_cast to multi_cast. It still eats about anything

Location:

code/branches/pch/src/orxonox/objects/collisionshapes

Files:

• BoxCollisionShape.cc (modified) (1 diff)
• CompoundCollisionShape.cc (modified) (2 diffs)
• PlaneCollisionShape.cc (modified) (1 diff)

code/branches/pch/src/orxonox/objects/collisionshapes/BoxCollisionShape.cc

@@ -72 +72 @@
     btCollisionShape* BoxCollisionShape::createNewShape() const
     {
-        return new btBoxShape(omni_cast<btVector3>(this->halfExtents_));
+        return new btBoxShape(multi_cast<btVector3>(this->halfExtents_));
     }
 }

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

@@ -89 +89 @@
         {
             // 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()));
+            btTransform transf(multi_cast<btQuaternion>(shape->getOrientation()), multi_cast<btVector3>(shape->getPosition()));
             this->compoundShape_->addChildShape(transf, shape->getCollisionShape());
 
@@ -134 +134 @@
         {
             // 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()));
+            btTransform transf(multi_cast<btQuaternion>(shape->getOrientation()), multi_cast<btVector3>(shape->getPosition()));
             this->compoundShape_->addChildShape(transf, shape->getCollisionShape());
             it->second = shape->getCollisionShape();

code/branches/pch/src/orxonox/objects/collisionshapes/PlaneCollisionShape.cc

@@ -72 +72 @@
     btCollisionShape* PlaneCollisionShape::createNewShape() const
     {
-        return new btStaticPlaneShape(omni_cast<btVector3>(this->normal_), this->offset_);
+        return new btStaticPlaneShape(multi_cast<btVector3>(this->normal_), this->offset_);
     }
 }