FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved the NaN error detection and reporting.

Browse Source
This commit is contained in:
Robert Osfield
2008-05-29 11:09:56 +00:00
parent 4745ab040b
commit 2a11d25bbc
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/osgUtil/CullVisitor.cpp
View File

@@ -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();

2
src/osgUtil/RenderBin.cpp
View File

@@ -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();