From 2a11d25bbc2b524a51e57db4d02093ab423901f0 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 29 May 2008 11:09:56 +0000
Subject: [PATCH] Improved the NaN error detection and reporting.

---
 src/osgUtil/CullVisitor.cpp | 21 +++++++++++++++++----
 src/osgUtil/RenderBin.cpp   |  2 +-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/osgUtil/CullVisitor.cpp b/src/osgUtil/CullVisitor.cpp
index 807fee7ca..c1d78b0b6 100644
--- a/src/osgUtil/CullVisitor.cpp
+++ b/src/osgUtil/CullVisitor.cpp
@@ -815,8 +815,16 @@ void CullVisitor::apply(Geode& node)
             }
         }
 
-        if (bb.valid()) addDrawableAndDepth(drawable,&matrix,distance(bb.center(),matrix));
-        else addDrawableAndDepth(drawable,&matrix,0.0f);
+        float depth = bb.valid() ? distance(bb.center(),matrix) : 0.0f;
+        
+        if (osg::isNaN(depth))
+        {
+            osg::notify(osg::NOTICE)<<"CullVisitor::apply(Geode& node) detected NaN,"<<std::endl
+                                    <<"    depth="<<depth<<", center=("<<bb.center()<<"),"<<std::endl
+                                    <<"    matrix="<<matrix<<std::endl;
+        }
+        
+        addDrawableAndDepth(drawable,&matrix,depth);
 
         for(unsigned int i=0;i< numPopStateSetRequired; ++i)
         {
@@ -865,7 +873,7 @@ void CullVisitor::apply(Billboard& node)
 
 
         if (_computeNearFar && drawable->getBound().valid()) updateCalculatedNearFar(*billboard_matrix,*drawable,true);
-        float d = distance(pos,modelview);
+        float depth = distance(pos,modelview);
 /*
         if (_computeNearFar)
         {
@@ -880,7 +888,12 @@ void CullVisitor::apply(Billboard& node)
         StateSet* stateset = drawable->getStateSet();
         if (stateset) pushStateSet(stateset);
         
-        addDrawableAndDepth(drawable,billboard_matrix,d);
+        if (osg::isNaN(depth))
+        {
+            osg::notify(osg::NOTICE)<<"CullVisitor::apply(Geode& node) detected NaN in depth "<<depth<<std::endl;
+        }
+
+        addDrawableAndDepth(drawable,billboard_matrix,depth);
 
         if (stateset) popStateSet();
 
diff --git a/src/osgUtil/RenderBin.cpp b/src/osgUtil/RenderBin.cpp
index 1c9c830a1..b33cafb19 100644
--- a/src/osgUtil/RenderBin.cpp
+++ b/src/osgUtil/RenderBin.cpp
@@ -339,7 +339,7 @@ void RenderBin::copyLeavesFromStateGraphListToRenderLeafList()
         }
     }
     
-    osg::notify(osg::NOTICE)<<"Warning: RenderBin::copyLeavesFromStateGraphListToRenderLeafList() detected NaN depth values, database may be corrupted."<<std::endl;
+    if (detectedNaN) osg::notify(osg::NOTICE)<<"Warning: RenderBin::copyLeavesFromStateGraphListToRenderLeafList() detected NaN depth values, database may be corrupted."<<std::endl;
     
     // empty the render graph list to prevent it being drawn along side the render leaf list (see drawImplementation.)
     _stateGraphList.clear();