Changeset 9990 in orxonox.OLD for branches/coll_rect/src
- Timestamp:
- Dec 3, 2006, 5:28:15 PM (18 years ago)
- 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 149 149 for( int i = 0; i < CREngine::CR_NUMBER; i++ ) 150 150 { 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; 157 155 } 158 156 … … 175 173 176 174 // goes through all registered filter criterions and looks for matches 177 TargetIterator it = this->_filters[type].begin();175 TargetIteratorConst it = this->_filters[type].begin(); 178 176 for(; it != this->_filters[type].end(); it++ ) 179 177 if( unlikely(entity.isA(*it))) -
branches/coll_rect/src/lib/collision_reaction/collision_filter.h
r9988 r9990 36 36 37 37 38 typedef std::vector<ClassID>::iterator TargetIterator; 38 typedef std::vector<ClassID>::iterator TargetIterator; 39 typedef std::vector<ClassID>::const_iterator TargetIteratorConst; 39 40 40 41 /* Constructor/Deconstructors */ -
branches/coll_rect/src/lib/collision_reaction/cr_physics_full_walk.cc
r9982 r9990 81 81 82 82 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++) 86 85 { 87 86 … … 215 214 216 215 } 216
Note: See TracChangeset
for help on using the changeset viewer.