be more gentle with not-in-scene-graph warnings

panda/src/collide/collisionTraverser.cxx

@@ -107,7 +107,10 @@ add_collider(const NodePath &collider, CollisionHandler *handler) {
   } else {
     // We hadn't already known about this collider.
     _colliders.insert(Colliders::value_type(collider, handler));
-    _ordered_colliders.push_back(collider);
+    OrderedColliderDef ocdef;
+    ocdef._node_path = collider;
+    ocdef._in_graph = true;
+    _ordered_colliders.push_back(ocdef);
 
     Handlers::iterator hi = _handlers.find(handler);
     if (hi == _handlers.end()) {
@@ -152,8 +155,13 @@ remove_collider(const NodePath &collider) {
 
   _colliders.erase(ci);
 
-  OrderedColliders::iterator oci =
+  OrderedColliders::iterator oci;
-    find(_ordered_colliders.begin(), _ordered_colliders.end(), collider);
+  oci = _ordered_colliders.begin();
+  while (oci != _ordered_colliders.end() &&
+         (*oci)._node_path != collider) {
+    ++oci;
+  }
+
   nassertr(oci != _ordered_colliders.end(), false);
   _ordered_colliders.erase(oci);
 
@@ -196,7 +204,7 @@ NodePath CollisionTraverser::
 get_collider(int n) const {
   nassertr(_ordered_colliders.size() == _colliders.size(), NULL);
   nassertr(n >= 0 && n < (int)_ordered_colliders.size(), NULL);
-  return _ordered_colliders[n];
+  return _ordered_colliders[n]._node_path;
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -403,34 +411,36 @@ prepare_colliders(CollisionLevelState &level_state, const NodePath &root) {
   level_state.clear();
   level_state.reserve(_colliders.size());
 
-  int i = 0;
+  OrderedColliders::iterator oci;
-  while (i < (int)_ordered_colliders.size()) {
+  for (oci = _ordered_colliders.begin(); 
-    NodePath cnode_path = _ordered_colliders[i];
+       oci != _ordered_colliders.end(); 
-#ifndef NDEBUG
+       ++oci) {
+    NodePath cnode_path = (*oci)._node_path;
+
     if (!cnode_path.is_same_graph(root)) {
-      collide_cat.error()
+      if ((*oci)._in_graph) {
-        << "Collider " << cnode_path
+        // Only report this warning once.
-        << " is not in scene graph.  Dropping from traverser.\n";
+        collide_cat.warning()
-      // This is safe to do while traversing the list of colliders,
+          << "Collider " << cnode_path
-      // because we do not increment i in this case.
+          << " is not in scene graph.  Ignoring.\n";
-      remove_collider(cnode_path);
+        (*oci)._in_graph = false;
-    } else
-#endif
-      {
-        CollisionNode *cnode = DCAST(CollisionNode, cnode_path.node());
-        
-        CollisionLevelState::ColliderDef def;
-        def._node = cnode;
-        def._node_path = cnode_path;
-        
-        int num_solids = cnode->get_num_solids();
-        for (int s = 0; s < num_solids; s++) {
-          CollisionSolid *collider = cnode->get_solid(s);
-          def._collider = collider;
-          level_state.prepare_collider(def);
-        }
-        i++;
       }
+
+    } else {
+      (*oci)._in_graph = true;
+      CollisionNode *cnode = DCAST(CollisionNode, cnode_path.node());
+      
+      CollisionLevelState::ColliderDef def;
+      def._node = cnode;
+      def._node_path = cnode_path;
+      
+      int num_solids = cnode->get_num_solids();
+      for (int s = 0; s < num_solids; s++) {
+        CollisionSolid *collider = cnode->get_solid(s);
+        def._collider = collider;
+        level_state.prepare_collider(def);
+      }
+    }
   }
 }
 
@@ -720,8 +730,12 @@ remove_handler(CollisionTraverser::Handlers::iterator hi) {
       ci = cnext;
 
       // Also remove it from the ordered list.
-      OrderedColliders::iterator oci =
+      OrderedColliders::iterator oci;
-        find(_ordered_colliders.begin(), _ordered_colliders.end(), node_path);
+      oci = _ordered_colliders.begin();
+      while (oci != _ordered_colliders.end() &&
+             (*oci)._node_path != node_path) {
+        ++oci;
+      }
       nassertr(oci != _ordered_colliders.end(), hi);
       _ordered_colliders.erase(oci);
       

panda/src/collide/collisionTraverser.h

@@ -108,9 +108,15 @@ private:
   PT(CollisionHandler) _default_handler;
   TypeHandle _graph_type;
 
+  class OrderedColliderDef {
+  public:
+    NodePath _node_path;
+    bool _in_graph;
+  };
+
   typedef pmap<NodePath,  PT(CollisionHandler) > Colliders;
   Colliders _colliders;
-  typedef pvector<NodePath> OrderedColliders;
+  typedef pvector<OrderedColliderDef> OrderedColliders;
   OrderedColliders _ordered_colliders;
 
   typedef pmap<PT(CollisionHandler), int> Handlers;