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

    r10691 r13041  
    1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 Robert Osfield  
     1/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2004 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*/ 
     
    3434 
    3535        Material(); 
    36          
     36 
    3737        /** Copy constructor using CopyOp to manage deep vs shallow copy. */ 
    3838        Material(const Material& mat,const CopyOp& copyop=CopyOp::SHALLOW_COPY): 
     
    5656 
    5757        META_StateAttribute(osg, Material, MATERIAL); 
    58          
     58 
    5959        /** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */ 
    6060        virtual int compare(const StateAttribute& sa) const 
     
    109109            EMISSION = GL_EMISSION, 
    110110            AMBIENT_AND_DIFFUSE = GL_AMBIENT_AND_DIFFUSE, 
    111             OFF             
     111            OFF 
    112112        }; 
    113113 
     
    123123        inline bool getDiffuseFrontAndBack() const { return _diffuseFrontAndBack; } 
    124124 
    125         /** Set specular value of specified face(s) of the material,  
     125        /** Set specular value of specified face(s) of the material, 
    126126          * valid specular[0..3] range is 0.0 to 1.0. 
    127127        */ 
    128128        void setSpecular( Face face, const Vec4& specular ); 
    129          
     129 
    130130        /** Get the specular value for specified face. */ 
    131131        const Vec4& getSpecular(Face face) const; 
    132          
     132 
    133133        /** Return whether specular values are equal for front and back faces 
    134134          * or not. 
     
    136136        inline bool getSpecularFrontAndBack() const { return _specularFrontAndBack; } 
    137137 
    138         /** Set emission value of specified face(s) of the material,  
     138        /** Set emission value of specified face(s) of the material, 
    139139          * valid emission[0..3] range is 0.0 to 1.0. 
    140140        */ 
    141141        void setEmission( Face face, const Vec4& emission ); 
    142          
     142 
    143143        /** Get the emission value for specified face. */ 
    144144        const Vec4& getEmission(Face face) const; 
    145          
     145 
    146146        /** Return whether emission values are equal for front and back faces 
    147147          * or not. 
     
    153153        */ 
    154154        void setShininess(Face face, float shininess ); 
    155          
     155 
    156156        /** Get the shininess value for specified face. */ 
    157157        float getShininess(Face face) const; 
    158          
     158 
    159159        /** Return whether shininess values are equal for front and back faces 
    160160          * or not. 
    161161        */ 
    162162        inline bool getShininessFrontAndBack() const { return _shininessFrontAndBack; } 
    163          
     163 
    164164        /** Set the alpha value of ambient, diffuse, specular and emission 
    165165          * colors of specified face, to 1-transparency.