Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5111 in orxonox.OLD for trunk/src/lib/collision_detection


Ignore:
Timestamp:
Aug 23, 2005, 11:13:56 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: reverted the last steps, because they created a huge pack of seg-faults

Location:
trunk/src/lib/collision_detection
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/collision_detection/cd_engine.cc

    r5110 r5111  
    8080  tIterator<WorldEntity>* iterator1 = entityList->getIterator();
    8181  tIterator<WorldEntity>* iterator2 = entityList->getIterator();
    82   WorldEntity* entity1 = iterator1->firstElement();
     82  WorldEntity* entity1 = iterator1->nextElement();
    8383  WorldEntity* entity2 = iterator2->seekElement(entity1);
    8484  PRINTF(3)("checking for collisions\n");
    85 /*  while( entity1 != NULL)
     85  while( entity1 != NULL)
    8686  {
    8787    if( likely(entity1 != this->terrain))
    … …  
    101101    entity2 = iterator2->seekElement(entity1);
    102102
    103   }*/
     103  }
    104104  delete iterator1;
    105105  delete iterator2;
    … …  
    133133
    134134  tIterator<WorldEntity>* iterator = entityList->getIterator();
    135   WorldEntity* entity = iterator->firstElement();
     135  WorldEntity* entity = iterator->nextElement();
    136136  while( entity != NULL)
    137137  {

  • trunk/src/lib/collision_detection/obb_tree_node.cc

    r5110 r5111  
    574574
    575575  iterator = partition1.getIterator();
    576   element = iterator->firstElement();
     576  element = iterator->nextElement();
    577577  index = 0;
    578578  while( element != NULL)
    … …  
    592592
    593593  iterator = partition2.getIterator();
    594   element = iterator->firstElement();
     594  element = iterator->nextElement();
    595595  index = 0;
    596596  while( element != NULL)
Note: See TracChangeset for help on using the changeset viewer.