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/osgText/Font

    r12825 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*/ 
     
    3030 
    3131/** Read a font from specified file. The filename may contain a path. 
    32   * It will search for the font file in the following places in this order:  
     32  * It will search for the font file in the following places in this order: 
    3333  * - In the current directory 
    3434  * - All paths defined in OSG_FILE_PATH or OSGFILEPATH environment variable 
     
    4444  * - Other OS: In /usr/share/fonts/ttf/western 
    4545  * - Other OS: In /usr/share/fonts/ttf/decoratives 
    46   *  
     46  * 
    4747  * If the given file could not be found, the path part will be stripped and 
    4848  * the file will be searched again in the OS specific directories. 
     
    9191    const osg::StateSet* getStateSet() const { return _stateset.get(); } 
    9292 
    93      
     93 
    9494    /** Get a kerning (adjustment of spacing of two adjacent character) for specified charcodes, w.r.t the current font size hint.*/ 
    9595    virtual osg::Vec2 getKerning(unsigned int leftcharcode,unsigned int rightcharcode, KerningType kerningType); 
     
    111111    /** Set the margin around each glyph, 
    112112      * to ensure that texture filtering doesn't bleed adjacent glyph's into each other. 
    113       * Default margin is 1 texels.*/     
     113      * Default margin is 1 texels.*/ 
    114114    void setGlyphImageMargin(unsigned int margin); 
    115115    unsigned int getGlyphImageMargin() const; 
     
    117117    /** Set the margin ratio around each glyph, relative to the glyph's size. 
    118118      * to ensure that texture filtering doesn't bleed adjacent glyph's into each other. 
    119       * Default margin is 0.05.*/     
     119      * Default margin is 0.05.*/ 
    120120    void setGlyphImageMarginRatio(float margin); 
    121121    float getGlyphImageMarginRatio() const; 
     
    125125      * Note, this doesn't affect already created Texture Glhph's.*/ 
    126126    void setTextureSizeHint(unsigned int width,unsigned int height); 
    127      
     127 
    128128    unsigned int getTextureWidthHint() const; 
    129129    unsigned int getTextureHeightHint() const; 
     
    133133    void setMinFilterHint(osg::Texture::FilterMode mode); 
    134134    osg::Texture::FilterMode getMinFilterHint() const; 
    135      
     135 
    136136    /** Set the magnification texture filter to use when creating the texture to store the glyph images when rendering. 
    137137      * Note, this doesn't affect already created Texture Glhph's.*/ 
     
    165165 
    166166    typedef OpenThreads::Mutex FontMutex; 
    167      
     167 
    168168    typedef std::vector< osg::ref_ptr<GlyphTexture> >       GlyphTextureList; 
    169169    GlyphTextureList& getGlyphTextureList() { return _glyphTextureList; } 
    170      
     170 
    171171protected: 
    172172 
     
    197197 
    198198    unsigned int                    _textureWidthHint; 
    199     unsigned int                    _textureHeightHint;    
     199    unsigned int                    _textureHeightHint; 
    200200    osg::Texture::FilterMode        _minFilterHint; 
    201201    osg::Texture::FilterMode        _magFilterHint; 
     
    204204    unsigned int                    _numCurveSamples; 
    205205 
    206      
     206 
    207207    osg::ref_ptr<FontImplementation> _implementation; 
    208208 
    209      
     209 
    210210// declare the nested classes. 
    211211public: 
     
    214214    { 
    215215    public: 
    216      
     216 
    217217        FontImplementation(): 
    218218            osg::Referenced(true), 
    219219            _facade(0) {} 
    220      
     220 
    221221        virtual std::string getFileName() const = 0; 
    222222