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/src/osgText/TextBase.cpp

    r12972 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*/ 
     
    142142    computeGlyphRepresentation(); 
    143143} 
    144      
     144 
    145145 
    146146void TextBase::setText(const String& text) 
    147147{ 
    148148    if (_text==text) return; 
    149      
     149 
    150150    _text = text; 
    151151    computeGlyphRepresentation(); 
     
    161161    setText(String(text,encoding)); 
    162162} 
    163      
     163 
    164164 
    165165void TextBase::setText(const wchar_t* text) 
     
    179179{ 
    180180    if (_alignment==alignment) return; 
    181      
     181 
    182182    _alignment = alignment; 
    183183    computeGlyphRepresentation(); 
     
    192192    case XZ_PLANE: 
    193193        setAutoRotateToScreen(false); 
    194         setRotation(osg::Quat(osg::inDegrees(90.0f),osg::Vec3(1.0f,0.0f,0.0f)));  
     194        setRotation(osg::Quat(osg::inDegrees(90.0f),osg::Vec3(1.0f,0.0f,0.0f))); 
    195195        break; 
    196196    case REVERSED_XZ_PLANE: 
    197197        setAutoRotateToScreen(false); 
    198198        setRotation(osg::Quat(osg::inDegrees(180.0f),osg::Vec3(0.0f,1.0f,0.0f))* 
    199                     osg::Quat(osg::inDegrees(90.0f),osg::Vec3(1.0f,0.0f,0.0f)));  
    200         break; 
    201     case YZ_PLANE:   
     199                    osg::Quat(osg::inDegrees(90.0f),osg::Vec3(1.0f,0.0f,0.0f))); 
     200        break; 
     201    case YZ_PLANE: 
    202202        setAutoRotateToScreen(false); 
    203203        setRotation(osg::Quat(osg::inDegrees(90.0f),osg::Vec3(1.0f,0.0f,0.0f))* 
    204204                    osg::Quat(osg::inDegrees(90.0f),osg::Vec3(0.0f,0.0f,1.0f))); 
    205205        break; 
    206     case REVERSED_YZ_PLANE:   
     206    case REVERSED_YZ_PLANE: 
    207207        setAutoRotateToScreen(false); 
    208208        setRotation(osg::Quat(osg::inDegrees(180.0f),osg::Vec3(0.0f,1.0f,0.0f))* 
     
    236236{ 
    237237    if (_autoRotateToScreen==autoRotateToScreen) return; 
    238      
     238 
    239239    _autoRotateToScreen = autoRotateToScreen; 
    240240    computePositions(); 
     
    251251 
    252252 
    253 void TextBase::setDrawMode(unsigned int mode)  
    254 {  
     253void TextBase::setDrawMode(unsigned int mode) 
     254{ 
    255255    if (_drawMode==mode) return; 
    256256 
     
    318318{ 
    319319    unsigned int size = osg::maximum(osg::DisplaySettings::instance()->getMaxNumberOfGraphicsContexts(),_autoTransformCache.size()); 
    320      
     320 
    321321    // FIXME: OPTIMIZE: This would be one of the ideal locations to 
    322322    // call computeAverageGlyphWidthAndHeight(). It is out of the contextID loop 
     
    325325    // or member variables, but we would need a system to know if the values are stale.) 
    326326 
    327      
     327 
    328328    for(unsigned int i=0;i<size;++i) 
    329329    {