Changeset 13041 for OpenSceneGraph/trunk/src/osgUtil/Tessellator.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/Tessellator.cpp (modified) (28 diffs)

OpenSceneGraph/trunk/src/osgUtil/Tessellator.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.
 */
@@ -25 +25 @@
     _wtype(TESS_WINDING_ODD),
     _ttype(TESS_TYPE_POLYGONS),
-    _boundaryOnly(false), _numberVerts(0) 
+    _boundaryOnly(false), _numberVerts(0)
 {
     _tobj = gluNewTess();
@@ -57 +57 @@
         gluTessProperty(_tobj, GLU_TESS_WINDING_RULE, _wtype);
         gluTessProperty(_tobj, GLU_TESS_BOUNDARY_ONLY, _boundaryOnly);
-        
+
         if (tessNormal.length()>0.0) gluTessNormal(_tobj, tessNormal.x(), tessNormal.y(), tessNormal.z());
 
         gluTessBeginPolygon(_tobj,this);
     }
-}    
-    
+}
+
 void Tessellator::beginContour()
 {
@@ -71 +71 @@
     }
 }
-      
+
 void Tessellator::addVertex(osg::Vec3* vertex)
 {
@@ -105 +105 @@
     {
         gluTessEndPolygon(_tobj);
-        
+
         if (_errorCode!=0)
         {
@@ -120 +120 @@
         delete (*i);
     }
-    
+
     // We need to also free the vertex list as well otherwise we are leaking...
     for (NewVertexList::iterator j = _newVertexList.begin(); j != _newVertexList.end(); ++j)
@@ -139 +139 @@
 {
     public:
-    
+
         float _f1,_f2,_f3,_f4;
         unsigned int _i1,_i2,_i3,_i4;
@@ -158 +158 @@
             if (_f3) val += static_cast<TYPE>(array[_i3] * _f3);
             if (_f4) val += static_cast<TYPE>(array[_i4] * _f4);
-            
+
             array.push_back(val);
         }
@@ -180 +180 @@
     // turn the contour list into primitives, a little like Tessellator does but more generally
     osg::Vec3Array* vertices = dynamic_cast<osg::Vec3Array*>(geom.getVertexArray());
-    
+
     if (!vertices || vertices->empty() || geom.getPrimitiveSetList().empty()) return;
 
@@ -190 +190 @@
         geom.getSecondaryColorIndices() ||
         geom.getFogCoordIndices()) return;
-        
+
     // not even text coord indices don't handle geometry which use indices...
     for(unsigned int unit=0;unit<geom.getNumTexCoordArrays();++unit)
@@ -241 +241 @@
                 {
                     osg::DrawArrayLengths* drawArrayLengths = static_cast<osg::DrawArrayLengths*>(primitive.get());
-                    unsigned int first = drawArrayLengths->getFirst(); 
+                    unsigned int first = drawArrayLengths->getFirst();
                     for(osg::DrawArrayLengths::iterator itr=drawArrayLengths->begin();
                         itr!=drawArrayLengths->end();
@@ -291 +291 @@
     if (_ttype==TESS_TYPE_GEOMETRY) {
         endTessellation();
-    
-        collectTessellation(geom, 0);    
+
+        collectTessellation(geom, 0);
     }
 }
@@ -372 +372 @@
     if (primitive->getMode()==osg::PrimitiveSet::TRIANGLES) nperprim=3;
     unsigned int idx=0;
-    
+
     switch(primitive->getType())
     {
@@ -378 +378 @@
         {
             osg::DrawArrays* drawArray = static_cast<osg::DrawArrays*>(primitive);
-            unsigned int first = drawArray->getFirst(); 
+            unsigned int first = drawArray->getFirst();
             unsigned int last = first+drawArray->getCount();
             addContour(primitive->getMode(),first,last,vertices);
@@ -438 +438 @@
         break;
     }
-    
+
 }
 
@@ -445 +445 @@
     if (!_newVertexList.empty())
     {
-        
+
         osg::Vec3Array* vertices = dynamic_cast<osg::Vec3Array*>(geom.getVertexArray());
         osg::Vec3Array* normals = NULL;
@@ -452 +452 @@
             normals = dynamic_cast<osg::Vec3Array*>(geom.getNormalArray());
         }
-        
+
         typedef std::vector<osg::Array*> ArrayList;
         ArrayList arrays;
-        
+
         if (geom.getColorBinding()==osg::Geometry::BIND_PER_VERTEX)
         {
             arrays.push_back(geom.getColorArray());
         }
-        
+
         if (geom.getSecondaryColorBinding()==osg::Geometry::BIND_PER_VERTEX)
         {
             arrays.push_back(geom.getSecondaryColorArray());
         }
-        
+
         if (geom.getFogCoordBinding()==osg::Geometry::BIND_PER_VERTEX)
         {
             arrays.push_back(geom.getFogCoordArray());
         }
-        
+
         osg::Geometry::ArrayDataList& tcal = geom.getTexCoordArrayList();
         for(osg::Geometry::ArrayDataList::iterator tcalItr=tcal.begin();
@@ -476 +476 @@
             ++tcalItr)
         {
-            if (tcalItr->array.valid()) 
+            if (tcalItr->array.valid())
             {
                 arrays.push_back(tcalItr->array.get());
             }
         }
-        
+
         // now add any new vertices that are required.
         for(NewVertexList::iterator itr=_newVertexList.begin();
@@ -489 +489 @@
             NewVertex& newVertex = (*itr);
             osg::Vec3* vertex = newVertex._vpos;
-            
+
             // assign vertex.
             vertexPtrToIndexMap[vertex]=vertices->size();
             vertices->push_back(*vertex);
-            
+
             // assign normals
             if (normals)
@@ -505 +505 @@
                 normals->push_back(norm);
             }
-            
+
             if (!arrays.empty())
             {
@@ -512 +512 @@
                     newVertex._f3,vertexPtrToIndexMap[newVertex._v3],
                     newVertex._f4,vertexPtrToIndexMap[newVertex._v4]);
-                
+
                 // assign the rest of the attributes.
                 for(ArrayList::iterator aItr=arrays.begin();
@@ -522 +522 @@
             }
         }
-        
-    }
-    
+
+    }
+
 }
 
@@ -615 +615 @@
                                         }
             break;
-        default: // should also handle:ArrayType' ByteArrayType' ShortArrayType' IntArrayType' 
-        // `UShortArrayType'  `UIntArrayType'  `Vec4ubArrayType'  `FloatArrayType' 
+        default: // should also handle:ArrayType' ByteArrayType' ShortArrayType' IntArrayType'
+        // `UShortArrayType'  `UIntArrayType'  `Vec4ubArrayType'  `FloatArrayType'
             break;
         }
@@ -626 +626 @@
     osg::Vec3Array* vertices = dynamic_cast<osg::Vec3Array*>(geom.getVertexArray());
     VertexPtrToIndexMap vertexPtrToIndexMap;
-    
+
     // populate the VertexPtrToIndexMap.
     for(unsigned int vi=0;vi<vertices->size();++vi)
@@ -632 +632 @@
         vertexPtrToIndexMap[&((*vertices)[vi])] = vi;
     }
-    
+
     handleNewVertices(geom, vertexPtrToIndexMap);
-    
+
     // we don't properly handle per primitive and per primitive_set bindings yet
     // will need to address this soon. Robert Oct 2002.
@@ -662 +662 @@
                   break;
               }
-              
-        }
-        // GWM Dec 2003 - these holders need to go outside the loop to 
+
+        }
+        // GWM Dec 2003 - these holders need to go outside the loop to
         // retain the flat shaded colour &/or normal for each tessellated polygon
         osg::Vec3 norm(0.0f,0.0f,0.0f);
@@ -720 +720 @@
               }
 
-              if (primItr==_primList.begin()) 
+              if (primItr==_primList.begin())
               {   // first primitive so collect primitive normal & colour.
                   if (normals) {
@@ -779 +779 @@
                       }
                   }
-                  //        OSG_WARN<<"Add: "<< iprim << std::endl; 
+                  //        OSG_WARN<<"Add: "<< iprim << std::endl;
               }
               iprim++; // GWM Sep 2002 count which normal we should use