Changeset 10006 in orxonox.OLD for branches/coll_rect/src/lib/collision_reaction/collision_filter.cc

Timestamp:

Dec 4, 2006, 2:24:40 PM (17 years ago)

Author:

patrick

Message:

removed many very heavy segfaults

File:

• branches/coll_rect/src/lib/collision_reaction/collision_filter.cc (modified) (3 diffs)

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

@@ -142 +142 @@
   bool CollisionFilter::operator()(const WorldEntity& entity) const
   {
-    // if there are no installed criterions just ommit and
-    if( this->isReactive())
+    PRINTF(0)("operator()(const WorldEntity& entity)\n");
+
+    // if there are no installed criterions just ommit and return
+    if( !this->isReactive())
       return false;
 
@@ -149 +151 @@
     for( int i = 0; i < CREngine::CR_NUMBER; i++ )
     {
-      std::vector<ClassID>::const_iterator it = this->_filters[i].begin();
-      for(; it != this->_filters[i].end(); i++ )
+      TargetIteratorConst it = this->_filters[i].begin();
+      for(; it != this->_filters[i].end(); it++ )
+      {
+         PRINTF(0)("[%i] check %s is a %s?\n", i, entity.getClassName().c_str(), (*it).name().c_str());
         if( unlikely(entity.isA(*it) ) )
           return true;
+      }
     }
 
@@ -168 +173 @@
   bool CollisionFilter::operator()(const WorldEntity& entity, const CREngine::ReactionType type) const
   {
+    assert(&entity != NULL);
+
+    PRINTF(0)("operator()(const WorldEntity& entity, const CREngine::ReactionType type)\n");
     // if there are no installed criterions just omit and return
     if( !this->isReactive())
       return false;
 
+
     // goes through all registered filter criterions and looks for matches
     TargetIteratorConst it = this->_filters[type].begin();
     for(; it != this->_filters[type].end(); it++ )
-      if( unlikely(entity.isA(*it)))
+    {
+       PRINTF(0)("size: %i - %s is a %s?\n", this->_filters[type].size(), entity.getClassName().c_str(), (*it).name().c_str());
+      if( entity.isA(*it))
         return true;
+    }
 
     return false;