Changeset 5038 in orxonox.OLD for orxonox/trunk/src/lib/collision_detection/cd_engine.cc
- Timestamp:
- Aug 16, 2005, 6:46:10 PM (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/src/lib/collision_detection/cd_engine.cc
r5035 r5038 66 66 void CDEngine::checkCollisions() 67 67 { 68 //this->checkCollisionObjects();68 this->checkCollisionObjects(); 69 69 this->checkCollisionGround(); 70 70 } … … 84 84 while( entity1 != NULL) 85 85 { 86 while( entity2 != NULL)86 if( likely(entity1 != this->terrain)) 87 87 { 88 PRINTF(3)("checking object %s against %s\n", entity1->getName(), entity2->getName()); 89 tree = entity1->getOBBTree(); 90 if( likely(tree != NULL)) tree->collideWith(entity1, entity2); 91 entity2 = iterator2->nextElement(); 88 while( entity2 != NULL) 89 { 90 if( likely(entity2 != this->terrain)) 91 { 92 PRINTF(3)("checking object %s against %s\n", entity1->getName(), entity2->getName()); 93 tree = entity1->getOBBTree(); 94 if( likely(tree != NULL)) tree->collideWith(entity1, entity2); 95 } 96 entity2 = iterator2->nextElement(); 97 } 92 98 } 93 99 entity1 = iterator1->nextElement();
Note: See TracChangeset
for help on using the changeset viewer.