Browse Source

clean up output a bit

David Rose 15 years ago
parent
commit
1bd404eaa8
2 changed files with 11 additions and 2 deletions
  1. 6 2
      panda/src/speedtree/speedTreeNode.cxx
  2. 5 0
      panda/src/speedtree/speedTreeNode.h

+ 6 - 2
panda/src/speedtree/speedTreeNode.cxx

@@ -1039,11 +1039,15 @@ void SpeedTreeNode::
 write(ostream &out, int indent_level) const {
 write(ostream &out, int indent_level) const {
   PandaNode::write(out, indent_level);
   PandaNode::write(out, indent_level);
 
 
+  // This makes NodePath.ls() too confusing.
+  /*
   Trees::const_iterator ti;
   Trees::const_iterator ti;
   for (ti = _trees.begin(); ti != _trees.end(); ++ti) {
   for (ti = _trees.begin(); ti != _trees.end(); ++ti) {
     InstanceList *instance_list = (*ti);
     InstanceList *instance_list = (*ti);
-    instance_list->write(out, indent_level + 2);
+    indent(out, indent_level + 2) 
+      << *instance_list << "\n";
   }
   }
+  */
 }
 }
 
 
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
@@ -1534,7 +1538,7 @@ fillin(DatagramIterator &scan, BamReader *manager) {
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 void SpeedTreeNode::InstanceList::
 void SpeedTreeNode::InstanceList::
 output(ostream &out) const {
 output(ostream &out) const {
-  out << *_tree << ": " << _instances.size() << " instances.";
+  out << *_tree << ": " << _instances.size() << " instances";
 }
 }
 
 
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////

+ 5 - 0
panda/src/speedtree/speedTreeNode.h

@@ -245,6 +245,11 @@ private:
   friend class SpeedTreeNode::DrawCallback;
   friend class SpeedTreeNode::DrawCallback;
 };
 };
 
 
+INLINE ostream &operator << (ostream &out, const SpeedTreeNode::InstanceList &instances) {
+  instances.output(out);
+  return out;
+}
+
 #include "speedTreeNode.I"
 #include "speedTreeNode.I"
 
 
 #endif
 #endif