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

    r5328 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*/ 
     
    2929{ 
    3030 
    31     /** This is the base class for cube map generators.  
     31    /** This is the base class for cube map generators. 
    3232        It exposes the necessary interface to access the six generated images; 
    3333        descendants should only override the compute_color() method. 
     
    4141        inline const osg::Image *getImage(osg::TextureCubeMap::Face face) const; 
    4242 
    43         /** Generate the six cube images.  
    44             If use_osg_system is true, then the OSG's coordinate system is used instead  
     43        /** Generate the six cube images. 
     44            If use_osg_system is true, then the OSG's coordinate system is used instead 
    4545            of the default OpenGL one. 
    4646        */ 
     
    5252 
    5353        inline void set_pixel(int index, int c, int r, const osg::Vec4 &color); 
    54         inline static osg::Vec4 vector_to_color(const osg::Vec3 &vec);         
     54        inline static osg::Vec4 vector_to_color(const osg::Vec3 &vec); 
    5555 
    56         /** Override this method to define how colors are computed.  
     56        /** Override this method to define how colors are computed. 
    5757            The parameter R is the reflection vector, pointing from the center of the cube. 
    5858            The return value should be the RGBA color associated with that reflection ray. 
     
    6464 
    6565        typedef std::vector<osg::ref_ptr<osg::Image> > Image_list; 
    66         Image_list images_;         
     66        Image_list images_; 
    6767    }; 
    6868 
     
    7777            case osg::TextureCubeMap::NEGATIVE_Y: return images_[3].get(); 
    7878            case osg::TextureCubeMap::POSITIVE_Z: return images_[4].get(); 
    79             case osg::TextureCubeMap::NEGATIVE_Z: return images_[5].get();             
     79            case osg::TextureCubeMap::NEGATIVE_Z: return images_[5].get(); 
    8080            default: return 0; 
    8181        } 
     
    9090            case osg::TextureCubeMap::NEGATIVE_Y: return images_[3].get(); 
    9191            case osg::TextureCubeMap::POSITIVE_Z: return images_[4].get(); 
    92             case osg::TextureCubeMap::NEGATIVE_Z: return images_[5].get();             
     92            case osg::TextureCubeMap::NEGATIVE_Z: return images_[5].get(); 
    9393            default: return 0; 
    9494        } 
     
    102102            *(i->data(c, r)+1) = static_cast<unsigned char>(osg::clampBetween(color.y(),0.0f,1.0f) * 255); 
    103103            *(i->data(c, r)+2) = static_cast<unsigned char>(osg::clampBetween(color.z(),0.0f,1.0f) * 255); 
    104             *(i->data(c, r)+3) = static_cast<unsigned char>(osg::clampBetween(color.w(),0.0f,1.0f) * 255);             
     104            *(i->data(c, r)+3) = static_cast<unsigned char>(osg::clampBetween(color.w(),0.0f,1.0f) * 255); 
    105105        } else { 
    106106            osg::notify(osg::WARN) << "Warning: CubeMapGenerator::set_pixel(): invalid image index\n";