Changeset 13041 for OpenSceneGraph/trunk/src/osgUtil/Simplifier.cpp

Timestamp:

03/21/12 18:36:20 (14 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osgUtil/Simplifier.cpp (modified) (93 diffs)

OpenSceneGraph/trunk/src/osgUtil/Simplifier.cpp

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
  *
- * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * OpenSceneGraph Public License for more details.
 */
@@ -74 +74 @@
         _geometry(0),
         _computeErrorMetricUsingLength(false)  {}
-        
+
     ~EdgeCollapse();
 
@@ -92 +92 @@
         Point* p1 = edge->_p1.get();
         Point* p2 = edge->_p2.get();
-        
+
         if (p1==0 || p2==0)
         {
             OSG_NOTICE<<"Error computeInterpolatedPoint("<<edge<<",r) p1 and/or p2==0"<<std::endl;
             return 0;
-        } 
-        
+        }
+
         point->_vertex = p1->_vertex * r1 + p2->_vertex * r2;
         unsigned int s = osg::minimum(p1->_attributes.size(),p2->_attributes.size());
         for(unsigned int i=0;i<s;++i)
         {
-            point->_attributes.push_back(p1->_attributes[i]*r1 + p2->_attributes[i]*r2); 
+            point->_attributes.push_back(p1->_attributes[i]*r1 + p2->_attributes[i]*r2);
         }
         return point;
@@ -112 +112 @@
         return computeInterpolatedPoint(edge,0.5f);
     }
-    
+
     error_type computeErrorMetric(Edge* edge,Point* point) const
     {
@@ -140 +140 @@
                 error += fabs( (*itr)->distance(vertex) );
             }
-            
+
             // use average of error
             error /= error_type(triangles.size());
@@ -151 +151 @@
         }
     }
-    
+
     void updateErrorMetricForEdge(Edge* edge)
     {
@@ -162 +162 @@
 
         osg::ref_ptr<Edge> keep_local_reference_to_edge(edge);
-    
+
         if (_edgeSet.count(keep_local_reference_to_edge)!=0)
         {
@@ -169 +169 @@
 
         edge->_proposedPoint = computeOptimalPoint(edge);
-        
+
         if (_computeErrorMetricUsingLength)
         {
@@ -183 +183 @@
                 edge->setErrorMetric( FLT_MAX );
          }
-        
+
         _edgeSet.insert(keep_local_reference_to_edge);
     }
-    
+
     void updateErrorMetricForAllEdges()
     {
@@ -192 +192 @@
         LocalEdgeList edges;
         std::copy( _edgeSet.begin(), _edgeSet.end(), std::back_inserter(edges));
-        
+
         _edgeSet.clear();
-        
+
         for(LocalEdgeList::iterator itr=edges.begin();
             itr!=edges.end();
@@ -272 +272 @@
     {
         Point(): _protected(false), _index(0) {}
-        
+
         bool _protected;
 
@@ -291 +291 @@
             if (_vertex < rhs._vertex) return true;
             if (rhs._vertex < _vertex) return false;
-            
+
             return _attributes < rhs._attributes;
         }
-        
+
         bool isBoundaryPoint() const
         {
             if (_protected) return true;
-        
+
             for(TriangleSet::const_iterator itr=_triangles.begin();
                 itr!=_triangles.end();
@@ -307 +307 @@
                 if ((triangle->_e2->_p1==this || triangle->_e2->_p2==this) && triangle->_e2->isBoundaryEdge()) return true;
                 if ((triangle->_e3->_p1==this || triangle->_e3->_p2==this) && triangle->_e3->isBoundaryEdge()) return true;
-            
+
                 //if ((*itr)->isBoundaryTriangle()) return true;
             }
@@ -318 +318 @@
     {
         Edge(): _errorMetric(0.0), _maximumDeviation(1.0) {}
-        
+
         void clear()
         {
@@ -328 +328 @@
         osg::ref_ptr<Point> _p1;
         osg::ref_ptr<Point> _p2;
-        
+
         TriangleSet _triangles;
 
@@ -338 +338 @@
         void setErrorMetric(error_type errorMetric) { _errorMetric = errorMetric; }
         error_type getErrorMetric() const { return _errorMetric; }
-        
+
         bool operator < ( const Edge& rhs) const
         {
@@ -347 +347 @@
             if (dereference_check_less(_p1,rhs._p1)) return true;
             if (dereference_check_less(rhs._p1,_p1)) return false;
-            
+
             return dereference_check_less(_p2,rhs._p2);
         }
-        
+
         bool operator == ( const Edge& rhs) const
         {
@@ -366 +366 @@
             return false;
         }
-        
+
         void addTriangle(Triangle* triangle)
         {
@@ -372 +372 @@
             // if (_triangles.size()>2) OSG_NOTICE<<"Warning too many triangles ("<<_triangles.size()<<") sharing edge "<<std::endl;
         }
-        
+
         bool isBoundaryEdge() const
         {
             return _triangles.size()<=1;
         }
-        
+
         bool isAdjacentToBoundary() const
         {
-            return isBoundaryEdge() || _p1->isBoundaryPoint() || _p2->isBoundaryPoint(); 
-        }
-        
+            return isBoundaryEdge() || _p1->isBoundaryPoint() || _p2->isBoundaryPoint();
+        }
+
 
         void updateMaxNormalDeviationOnEdgeCollapse()
@@ -407 +407 @@
             }
         }
-        
-        error_type getMaxNormalDeviationOnEdgeCollapse() const { return _maximumDeviation; } 
+
+        error_type getMaxNormalDeviationOnEdgeCollapse() const { return _maximumDeviation; }
 
     };
@@ -415 +415 @@
     {
         Triangle() {}
-        
+
         void clear()
         {
@@ -421 +421 @@
             _p2 = 0;
             _p3 = 0;
-        
+
             _e1 = 0;
             _e2 = 0;
@@ -433 +433 @@
 
 
-            const Point* lhs_lower = dereference_check_less(_p2,_p3) ? _p2.get() : _p3.get(); 
-            const Point* rhs_lower = dereference_check_less(rhs._p2,rhs._p3) ? rhs._p2.get() : rhs._p3.get(); 
+            const Point* lhs_lower = dereference_check_less(_p2,_p3) ? _p2.get() : _p3.get();
+            const Point* rhs_lower = dereference_check_less(rhs._p2,rhs._p3) ? rhs._p2.get() : rhs._p3.get();
 
             if (dereference_check_less(lhs_lower,rhs_lower)) return true;
             if (dereference_check_less(rhs_lower,lhs_lower)) return false;
 
-            const Point* lhs_upper = dereference_check_less(_p2,_p3) ? _p3.get() : _p2.get(); 
-            const Point* rhs_upper = dereference_check_less(rhs._p2,rhs._p3) ? rhs._p3.get() : rhs._p2.get(); 
+            const Point* lhs_upper = dereference_check_less(_p2,_p3) ? _p3.get() : _p2.get();
+            const Point* rhs_upper = dereference_check_less(rhs._p2,rhs._p3) ? rhs._p3.get() : rhs._p2.get();
 
             return dereference_check_less(lhs_upper,rhs_upper);
@@ -462 +462 @@
             _p3 = points[(lowest+2)%3];
         }
-        
+
         void update()
         {
             _plane.set(_p1->_vertex,_p2->_vertex,_p3->_vertex);
-            
-        }
-        
+
+        }
+
         osg::Plane computeNewPlaneOnEdgeCollapse(Edge* edge,Point* pNew) const
         {
-            const Point* p1 = (_p1==edge->_p1 || _p1==edge->_p2) ? pNew : _p1.get();  
-            const Point* p2 = (_p2==edge->_p1 || _p2==edge->_p2) ? pNew : _p2.get();  
+            const Point* p1 = (_p1==edge->_p1 || _p1==edge->_p2) ? pNew : _p1.get();
+            const Point* p2 = (_p2==edge->_p1 || _p2==edge->_p2) ? pNew : _p2.get();
             const Point* p3 = (_p3==edge->_p1 || _p3==edge->_p2) ? pNew : _p3.get();
-            
+
             return osg::Plane(p1->_vertex,p2->_vertex,p3->_vertex);
         }
-        
+
         // note return 1 - dotproduct, so that deviation is in the range of 0.0 to 2.0, where 0 is coincident, 1.0 is 90 degrees, and 2.0 is 180 degrees.
         error_type computeNormalDeviationOnEdgeCollapse(Edge* edge,Point* pNew) const
         {
-            const Point* p1 = (_p1==edge->_p1 || _p1==edge->_p2) ? pNew : _p1.get();  
-            const Point* p2 = (_p2==edge->_p1 || _p2==edge->_p2) ? pNew : _p2.get();  
+            const Point* p1 = (_p1==edge->_p1 || _p1==edge->_p2) ? pNew : _p1.get();
+            const Point* p2 = (_p2==edge->_p1 || _p2==edge->_p2) ? pNew : _p2.get();
             const Point* p3 = (_p3==edge->_p1 || _p3==edge->_p2) ? pNew : _p3.get();
-            
+
             osg::Vec3 new_normal = (p2->_vertex - p1->_vertex) ^ (p3->_vertex - p2->_vertex);
             new_normal.normalize();
@@ -499 +499 @@
                    error_type(_plane[3]);
         }
-        
+
         bool isBoundaryTriangle() const
         {
@@ -505 +505 @@
         }
 
-       
+
         osg::ref_ptr<Point> _p1;
         osg::ref_ptr<Point> _p2;
         osg::ref_ptr<Point> _p3;
-        
+
         osg::ref_ptr<Edge> _e1;
         osg::ref_ptr<Edge> _e2;
         osg::ref_ptr<Edge> _e3;
-        
+
         osg::Plane _plane;
 
@@ -525 +525 @@
         // detect if triangle is degenerate.
         if (p1==p2 || p2==p3 || p1==p3) return 0;
-        
+
         Triangle* triangle = new Triangle;
 
@@ -532 +532 @@
         points[1] = addPoint(triangle, p2);
         points[2] = addPoint(triangle, p3);
-        
+
         // find the lowest value point in the list.
         unsigned int lowest = 0;
@@ -545 +545 @@
         triangle->_e2 = addEdge(triangle, triangle->_p2.get(), triangle->_p3.get());
         triangle->_e3 = addEdge(triangle, triangle->_p3.get(), triangle->_p1.get());
-        
+
         triangle->update();
 
         _triangleSet.insert(triangle);
-        
+
         return triangle;
     }
-    
+
     Triangle* addTriangle(Point* p1, Point* p2, Point* p3)
     {
@@ -558 +558 @@
 
         // detect if triangle is degenerate.
-        if (p1==p2 || p2==p3 || p1==p3) 
+        if (p1==p2 || p2==p3 || p1==p3)
         {
             // OSG_NOTICE<<"    **** addTriangle failed - p1==p2 || p2==p3 || p1==p3"<<std::endl;
             return 0;
         }
-        
+
         Triangle* triangle = new Triangle;
 
@@ -570 +570 @@
         points[1] = addPoint(triangle, p2);
         points[2] = addPoint(triangle, p3);
-        
+
         // find the lowest value point in the list.
-        unsigned int lowest = 0;        
+        unsigned int lowest = 0;
         if (dereference_check_less(points[1],points[lowest])) lowest = 1;
         if (dereference_check_less(points[2],points[lowest])) lowest = 2;
@@ -583 +583 @@
         triangle->_e2 = addEdge(triangle, triangle->_p2.get(), triangle->_p3.get());
         triangle->_e3 = addEdge(triangle, triangle->_p3.get(), triangle->_p1.get());
-        
+
         triangle->update();
 
@@ -596 +596 @@
         if (triangle->_p2.valid()) removePoint(triangle,triangle->_p2.get());
         if (triangle->_p3.valid()) removePoint(triangle,triangle->_p3.get());
-        
+
         if (triangle->_e1.valid()) removeEdge(triangle,triangle->_e1.get());
         if (triangle->_e2.valid()) removeEdge(triangle,triangle->_e2.get());
@@ -612 +612 @@
             if (triangle->_p2==pOriginal) triangle->_p2=pNew;
             if (triangle->_p3==pOriginal) triangle->_p3=pNew;
-            
+
             // fixes the edges so they point to use the new point
             triangle->_e1 = replaceEdgePoint(triangle->_e1.get(),pOriginal,pNew);
             triangle->_e2 = replaceEdgePoint(triangle->_e2.get(),pOriginal,pNew);
             triangle->_e3 = replaceEdgePoint(triangle->_e3.get(),pOriginal,pNew);
-            
+
             // remove the triangle form the original point, and possibly the point if its the last triangle to use it
             removePoint(triangle, pOriginal);
-            
+
             // add the triangle to that point
             addPoint(triangle,pNew);
         }
-        
-    }
-    
+
+    }
+
     unsigned int testTriangle(Triangle* triangle)
     {
@@ -635 +635 @@
             ++result;
         }
-        else if (triangle->_p1->_triangles.count(triangle)==0) 
+        else if (triangle->_p1->_triangles.count(triangle)==0)
         {
             OSG_NOTICE<<"testTriangle("<<triangle<<") _p1->_triangles does not contain triangle"<<std::endl;
@@ -646 +646 @@
             ++result;
         }
-        else if (triangle->_p2->_triangles.count(triangle)==0) 
+        else if (triangle->_p2->_triangles.count(triangle)==0)
         {
             OSG_NOTICE<<"testTriangle("<<triangle<<") _p2->_triangles does not contain triangle"<<std::endl;
@@ -657 +657 @@
             ++result;
         }
-        else if (triangle->_p3->_triangles.count(triangle)==0) 
+        else if (triangle->_p3->_triangles.count(triangle)==0)
         {
             OSG_NOTICE<<"testTriangle("<<triangle<<") _p3->_triangles does not contain triangle"<<std::endl;
             ++result;
         }
-        
+
         if (testEdge(triangle->_e1.get()))
         {
@@ -668 +668 @@
             OSG_NOTICE<<"testTriangle("<<triangle<<") _e1 test failed"<<std::endl;
         }
-        
+
         if (testEdge(triangle->_e2.get()))
         {
@@ -710 +710 @@
             edge->_p2 = p1;
         }
-        
+
         edge->setErrorMetric( computeErrorMetric( edge.get(), edge->_proposedPoint.get()));
-        
+
         EdgeSet::iterator itr = _edgeSet.find(edge);
         if (itr==_edgeSet.end())
@@ -724 +724 @@
             edge = *itr;
         }
-        
+
         edge->addTriangle(triangle);
-        
+
         return edge.get();
     }
@@ -755 +755 @@
             {
                 // remove the edge from the list, as its positoin in the list
-                // may need to change once its values have been ammended 
+                // may need to change once its values have been ammended
                 _edgeSet.erase(itr);
             }
-            
+
             // modify its values
             if (edge->_p1==pOriginal) edge->_p1=pNew;
@@ -785 +785 @@
             return edge;
         }
-        
+
     }
 
@@ -812 +812 @@
         osg::ref_ptr<Point> edge_p1 = edge->_p1;
         osg::ref_ptr<Point> edge_p2 = edge->_p2;
-        
+
         TriangleMap  triangleMap;
         TriangleList triangles_p1;
         TriangleList triangles_p2;
         LocalEdgeList oldEdges;
-        
-        
+
+
         if (edge_p1 != pNew)
         {
@@ -834 +834 @@
                 }
             }
-            
+
             //triangles_p1 = edge_p1->_triangles;
         }
-                
+
         if (edge_p2 != pNew)
         {
@@ -861 +861 @@
         {
             _edgeSet.erase(*oeitr);
-            
+
             const_cast<Edge*>(oeitr->get())->setErrorMetric(0.0f);
-            
+
             _edgeSet.insert(*oeitr);
         }
 
         TriangleList::iterator titr_p1, titr_p2;
-        
+
         for(titr_p1 = triangles_p1.begin();
             titr_p1 != triangles_p1.end();
@@ -884 +884 @@
 
         //OSG_NOTICE<<"  pNew="<<pNew<<"\tedge_p1"<<edge_p1.get()<<"\tedge_p2"<<edge_p2.get()<<std::endl;
-        
+
         // we copy the edge's _triangles and interate the copy of the triangle set to avoid invalidating iterators.
         TriangleSet trianglesToRemove = edge->_triangles;
@@ -897 +897 @@
         LocalEdgeList newEdges;
 
- 
+
         for(titr_p1 = triangles_p1.begin();
             titr_p1 != triangles_p1.end();
@@ -998 +998 @@
 
         typedef std::set< osg::ref_ptr<Edge> > LocalEdgeList;
-        LocalEdgeList edges2UpdateErrorMetric;        
+        LocalEdgeList edges2UpdateErrorMetric;
         TriangleSet::iterator titr;
-        
+
 
         // for each deleted triangle insert two new triangles
@@ -1024 +1024 @@
                 else if (edge->_p2 == tri->_p2.get()) edgeToReplace = 2; // edge p2, p3
             }
-            
+
             Triangle* newTri1 = 0;
             Triangle* newTri2 = 0;
@@ -1054 +1054 @@
                     break;
             }
-            
+
             if (newTri1)
             {
@@ -1068 +1068 @@
             }
         }
-        
+
         // unsigned int numTriangles2 = _triangleSet.size();
         // unsigned int numEdges2 = _edgeSet.size();
@@ -1118 +1118 @@
             }
         }
-        
+
         if (edge->_triangles.empty())
         {
@@ -1159 +1159 @@
     Point* addPoint(Triangle* triangle, Point* point)
     {
-        
+
         PointSet::iterator itr = _pointSet.find(point);
         if (itr==_pointSet.end())
@@ -1173 +1173 @@
 
         point->_triangles.insert(triangle);
-        
+
         return point;
     }
@@ -1183 +1183 @@
         {
             point->_triangles.erase(triangle);
-            
+
             if (point->_triangles.empty())
             {
@@ -1190 +1190 @@
             }
         }
-        
-    }
-    
+
+    }
+
     unsigned int testPoint(Point* point)
     {
         unsigned int numErrors = 0;
-        
+
         for(TriangleSet::iterator itr=point->_triangles.begin();
             itr!=point->_triangles.end();
@@ -1211 +1211 @@
             }
         }
-        
+
         return numErrors;
     }
-    
+
     unsigned int testAllPoints()
     {
@@ -1226 +1226 @@
         return numErrors;
     }
-    
+
 //protected:
 
@@ -1232 +1232 @@
 
     osg::Geometry*                  _geometry;
-    
+
     bool                            _computeErrorMetricUsingLength;
     EdgeSet                         _edgeSet;
@@ -1238 +1238 @@
     PointSet                        _pointSet;
     PointList                       _originalPointList;
-    
+
 };
 
@@ -1247 +1247 @@
 
     void setEdgeCollapse(EdgeCollapse* ec) { _ec = ec; }
-    
-    EdgeCollapse* _ec;    
+
+    EdgeCollapse* _ec;
 
     // for use  in the triangle functor.
@@ -1275 +1275 @@
         CopyArrayToPointsVisitor(EdgeCollapse::PointList& pointList):
             _pointList(pointList) {}
-        
+
         template<class T>
         void copy(T& array)
         {
             if (_pointList.size()!=array.size()) return;
-        
-            for(unsigned int i=0;i<_pointList.size();++i) 
-                _pointList[i]->_attributes.push_back((float)array[i]);  
-        }
-        
+
+            for(unsigned int i=0;i<_pointList.size();++i)
+                _pointList[i]->_attributes.push_back((float)array[i]);
+        }
+
         virtual void apply(osg::Array&) {}
         virtual void apply(osg::ByteArray& array) { copy(array); }
@@ -1297 +1297 @@
         {
             if (_pointList.size()!=array.size()) return;
-        
-            for(unsigned int i=0;i<_pointList.size();++i) 
+
+            for(unsigned int i=0;i<_pointList.size();++i)
             {
                 osg::Vec4ub& value = array[i];
                 EdgeCollapse::FloatList& attributes = _pointList[i]->_attributes;
-                attributes.push_back((float)value.r());  
-                attributes.push_back((float)value.g());  
-                attributes.push_back((float)value.b());  
-                attributes.push_back((float)value.a());  
+                attributes.push_back((float)value.r());
+                attributes.push_back((float)value.g());
+                attributes.push_back((float)value.b());
+                attributes.push_back((float)value.a());
             }
         }
@@ -1312 +1312 @@
         {
             if (_pointList.size()!=array.size()) return;
-        
-            for(unsigned int i=0;i<_pointList.size();++i) 
+
+            for(unsigned int i=0;i<_pointList.size();++i)
             {
                 osg::Vec2& value = array[i];
                 EdgeCollapse::FloatList& attributes = _pointList[i]->_attributes;
-                attributes.push_back(value.x());  
-                attributes.push_back(value.y());  
+                attributes.push_back(value.x());
+                attributes.push_back(value.y());
             }
         }
@@ -1325 +1325 @@
         {
             if (_pointList.size()!=array.size()) return;
-        
-            for(unsigned int i=0;i<_pointList.size();++i) 
+
+            for(unsigned int i=0;i<_pointList.size();++i)
             {
                 osg::Vec3& value = array[i];
                 EdgeCollapse::FloatList& attributes = _pointList[i]->_attributes;
-                attributes.push_back(value.x());  
-                attributes.push_back(value.y());  
-                attributes.push_back(value.z());  
-            }
-        }
-        
+                attributes.push_back(value.x());
+                attributes.push_back(value.y());
+                attributes.push_back(value.z());
+            }
+        }
+
         virtual void apply(osg::Vec4Array& array)
         {
             if (_pointList.size()!=array.size()) return;
-        
-            for(unsigned int i=0;i<_pointList.size();++i) 
+
+            for(unsigned int i=0;i<_pointList.size();++i)
             {
                 osg::Vec4& value = array[i];
                 EdgeCollapse::FloatList& attributes = _pointList[i]->_attributes;
-                attributes.push_back(value.x());  
-                attributes.push_back(value.y());  
-                attributes.push_back(value.z());  
-                attributes.push_back(value.w());  
-            }
-        }
-        
+                attributes.push_back(value.x());
+                attributes.push_back(value.y());
+                attributes.push_back(value.z());
+                attributes.push_back(value.w());
+            }
+        }
+
         EdgeCollapse::PointList& _pointList;
-        
-        
+
+
     protected:
-    
+
         CopyArrayToPointsVisitor& operator = (const CopyArrayToPointsVisitor&) { return *this; }
 };
@@ -1364 +1364 @@
         CopyVertexArrayToPointsVisitor(EdgeCollapse::PointList& pointList):
             _pointList(pointList) {}
-        
+
         virtual void apply(osg::Vec2Array& array)
         {
             if (_pointList.size()!=array.size()) return;
-        
-            for(unsigned int i=0;i<_pointList.size();++i) 
+
+            for(unsigned int i=0;i<_pointList.size();++i)
             {
                 _pointList[i] = new EdgeCollapse::Point;
                 _pointList[i]->_index = i;
-                
+
                 osg::Vec2& value = array[i];
                 osg::Vec3& vertex = _pointList[i]->_vertex;
-                vertex.set(value.x(),value.y(),0.0f);  
+                vertex.set(value.x(),value.y(),0.0f);
             }
         }
@@ -1383 +1383 @@
         {
             if (_pointList.size()!=array.size()) return;
-        
-            for(unsigned int i=0;i<_pointList.size();++i) 
+
+            for(unsigned int i=0;i<_pointList.size();++i)
             {
                 _pointList[i] = new EdgeCollapse::Point;
                 _pointList[i]->_index = i;
-                
+
                 _pointList[i]->_vertex = array[i];
             }
         }
-        
+
         virtual void apply(osg::Vec4Array& array)
         {
             if (_pointList.size()!=array.size()) return;
-        
-            for(unsigned int i=0;i<_pointList.size();++i) 
+
+            for(unsigned int i=0;i<_pointList.size();++i)
             {
                 _pointList[i] = new EdgeCollapse::Point;
                 _pointList[i]->_index = i;
-                
+
                 osg::Vec4& value = array[i];
                 osg::Vec3& vertex = _pointList[i]->_vertex;
-                vertex.set(value.x()/value.w(),value.y()/value.w(),value.z()/value.w());  
-            }
-        }
-        
+                vertex.set(value.x()/value.w(),value.y()/value.w(),value.z()/value.w());
+            }
+        }
+
         EdgeCollapse::PointList& _pointList;
 
     protected:
-    
+
         CopyVertexArrayToPointsVisitor& operator = (const CopyVertexArrayToPointsVisitor&) { return *this; }
 
@@ -1419 +1419 @@
 {
     _geometry = geometry;
-    
+
     // check to see if vertex attributes indices exists, if so expand them to remove them
     if (_geometry->suitableForOptimization())
@@ -1427 +1427 @@
         _geometry->copyToAndOptimize(*_geometry);
     }
-    
+
     // check to see if vertex attributes indices exists, if so expand them to remove them
     if (_geometry->containsSharedArrays())
@@ -1437 +1437 @@
 
     unsigned int numVertices = geometry->getVertexArray()->getNumElements();
-        
+
     _originalPointList.resize(numVertices);
-    
+
     // copy vertices across to local point list
     CopyVertexArrayToPointsVisitor copyVertexArrayToPoints(_originalPointList);
     _geometry->getVertexArray()->accept(copyVertexArrayToPoints);
-    
+
     // copy other per vertex attributes across to local point list.
     CopyArrayToPointsVisitor        copyArrayToPoints(_originalPointList);
@@ -1455 +1455 @@
     if (_geometry->getNormalArray() && _geometry->getNormalBinding()==osg::Geometry::BIND_PER_VERTEX)
         geometry->getNormalArray()->accept(copyArrayToPoints);
-        
+
     if (_geometry->getColorArray() && _geometry->getColorBinding()==osg::Geometry::BIND_PER_VERTEX)
         geometry->getColorArray()->accept(copyArrayToPoints);
-        
+
     if (_geometry->getSecondaryColorArray() && _geometry->getSecondaryColorBinding()==osg::Geometry::BIND_PER_VERTEX)
         geometry->getSecondaryColorArray()->accept(copyArrayToPoints);
@@ -1482 +1482 @@
     CollectTriangleIndexFunctor collectTriangles;
     collectTriangles.setEdgeCollapse(this);
-    
+
     _geometry->accept(collectTriangles);
-    
+
 }
- 
+
 
 
@@ -1501 +1501 @@
         {
             array.resize(_pointList.size());
-        
-            for(unsigned int i=0;i<_pointList.size();++i) 
-            {
-                if (_index<_pointList[i]->_attributes.size()) 
+
+            for(unsigned int i=0;i<_pointList.size();++i)
+            {
+                if (_index<_pointList[i]->_attributes.size())
                 {
                     float val = (_pointList[i]->_attributes[_index]);
@@ -1510 +1510 @@
                 }
             }
-                
+
             ++_index;
         }
-        
+
         // use local typedefs if usinged char,short and int to get round gcc 3.3.1 problem with defining unsigned short()
         typedef unsigned char dummy_uchar;
         typedef unsigned short dummy_ushort;
         typedef unsigned int dummy_uint;
-        
+
         virtual void apply(osg::Array&) {}
         virtual void apply(osg::ByteArray& array) { copy(array, char());}
@@ -1531 +1531 @@
         {
             array.resize(_pointList.size());
-        
-            for(unsigned int i=0;i<_pointList.size();++i) 
+
+            for(unsigned int i=0;i<_pointList.size();++i)
             {
                 EdgeCollapse::FloatList& attributes = _pointList[i]->_attributes;
@@ -1546 +1546 @@
         {
             array.resize(_pointList.size());
-        
-            for(unsigned int i=0;i<_pointList.size();++i) 
+
+            for(unsigned int i=0;i<_pointList.size();++i)
             {
                 EdgeCollapse::FloatList& attributes = _pointList[i]->_attributes;
@@ -1558 +1558 @@
         {
             array.resize(_pointList.size());
-        
-            for(unsigned int i=0;i<_pointList.size();++i) 
+
+            for(unsigned int i=0;i<_pointList.size();++i)
             {
                 EdgeCollapse::FloatList& attributes = _pointList[i]->_attributes;
@@ -1566 +1566 @@
             _index += 3;
         }
-        
+
         virtual void apply(osg::Vec4Array& array)
         {
             array.resize(_pointList.size());
-        
-            for(unsigned int i=0;i<_pointList.size();++i) 
+
+            for(unsigned int i=0;i<_pointList.size();++i)
             {
                 EdgeCollapse::FloatList& attributes = _pointList[i]->_attributes;
@@ -1578 +1578 @@
             _index += 4;
         }
-        
+
         EdgeCollapse::PointList& _pointList;
         unsigned int _index;
-        
+
     protected:
-    
+
         CopyPointsToArrayVisitor& operator = (CopyPointsToArrayVisitor&) { return *this; }
 };
@@ -1591 +1591 @@
     public:
         NormalizeArrayVisitor() {}
-        
+
         template<typename Itr>
         void normalize(Itr begin, Itr end)
@@ -1602 +1602 @@
             }
         }
-        
+
         virtual void apply(osg::Vec2Array& array) { normalize(array.begin(),array.end()); }
         virtual void apply(osg::Vec3Array& array) { normalize(array.begin(),array.end()); }
         virtual void apply(osg::Vec4Array& array) { normalize(array.begin(),array.end()); }
-        
+
 };
 
@@ -1614 +1614 @@
         CopyPointsToVertexArrayVisitor(EdgeCollapse::PointList& pointList):
             _pointList(pointList) {}
-        
+
         virtual void apply(osg::Vec2Array& array)
         {
             array.resize(_pointList.size());
-            
-            for(unsigned int i=0;i<_pointList.size();++i) 
+
+            for(unsigned int i=0;i<_pointList.size();++i)
             {
                 _pointList[i]->_index = i;
@@ -1630 +1630 @@
         {
             array.resize(_pointList.size());
-        
-            for(unsigned int i=0;i<_pointList.size();++i) 
+
+            for(unsigned int i=0;i<_pointList.size();++i)
             {
                 _pointList[i]->_index = i;
@@ -1637 +1637 @@
             }
         }
-        
+
         virtual void apply(osg::Vec4Array& array)
         {
             array.resize(_pointList.size());
-        
-            for(unsigned int i=0;i<_pointList.size();++i) 
+
+            for(unsigned int i=0;i<_pointList.size();++i)
             {
                 _pointList[i]->_index = i;
@@ -1649 +1649 @@
             }
         }
-        
+
         EdgeCollapse::PointList& _pointList;
-        
+
     protected:
-    
+
         CopyPointsToVertexArrayVisitor& operator = (const CopyPointsToVertexArrayVisitor&) { return *this; }
 };
@@ -1668 +1668 @@
     CopyPointsToVertexArrayVisitor copyVertexArrayToPoints(_originalPointList);
     _geometry->getVertexArray()->accept(copyVertexArrayToPoints);
-    
+
     // copy other per vertex attributes across to local point list.
     CopyPointsToArrayVisitor  copyArrayToPoints(_originalPointList);
@@ -1686 +1686 @@
         _geometry->getNormalArray()->accept(nav);
     }
-        
+
     if (_geometry->getColorArray() && _geometry->getColorBinding()==osg::Geometry::BIND_PER_VERTEX)
         _geometry->getColorArray()->accept(copyArrayToPoints);
-        
+
     if (_geometry->getSecondaryColorArray() && _geometry->getSecondaryColorBinding()==osg::Geometry::BIND_PER_VERTEX)
         _geometry->getSecondaryColorArray()->accept(copyArrayToPoints);
@@ -1722 +1722 @@
         (*primitives)[pos++] = triangle->_p3->_index;
     }
-    
+
     _geometry->getPrimitiveSetList().clear();
     _geometry->addPrimitiveSet(primitives);
@@ -1736 +1736 @@
             _triStrip(true),
             _smoothing(true)
-            
+
 {
 }
@@ -1759 +1759 @@
 
     unsigned int numOriginalPrimitives = ec._triangleSet.size();
-    
+
     if (getSampleRatio()<1.0)
     {
         while (!ec._edgeSet.empty() &&
-               continueSimplification((*ec._edgeSet.begin())->getErrorMetric() , numOriginalPrimitives, ec._triangleSet.size()) && 
+               continueSimplification((*ec._edgeSet.begin())->getErrorMetric() , numOriginalPrimitives, ec._triangleSet.size()) &&
                ec.collapseMinimumErrorEdge())
         {
@@ -1776 +1776 @@
         // up sampling...
         while (!ec._edgeSet.empty() &&
-               continueSimplification((*ec._edgeSet.rbegin())->getErrorMetric() , numOriginalPrimitives, ec._triangleSet.size()) && 
+               continueSimplification((*ec._edgeSet.rbegin())->getErrorMetric() , numOriginalPrimitives, ec._triangleSet.size()) &&
 //               ec._triangleSet.size() < targetNumTriangles  &&
                ec.divideLongestEdge())
@@ -1799 +1799 @@
         OSG_INFO<<           "        continueSimplification(,,)  = "<<continueSimplification((*ec._edgeSet.begin())->getErrorMetric() , numOriginalPrimitives, ec._triangleSet.size())<<std::endl;
     }
-    
+
     ec.copyBackToGeometry();
 
@@ -1806 +1806 @@
         osgUtil::SmoothingVisitor::smooth(geometry);
     }
-    
+
     if (_triStrip)
     {