Show
Ignore:
Timestamp:
03/21/12 18:36:20 (2 years ago)
Author:
robert
Message:

Ran script to remove trailing spaces and tabs

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/include/osgUtil/Tessellator

    r12978 r13041  
    1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield  
     1/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
    22 * 
    3  * This library is open source and may be redistributed and/or modified under   
    4  * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or  
     3 * This library is open source and may be redistributed and/or modified under 
     4 * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
    55 * (at your option) any later version.  The full license is in LICENSE file 
    66 * included with this distribution, and on the openscenegraph.org website. 
    7  *  
     7 * 
    88 * This library is distributed in the hope that it will be useful, 
    99 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
    10  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  
     10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    1111 * OpenSceneGraph Public License for more details. 
    1212*/ 
     
    3737{ 
    3838    public: 
    39     
     39 
    4040        Tessellator(); 
    4141        ~Tessellator(); 
     
    7272        /** Change the contours lists of the geometry into tessellated primitives (the 
    7373          * list of primitives in the original geometry is stored in the Tessellator for 
    74           * possible re-use.  
     74          * possible re-use. 
    7575          * The name remains retessellatePolygons although it now handles trifans, strips, quads etc. 
    7676          * as well as Polygons so as to not break old codes relying on this function name. */ 
     
    8080         *  tessellate the contours; see gluTessNormal in red book or man pages. 
    8181         *  GWM July 2005. Can improve teselation 
    82          *  "For example, if you know that all polygons lie in the x-y plane,  
     82         *  "For example, if you know that all polygons lie in the x-y plane, 
    8383         *   call gluTessNormal(tess, 0.0, 0.0, 1.0) before rendering any polygons." 
    8484         */ 
     
    9090        { 
    9191            Prim(GLenum mode):_mode(mode) {} 
    92          
     92 
    9393            typedef std::vector<osg::Vec3*> VecList; 
    9494 
     
    9696            VecList _vertices; 
    9797        }; 
    98          
     98 
    9999        virtual void beginTessellation(); 
    100          
     100 
    101101        void beginContour(); 
    102102 
     
    113113 
    114114        typedef std::vector< osg::ref_ptr<Prim> > PrimList; 
    115          
    116         PrimList& getPrimList() { return _primList; }         
    117          
     115 
     116        PrimList& getPrimList() { return _primList; } 
     117 
    118118        void reset(); 
    119          
     119 
    120120    protected: 
    121121 
     
    126126 
    127127        void collectTessellation(osg::Geometry &cxgeom, unsigned int originalIndex); 
    128          
     128 
    129129        typedef std::map<osg::Vec3*,unsigned int> VertexPtrToIndexMap; 
    130130        void addContour(GLenum  mode, unsigned int first, unsigned int last, osg::Vec3Array* vertices); 
     
    138138        void error(GLenum errorCode); 
    139139 
    140      
     140 
    141141        static void CALLBACK beginCallback(GLenum which, void* userData); 
    142142        static void CALLBACK vertexCallback(GLvoid *data, void* userData); 
     
    146146        static void CALLBACK endCallback(void* userData); 
    147147        static void CALLBACK errorCallback(GLenum errorCode, void* userData); 
    148          
    149          
     148 
     149 
    150150        struct Vec3d 
    151151        { 
     
    156156        struct NewVertex 
    157157        { 
    158          
     158 
    159159            NewVertex(): 
    160160                _vpos(0), 
     
    167167                _f4(0), 
    168168                _v4(0) {} 
    169              
     169 
    170170            NewVertex(const NewVertex& nv): 
    171171                _vpos(nv._vpos), 
     
    195195 
    196196            osg::Vec3  *_vpos; // added gwm Jan 2004 the vertex coords s.t. NewVertex can be used in a std::vector 
    197          
     197 
    198198            float       _f1; 
    199199            osg::Vec3*  _v1; 
     
    207207            float       _f4; 
    208208            osg::Vec3*  _v4; 
    209              
    210         }; 
    211          
     209 
     210        }; 
     211 
    212212        //change NewVertexList from std::map<osg::Vec3*,NewVertex> NewVertexList; 
    213         // because this has undefined order of insertion for new vertices.  
     213        // because this has undefined order of insertion for new vertices. 
    214214        // which occasionally corrupted the texture mapping. 
    215215        typedef std::vector<NewVertex> NewVertexList; 
     
    224224 
    225225        /** winding rule, which parts will become solid */ 
    226         WindingType _wtype;  
     226        WindingType _wtype; 
    227227 
    228228        /** tessellation rule, which parts will become solid */