Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9990 in orxonox.OLD for branches/coll_rect/src


Ignore:
Timestamp:
Dec 3, 2006, 5:28:15 PM (18 years ago)
Author:
patrick
Message:

removed more bugs, should compile now

Location:
branches/coll_rect/src/lib/collision_reaction
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/coll_rect/src/lib/collision_reaction/collision_filter.cc

    r9988 r9990  
    149149    for( int i = 0; i < CREngine::CR_NUMBER; i++ )
    150150    {
    151       TargetIterator it = this->_filters[i].begin();
    152 
    153 
    154 //       for(; it != this->_filters[i].end(); i++ )
    155 //         if( unlikely(entity.isA(*it) ) )
    156 //           return true;
     151      std::vector<ClassID>::const_iterator it = this->_filters[i].begin();
     152      for(; it != this->_filters[i].end(); i++ )
     153        if( unlikely(entity.isA(*it) ) )
     154          return true;
    157155    }
    158156
     
    175173
    176174    // goes through all registered filter criterions and looks for matches
    177     TargetIterator it = this->_filters[type].begin();
     175    TargetIteratorConst it = this->_filters[type].begin();
    178176    for(; it != this->_filters[type].end(); it++ )
    179177      if( unlikely(entity.isA(*it)))
  • branches/coll_rect/src/lib/collision_reaction/collision_filter.h

    r9988 r9990  
    3636
    3737
    38     typedef std::vector<ClassID>::iterator    TargetIterator;
     38    typedef std::vector<ClassID>::iterator        TargetIterator;
     39    typedef std::vector<ClassID>::const_iterator  TargetIteratorConst;
    3940
    4041    /* Constructor/Deconstructors */
  • branches/coll_rect/src/lib/collision_reaction/cr_physics_full_walk.cc

    r9982 r9990  
    8181
    8282
    83     const std::vector<CollisionEvent*>* collisionEvents = &(collision->getCollisionEvents());
    84     std::vector<CollisionEvent*>::const_iterator it = collisionEvents->begin();
    85     for(; it != collisionEvents->end(); it++)
     83    std::vector<CollisionEvent*>::const_iterator it = collision->begin();
     84    for(; it != collision->end(); it++)
    8685    {
    8786
     
    215214
    216215}
     216
Note: See TracChangeset for help on using the changeset viewer.