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

    r11942 r13041  
    1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield  
     1/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
    22 * Copyright (C) 2003-2005 3Dlabs Inc. Ltd. 
    33 * Copyright (C) 2004-2005 Nathan Cournia 
     
    55 * Copyright (C) 2010 VIRES Simulationstechnologie GmbH 
    66 * 
    7  * This application is open source and may be redistributed and/or modified    
     7 * This application is open source and may be redistributed and/or modified 
    88 * freely and without restriction, both in commercial and non commercial 
    99 * applications, as long as this copyright notice is maintained. 
    10  *  
     10 * 
    1111 * This application is distributed in the hope that it will be useful, 
    1212 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
     
    3434class Program; 
    3535 
    36 /** Simple class for wrapping up the data used in OpenGL ES 2's glShaderBinary calls.   
     36/** Simple class for wrapping up the data used in OpenGL ES 2's glShaderBinary calls. 
    3737  * ShaderBinary is set up with the binary data then assigned to one or more osg::Shader. */ 
    3838class OSG_EXPORT ShaderBinary : public osg::Object 
     
    115115        /** Get the Shader type as a descriptive string. */ 
    116116        const char* getTypename() const; 
    117          
     117 
    118118 
    119119        /** Set file name for the shader source code. */ 
     
    132132 
    133133        /** Set the Shader using a ShaderBinary. */ 
    134         void setShaderBinary(ShaderBinary* shaderBinary) { _shaderBinary = shaderBinary; }  
    135          
     134        void setShaderBinary(ShaderBinary* shaderBinary) { _shaderBinary = shaderBinary; } 
     135 
    136136        /** Get the Shader's ShaderBinary, return NULL if none is assigned. */ 
    137         ShaderBinary* getShaderBinary() { return _shaderBinary.get(); }  
     137        ShaderBinary* getShaderBinary() { return _shaderBinary.get(); } 
    138138 
    139139        /** Get the const Shader's ShaderBinary, return NULL if none is assigned. */ 
    140         const ShaderBinary* getShaderBinary() const { return _shaderBinary.get(); }  
     140        const ShaderBinary* getShaderBinary() const { return _shaderBinary.get(); } 
    141141 
    142142 
     
    178178        /** Mark our PCSs as needing recompilation. 
    179179          * Also mark Programs that depend on us as needing relink */ 
    180         void dirtyShader();         
     180        void dirtyShader(); 
    181181 
    182182        /** If needed, compile the PCS's glShader */ 
     
    268268 
    269269        CodeInjectionMap                _codeInjectionMap; 
    270          
     270 
    271271        /** osg::Programs that this osg::Shader is attached to */ 
    272272        typedef std::set< osg::Program* > ProgramSet;