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

Ran script to remove trailing spaces and tabs

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/include/osg/VertexProgram

    r11808 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*/ 
     
    151151        } 
    152152 
    153          
     153 
    154154        /** Set the vertex program using a C style string. */ 
    155         inline void setVertexProgram( const char* program )  
    156         {  
    157             _vertexProgram = program;  
     155        inline void setVertexProgram( const char* program ) 
     156        { 
     157            _vertexProgram = program; 
    158158            dirtyVertexProgramObject(); 
    159159        } 
     
    204204 
    205205        /** Force a recompile on next apply() of associated OpenGL vertex program objects. */ 
    206         void dirtyVertexProgramObject();         
     206        void dirtyVertexProgramObject(); 
    207207 
    208208        /** Use deleteVertexProgramObject instead of glDeletePrograms to allow 
     
    239239 
    240240        /** Extensions class which encapsulates the querying of extensions and 
    241           * associated function pointers, and provide convenience wrappers to  
     241          * associated function pointers, and provide convenience wrappers to 
    242242          * check for the extensions or use the associated functions. 
    243243        */ 
     
    248248 
    249249                Extensions(const Extensions& rhs); 
    250                  
     250 
    251251                void lowestCommonDenominator(const Extensions& rhs); 
    252                  
     252 
    253253                void setupGLExtensions(unsigned int contextID); 
    254254 
     
    259259                void glGenPrograms(GLsizei n, GLuint *programs) const; 
    260260                void glDeletePrograms(GLsizei n, GLuint *programs) const; 
    261                 void glProgramString(GLenum target, GLenum format, GLsizei len, const void *string) const;  
     261                void glProgramString(GLenum target, GLenum format, GLsizei len, const void *string) const; 
    262262                void glProgramLocalParameter4fv(GLenum target, GLuint index, const GLfloat *params) const; 
    263263 
     
    265265 
    266266                ~Extensions() {} 
    267                  
     267 
    268268                bool _isVertexProgramSupported; 
    269                  
     269 
    270270                typedef void (GL_APIENTRY * BindProgramProc) (GLenum target, GLuint id); 
    271271                typedef void (GL_APIENTRY * GenProgramsProc) (GLsizei n, GLuint *programs); 
    272272                typedef void (GL_APIENTRY * DeleteProgramsProc) (GLsizei n, GLuint *programs); 
    273                 typedef void (GL_APIENTRY * ProgramStringProc) (GLenum target, GLenum format, GLsizei len, const void *string);  
     273                typedef void (GL_APIENTRY * ProgramStringProc) (GLenum target, GLenum format, GLsizei len, const void *string); 
    274274                typedef void (GL_APIENTRY * ProgramLocalParameter4fvProc) (GLenum target, GLuint index, const GLfloat *params); 
    275275 
     
    279279                ProgramStringProc _glProgramString; 
    280280                ProgramLocalParameter4fvProc _glProgramLocalParameter4fv; 
    281   
     281 
    282282        }; 
    283          
     283 
    284284        /** Function to call to get the extension of a specified context. 
    285285          * If the Extension object for that context has not yet been created