Changeset 9990 in orxonox.OLD

Timestamp:

Dec 3, 2006, 5:28:15 PM (17 years ago)

Author:

patrick

Message:

removed more bugs, should compile now

Location:

branches/coll_rect/src/lib/collision_reaction

Files:

• collision_filter.cc (modified) (2 diffs)
• collision_filter.h (modified) (1 diff)
• cr_physics_full_walk.cc (modified) (2 diffs)

branches/coll_rect/src/lib/collision_reaction/collision_filter.cc

@@ -149 +149 @@
     for( int i = 0; i < CREngine::CR_NUMBER; i++ )
     {
-      TargetIterator it = this->_filters[i].begin();
-
-
-//       for(; it != this->_filters[i].end(); i++ )
-//         if( unlikely(entity.isA(*it) ) )
-//           return true;
+      std::vector<ClassID>::const_iterator it = this->_filters[i].begin();
+      for(; it != this->_filters[i].end(); i++ )
+        if( unlikely(entity.isA(*it) ) )
+          return true;
     }
 
@@ -175 +173 @@
 
     // goes through all registered filter criterions and looks for matches
-    TargetIterator it = this->_filters[type].begin();
+    TargetIteratorConst it = this->_filters[type].begin();
     for(; it != this->_filters[type].end(); it++ )
       if( unlikely(entity.isA(*it)))

branches/coll_rect/src/lib/collision_reaction/collision_filter.h

@@ -36 +36 @@
 
 
-    typedef std::vector<ClassID>::iterator    TargetIterator;
+    typedef std::vector<ClassID>::iterator        TargetIterator;
+    typedef std::vector<ClassID>::const_iterator  TargetIteratorConst;
 
     /* Constructor/Deconstructors */

branches/coll_rect/src/lib/collision_reaction/cr_physics_full_walk.cc

@@ -81 +81 @@
 
 
-    const std::vector<CollisionEvent*>* collisionEvents = &(collision->getCollisionEvents());
-    std::vector<CollisionEvent*>::const_iterator it = collisionEvents->begin();
-    for(; it != collisionEvents->end(); it++)
+    std::vector<CollisionEvent*>::const_iterator it = collision->begin();
+    for(; it != collision->end(); it++)
     {
 
@@ -215 +214 @@
 
 }
+