Changeset 13041 for OpenSceneGraph/trunk/include/osgUtil/Tessellator

Timestamp:

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

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/include/osgUtil/Tessellator (modified) (15 diffs)

OpenSceneGraph/trunk/include/osgUtil/Tessellator

@@ -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.
 */
@@ -37 +37 @@
 {
     public:
-   
+
         Tessellator();
         ~Tessellator();
@@ -72 +72 @@
         /** Change the contours lists of the geometry into tessellated primitives (the
           * list of primitives in the original geometry is stored in the Tessellator for
-          * possible re-use. 
+          * possible re-use.
           * The name remains retessellatePolygons although it now handles trifans, strips, quads etc.
           * as well as Polygons so as to not break old codes relying on this function name. */
@@ -80 +80 @@
          *  tessellate the contours; see gluTessNormal in red book or man pages.
          *  GWM July 2005. Can improve teselation
-         *  "For example, if you know that all polygons lie in the x-y plane, 
+         *  "For example, if you know that all polygons lie in the x-y plane,
          *   call gluTessNormal(tess, 0.0, 0.0, 1.0) before rendering any polygons."
          */
@@ -90 +90 @@
         {
             Prim(GLenum mode):_mode(mode) {}
-        
+
             typedef std::vector<osg::Vec3*> VecList;
 
@@ -96 +96 @@
             VecList _vertices;
         };
-        
+
         virtual void beginTessellation();
-        
+
         void beginContour();
 
@@ -113 +113 @@
 
         typedef std::vector< osg::ref_ptr<Prim> > PrimList;
-        
-        PrimList& getPrimList() { return _primList; }        
-        
+
+        PrimList& getPrimList() { return _primList; }
+
         void reset();
-        
+
     protected:
 
@@ -126 +126 @@
 
         void collectTessellation(osg::Geometry &cxgeom, unsigned int originalIndex);
-        
+
         typedef std::map<osg::Vec3*,unsigned int> VertexPtrToIndexMap;
         void addContour(GLenum  mode, unsigned int first, unsigned int last, osg::Vec3Array* vertices);
@@ -138 +138 @@
         void error(GLenum errorCode);
 
-    
+
         static void CALLBACK beginCallback(GLenum which, void* userData);
         static void CALLBACK vertexCallback(GLvoid *data, void* userData);
@@ -146 +146 @@
         static void CALLBACK endCallback(void* userData);
         static void CALLBACK errorCallback(GLenum errorCode, void* userData);
-        
-        
+
+
         struct Vec3d
         {
@@ -156 +156 @@
         struct NewVertex
         {
-        
+
             NewVertex():
                 _vpos(0),
@@ -167 +167 @@
                 _f4(0),
                 _v4(0) {}
-            
+
             NewVertex(const NewVertex& nv):
                 _vpos(nv._vpos),
@@ -195 +195 @@
 
             osg::Vec3  *_vpos; // added gwm Jan 2004 the vertex coords s.t. NewVertex can be used in a std::vector
-        
+
             float       _f1;
             osg::Vec3*  _v1;
@@ -207 +207 @@
             float       _f4;
             osg::Vec3*  _v4;
-            
-        };
-        
+
+        };
+
         //change NewVertexList from std::map<osg::Vec3*,NewVertex> NewVertexList;
-        // because this has undefined order of insertion for new vertices. 
+        // because this has undefined order of insertion for new vertices.
         // which occasionally corrupted the texture mapping.
         typedef std::vector<NewVertex> NewVertexList;
@@ -224 +224 @@
 
         /** winding rule, which parts will become solid */
-        WindingType _wtype; 
+        WindingType _wtype;
 
         /** tessellation rule, which parts will become solid */