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/FragmentProgram

    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 fragment program using a C style string.*/ 
    155         inline void setFragmentProgram( const char* program )  
    156         {  
    157             _fragmentProgram = program;  
     155        inline void setFragmentProgram( const char* program ) 
     156        { 
     157            _fragmentProgram = program; 
    158158            dirtyFragmentProgramObject(); 
    159159        } 
    160      
     160 
    161161        /** Set the fragment program using C++ style string.*/ 
    162162        inline void setFragmentProgram( const std::string& program ) 
     
    205205 
    206206        /** Force a recompile on next apply() of associated OpenGL vertex program objects.*/ 
    207         void dirtyFragmentProgramObject();         
     207        void dirtyFragmentProgramObject(); 
    208208 
    209209        /** use deleteFragmentProgramObject instead of glDeletePrograms to allow 
     
    236236 
    237237        /** Extensions class which encapsulates the querying of extensions and 
    238           * associated function pointers, and provide convenience wrappers to  
    239           * check for the extensions or use the associated functions.*/         
     238          * associated function pointers, and provide convenience wrappers to 
     239          * check for the extensions or use the associated functions.*/ 
    240240        class OSG_EXPORT Extensions : public osg::Referenced 
    241241        { 
     
    244244 
    245245                Extensions(const Extensions& rhs); 
    246                  
     246 
    247247                void lowestCommonDenominator(const Extensions& rhs); 
    248                  
     248 
    249249                void setupGLExtensions(unsigned int contextID); 
    250250 
     
    255255                void glGenPrograms(GLsizei n, GLuint *programs) const; 
    256256                void glDeletePrograms(GLsizei n, GLuint *programs) const; 
    257                 void glProgramString(GLenum target, GLenum format, GLsizei len, const void *string) const;  
     257                void glProgramString(GLenum target, GLenum format, GLsizei len, const void *string) const; 
    258258                void glProgramLocalParameter4fv(GLenum target, GLuint index, const GLfloat *params) const; 
    259259 
     
    261261 
    262262                ~Extensions() {} 
    263                  
     263 
    264264                bool _isFragmentProgramSupported; 
    265                  
     265 
    266266                typedef void (GL_APIENTRY * BindProgramProc) (GLenum target, GLuint id); 
    267267                typedef void (GL_APIENTRY * GenProgramsProc) (GLsizei n, GLuint *programs); 
    268268                typedef void (GL_APIENTRY * DeleteProgramsProc) (GLsizei n, GLuint *programs); 
    269                 typedef void (GL_APIENTRY * ProgramStringProc) (GLenum target, GLenum format, GLsizei len, const void *string);  
     269                typedef void (GL_APIENTRY * ProgramStringProc) (GLenum target, GLenum format, GLsizei len, const void *string); 
    270270                typedef void (GL_APIENTRY * ProgramLocalParameter4fvProc) (GLenum target, GLuint index, const GLfloat *params); 
    271271 
     
    276276                ProgramLocalParameter4fvProc _glProgramLocalParameter4fv; 
    277277         }; 
    278          
     278 
    279279        /** Function to call to get the extension of a specified context. 
    280           * If the Extension object for that context has not yet been created and the  
     280          * If the Extension object for that context has not yet been created and the 
    281281          * 'createIfNotInitalized' flag has been set to false then returns NULL. 
    282           * If 'createIfNotInitalized' is true then the Extensions object is  
     282          * If 'createIfNotInitalized' is true then the Extensions object is 
    283283          * automatically created.  However, in this case the extension object will 
    284284          * only be created with the graphics context associated with ContextID..*/