- Timestamp:
- Jun 9, 2009, 2:48:32 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/pch/src/orxonox/objects/collisionshapes/CompoundCollisionShape.cc
r3110 r3125 89 89 { 90 90 // Only actually attach if we didn't pick a CompoundCollisionShape with no content 91 btTransform transf( omni_cast<btQuaternion>(shape->getOrientation()), omni_cast<btVector3>(shape->getPosition()));91 btTransform transf(multi_cast<btQuaternion>(shape->getOrientation()), multi_cast<btVector3>(shape->getPosition())); 92 92 this->compoundShape_->addChildShape(transf, shape->getCollisionShape()); 93 93 … … 134 134 { 135 135 // Only actually attach if we didn't pick a CompoundCollisionShape with no content 136 btTransform transf( omni_cast<btQuaternion>(shape->getOrientation()), omni_cast<btVector3>(shape->getPosition()));136 btTransform transf(multi_cast<btQuaternion>(shape->getOrientation()), multi_cast<btVector3>(shape->getPosition())); 137 137 this->compoundShape_->addChildShape(transf, shape->getCollisionShape()); 138 138 it->second = shape->getCollisionShape();
Note: See TracChangeset
for help on using the changeset viewer.