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

Added catch for NaN vertices that were being generated by osgText, these NaN vertices were causing glu tesselation functions to crash.

Browse Source
This commit is contained in:
Robert Osfield
2011-09-28 11:52:27 +00:00
parent b32d8e0151
commit db329cf943
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/osgUtil/Tessellator.cpp
View File

@@ -14,6 +14,7 @@
#include <osg/GLU>
#include <osg/Notify>
#include <osg/io_utils>
#include <osgUtil/Tessellator>
using namespace osg;
@@ -63,12 +64,19 @@ void Tessellator::addVertex(osg::Vec3* vertex)
{
if (_tobj)
{
Vec3d* data = new Vec3d;
_coordData.push_back(data);
(*data)._v[0]=(*vertex)[0];
(*data)._v[1]=(*vertex)[1];
(*data)._v[2]=(*vertex)[2];
gluTessVertex(_tobj,data->_v,vertex);
if (vertex && vertex->valid())
{
Vec3d* data = new Vec3d;
_coordData.push_back(data);
(*data)._v[0]=(*vertex)[0];
(*data)._v[1]=(*vertex)[1];
(*data)._v[2]=(*vertex)[2];
gluTessVertex(_tobj,data->_v,vertex);
}
else
{
OSG_INFO<<"Tessellator::addVertex("<<*vertex<<") detected NaN, ignoring vertex."<<std::endl;
}
}
}