diff --git a/panda/src/speedtree/speedTreeNode.cxx b/panda/src/speedtree/speedTreeNode.cxx index 5b66c0a286..72b2f6d50d 100644 --- a/panda/src/speedtree/speedTreeNode.cxx +++ b/panda/src/speedtree/speedTreeNode.cxx @@ -1039,11 +1039,15 @@ void SpeedTreeNode:: write(ostream &out, int indent_level) const { PandaNode::write(out, indent_level); + // This makes NodePath.ls() too confusing. + /* Trees::const_iterator ti; for (ti = _trees.begin(); ti != _trees.end(); ++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:: output(ostream &out) const { - out << *_tree << ": " << _instances.size() << " instances."; + out << *_tree << ": " << _instances.size() << " instances"; } //////////////////////////////////////////////////////////////////// diff --git a/panda/src/speedtree/speedTreeNode.h b/panda/src/speedtree/speedTreeNode.h index 475d42cd5c..017db2cec6 100644 --- a/panda/src/speedtree/speedTreeNode.h +++ b/panda/src/speedtree/speedTreeNode.h @@ -245,6 +245,11 @@ private: friend class SpeedTreeNode::DrawCallback; }; +INLINE ostream &operator << (ostream &out, const SpeedTreeNode::InstanceList &instances) { + instances.output(out); + return out; +} + #include "speedTreeNode.I" #endif