From 5e33e13b3424e3849666e73892384b7c89185d3b Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 9 Aug 2006 10:09:11 +0000
Subject: [PATCH] Added nan dectecion and error reporting

---
 src/osgPlugins/OpenFlight/GeometryRecords.cpp | 26 +++++++++++++++++++
 src/osgPlugins/OpenFlight/VertexRecords.cpp   | 16 ++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/src/osgPlugins/OpenFlight/GeometryRecords.cpp b/src/osgPlugins/OpenFlight/GeometryRecords.cpp
index 9fca524fb..41d356c41 100644
--- a/src/osgPlugins/OpenFlight/GeometryRecords.cpp
+++ b/src/osgPlugins/OpenFlight/GeometryRecords.cpp
@@ -962,6 +962,11 @@ protected:
             {
                 osg::Vec3d coord = in.readVec3d();
                 vertex.setCoord(coord*document.unitScale());
+
+                if (!coord.valid())
+                {
+                    osg::notify(osg::NOTICE)<<"Warning: data error detected in LocalVertexPool::readRecord coord="<<coord.x()<<" "<<coord.y()<<" "<<coord.z()<<std::endl;
+                }
             }
 
             if (mask & HAS_COLOR_INDEX)
@@ -972,18 +977,33 @@ protected:
                 osg::Vec4 color = document.getColorPool()->getColor(index);
                 color.a() = (float)alpha/255;
                 vertex.setColor(color);
+
+                if (!color.valid())
+                {
+                    osg::notify(osg::NOTICE)<<"Warning: data error detected in LocalVertexPool::readRecord color="<<color.r()<<" "<<color.g()<<" "<<color.b()<<" "<<color.a()<<std::endl;
+                }
             }
 
             if (mask & HAS_RGBA_COLOR)
             {
                 osg::Vec4f color = in.readColor32();
                 vertex.setColor(color);
+
+                if (!color.valid())
+                {
+                    osg::notify(osg::NOTICE)<<"Warning: data error detected in LocalVertexPool::readRecord color="<<color.r()<<" "<<color.g()<<" "<<color.b()<<" "<<color.a()<<std::endl;
+                }
             }
 
             if (mask & HAS_NORMAL)
             {
                 osg::Vec3f normal = in.readVec3f();
                 vertex.setNormal(normal);
+
+                if (!normal.valid())
+                {
+                    osg::notify(osg::NOTICE)<<"Warning: data error detected in LocalVertexPool::readRecord normal="<<normal.x()<<" "<<normal.y()<<" "<<normal.z()<<std::endl;
+                }
             }
 
             for (unsigned int layer=0; layer<8; layer++)
@@ -992,6 +1012,12 @@ protected:
                 {
                     osg::Vec2f uv = in.readVec2f();
                     vertex.setUV(layer,uv);
+                    
+                    if (!uv.valid())
+                    {
+                        osg::notify(osg::NOTICE)<<"Warning: data error detected in LocalVertexPool::readRecord uv="<<uv.x()<<" "<<uv.y()<<std::endl;
+                    }
+
                 }
             }
 
diff --git a/src/osgPlugins/OpenFlight/VertexRecords.cpp b/src/osgPlugins/OpenFlight/VertexRecords.cpp
index 739f0b917..48364677e 100644
--- a/src/osgPlugins/OpenFlight/VertexRecords.cpp
+++ b/src/osgPlugins/OpenFlight/VertexRecords.cpp
@@ -170,6 +170,22 @@ class VertexCNT : public Record
             vertex.setCoord(coord*document.unitScale());
             vertex.setNormal(normal);
             vertex.setUV(0,uv);
+            
+
+            if (!coord.valid())
+            {
+                osg::notify(osg::NOTICE)<<"Warning: data error detected in VertexCNT::readRecord coord="<<coord.x()<<" "<<coord.y()<<" "<<coord.z()<<std::endl;
+            }
+
+            if (!normal.valid())
+            {
+                osg::notify(osg::NOTICE)<<"Warning: data error detected in VertexCNT::readRecord normal="<<normal.x()<<" "<<normal.y()<<" "<<normal.z()<<std::endl;
+            }
+
+            if (!uv.valid())
+            {
+                osg::notify(osg::NOTICE)<<"Warning: data error detected in VertexCNT::readRecord uv="<<uv.x()<<" "<<uv.y()<<std::endl;
+            }
 
             // color
             if (flags & PACKED_COLOR)