From e1eeabcea0121bcb2fdd3a4b7f48b226b0ed45e5 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 29 May 2008 11:13:29 +0000
Subject: [PATCH] Improved the NaN depth detection within CullVisitor and debug
 output.

---
 src/osgUtil/CullVisitor.cpp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/osgUtil/CullVisitor.cpp b/src/osgUtil/CullVisitor.cpp
index c1d78b0b6..4ae2b021d 100644
--- a/src/osgUtil/CullVisitor.cpp
+++ b/src/osgUtil/CullVisitor.cpp
@@ -819,12 +819,14 @@ void CullVisitor::apply(Geode& node)
         
         if (osg::isNaN(depth))
         {
-            osg::notify(osg::NOTICE)<<"CullVisitor::apply(Geode& node) detected NaN,"<<std::endl
+            osg::notify(osg::NOTICE)<<"CullVisitor::apply(Geode&) detected NaN,"<<std::endl
                                     <<"    depth="<<depth<<", center=("<<bb.center()<<"),"<<std::endl
                                     <<"    matrix="<<matrix<<std::endl;
         }
-        
-        addDrawableAndDepth(drawable,&matrix,depth);
+        else
+        {        
+            addDrawableAndDepth(drawable,&matrix,depth);
+        }
 
         for(unsigned int i=0;i< numPopStateSetRequired; ++i)
         {
@@ -890,10 +892,14 @@ void CullVisitor::apply(Billboard& node)
         
         if (osg::isNaN(depth))
         {
-            osg::notify(osg::NOTICE)<<"CullVisitor::apply(Geode& node) detected NaN in depth "<<depth<<std::endl;
+            osg::notify(osg::NOTICE)<<"CullVisitor::apply(Billboard&) detected NaN,"<<std::endl
+                                    <<"    depth="<<depth<<", pos=("<<pos<<"),"<<std::endl
+                                    <<"    *billboard_matrix="<<*billboard_matrix<<std::endl;
+        }
+        else
+        {        
+            addDrawableAndDepth(drawable,billboard_matrix,depth);
         }
-
-        addDrawableAndDepth(drawable,billboard_matrix,depth);
 
         if (stateset) popStateSet();