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/osg/DisplaySettings.cpp

    r12324 r13041  
    11/* -*-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*/ 
     
    3939} 
    4040 
    41   
     41 
    4242 DisplaySettings& DisplaySettings::operator = (const DisplaySettings& vs) 
    4343{ 
     
    6262    _splitStereoVerticalEyeMapping = vs._splitStereoVerticalEyeMapping; 
    6363    _splitStereoVerticalSeparation = vs._splitStereoVerticalSeparation; 
    64      
     64 
    6565    _splitStereoAutoAdjustAspectRatio = vs._splitStereoAutoAdjustAspectRatio; 
    6666 
     
    7777    _maxNumOfGraphicsContexts = vs._maxNumOfGraphicsContexts; 
    7878    _numMultiSamples = vs._numMultiSamples; 
    79      
     79 
    8080    _compileContextsHint = vs._compileContextsHint; 
    8181    _serializeDrawDispatch = vs._serializeDrawDispatch; 
    82      
     82 
    8383    _numDatabaseThreadsHint = vs._numDatabaseThreadsHint; 
    8484    _numHttpDatabaseThreadsHint = vs._numHttpDatabaseThreadsHint; 
    85      
     85 
    8686    _application = vs._application; 
    8787 
     
    101101{ 
    102102    if (_stereo       || vs._stereo)        _stereo = true; 
    103      
     103 
    104104    // need to think what to do about merging the stereo mode. 
    105      
     105 
    106106    if (_doubleBuffer || vs._doubleBuffer)  _doubleBuffer = true; 
    107107    if (_RGB          || vs._RGB)           _RGB = true; 
    108108    if (_depthBuffer  || vs._depthBuffer)   _depthBuffer = true; 
    109      
     109 
    110110    if (vs._minimumNumberAlphaBits>_minimumNumberAlphaBits) _minimumNumberAlphaBits = vs._minimumNumberAlphaBits; 
    111111    if (vs._minimumNumberStencilBits>_minimumNumberStencilBits) _minimumNumberStencilBits = vs._minimumNumberStencilBits; 
     
    123123    if (vs._maxBufferObjectPoolSize>_maxBufferObjectPoolSize) _maxBufferObjectPoolSize = vs._maxBufferObjectPoolSize; 
    124124 
    125     // these are bit masks so merging them is like logical or  
     125    // these are bit masks so merging them is like logical or 
    126126    _implicitBufferAttachmentRenderMask |= vs._implicitBufferAttachmentRenderMask; 
    127127    _implicitBufferAttachmentResolveMask |= vs._implicitBufferAttachmentResolveMask; 
     
    160160    _minimumNumberAccumBlueBits = 0; 
    161161    _minimumNumberAccumAlphaBits = 0; 
    162      
     162 
    163163    _maxNumOfGraphicsContexts = 32; 
    164164    _numMultiSamples = 0; 
     
    168168    _numMultiSamples = 4; 
    169169    #endif 
    170      
     170 
    171171    _compileContextsHint = false; 
    172172    _serializeDrawDispatch = true; 
     
    292292{ 
    293293    const char* ptr = 0; 
    294      
     294 
    295295    if ((ptr = getenv("OSG_DISPLAY_TYPE")) != 0) 
    296296    { 
     
    315315        } 
    316316    } 
    317      
     317 
    318318    if( (ptr = getenv("OSG_STEREO_MODE")) != 0) 
    319319    { 
     
    420420        } 
    421421    } 
    422      
     422 
    423423    if( (ptr = getenv("OSG_SPLIT_STEREO_AUTO_ADJUST_ASPECT_RATIO")) != 0) 
    424424    { 
     
    456456        } 
    457457    } 
    458      
     458 
    459459    if( (ptr = getenv("OSG_SERIALIZE_DRAW_DISPATCH")) != 0) 
    460460    { 
     
    624624        _RGB = true; 
    625625        _minimumNumberAlphaBits = 1; 
    626     }             
     626    } 
    627627 
    628628    while (arguments.read("--stencil")) 
     
    669669        }; 
    670670 
    671         int * mask[] = {  
     671        int * mask[] = { 
    672672            &_implicitBufferAttachmentRenderMask, 
    673673            &_implicitBufferAttachmentResolveMask,