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

    r11805 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*/ 
     
    4343            readEnvironmentalVariables(); 
    4444        } 
    45          
     45 
    4646        DisplaySettings(ArgumentParser& arguments): 
    4747            Referenced(true) 
     
    5353 
    5454        DisplaySettings(const DisplaySettings& vs); 
    55          
     55 
    5656 
    5757        DisplaySettings& operator = (const DisplaySettings& vs); 
    58   
     58 
    5959        void setDisplaySettings(const DisplaySettings& vs); 
    60          
     60 
    6161        void merge(const DisplaySettings& vs); 
    6262 
    6363        void setDefaults(); 
    64          
     64 
    6565        /** read the environmental variables.*/ 
    6666        void readEnvironmentalVariables(); 
     
    6868        /** read the commandline arguments.*/ 
    6969        void readCommandLine(ArgumentParser& arguments); 
    70          
    71          
     70 
     71 
    7272        enum DisplayType 
    7373        { 
     
    7979 
    8080        void setDisplayType(DisplayType type) { _displayType = type; } 
    81          
     81 
    8282        DisplayType getDisplayType() const { return _displayType; } 
    8383 
     
    9898            CHECKERBOARD 
    9999        }; 
    100          
     100 
    101101        void setStereoMode(StereoMode mode) { _stereoMode = mode; } 
    102102        StereoMode getStereoMode() const { return _stereoMode; } 
     
    110110            LEFT_EYE_RIGHT_VIEWPORT 
    111111        }; 
    112          
     112 
    113113        void setSplitStereoHorizontalEyeMapping(SplitStereoHorizontalEyeMapping m) { _splitStereoHorizontalEyeMapping = m; } 
    114114        SplitStereoHorizontalEyeMapping getSplitStereoHorizontalEyeMapping() const { return _splitStereoHorizontalEyeMapping; } 
     
    178178        unsigned int getNumMultiSamples() const { return _numMultiSamples; } 
    179179        bool getMultiSamples() const { return _numMultiSamples!=0; } 
    180          
     180 
    181181        void setCompileContextsHint(bool useCompileContexts) { _compileContextsHint = useCompileContexts; } 
    182182        bool getCompileContextsHint() const { return _compileContextsHint; } 
    183          
     183 
    184184        void setSerializeDrawDispatch(bool serializeDrawDispatch) { _serializeDrawDispatch = serializeDrawDispatch; } 
    185185        bool getSerializeDrawDispatch() const { return _serializeDrawDispatch; } 
    186          
     186 
    187187        /** Set the hint for the total number of threads in the DatbasePager set up, inclusive of the number of http dedicated threads.*/ 
    188188        void setNumOfDatabaseThreadsHint(unsigned int numThreads) { _numDatabaseThreadsHint = numThreads; } 
     
    196196        /** Get the hint for number of threads in the DatbasePager dedicated to reading http requests.*/ 
    197197        unsigned int getNumOfHttpDatabaseThreadsHint() const { return _numHttpDatabaseThreadsHint; } 
    198          
     198 
    199199        void setApplication(const std::string& application) { _application = application; } 
    200200        const std::string& getApplication() { return _application; } 
     
    207207        unsigned int getMaxBufferObjectPoolSize() const { return _maxBufferObjectPoolSize; } 
    208208 
    209         /**  
    210          Methods used to set and get defaults for Cameras implicit buffer attachments.  
    211          For more info: See description of Camera::setImplicitBufferAttachment method  
    212  
    213          DisplaySettings implicit buffer attachment selection defaults to: DEPTH and COLOR  
     209        /** 
     210         Methods used to set and get defaults for Cameras implicit buffer attachments. 
     211         For more info: See description of Camera::setImplicitBufferAttachment method 
     212 
     213         DisplaySettings implicit buffer attachment selection defaults to: DEPTH and COLOR 
    214214         for both primary (Render) FBO and seconday Multisample (Resolve) FBO 
    215215         ie: IMPLICT_DEPTH_BUFFER_ATTACHMENT | IMPLICIT_COLOR_BUFFER_ATTACHMENT 
     
    250250        { 
    251251            SWAP_DEFAULT,   // Leave swap method at default returned by choose Pixel Format. 
    252             SWAP_EXCHANGE,  // Flip front / back buffer.  
    253             SWAP_COPY,      // Copy back to front buffer.  
     252            SWAP_EXCHANGE,  // Flip front / back buffer. 
     253            SWAP_COPY,      // Copy back to front buffer. 
    254254            SWAP_UNDEFINED  // Move back to front buffer leaving contents of back buffer undefined. 
    255255        }; 
    256          
     256 
    257257        /** Select preferred swap method */ 
    258258        void setSwapMethod( SwapMethod swapMethod ) { _swapMethod = swapMethod; } 
     
    272272        /** Get the hint of the flags to use in when creating graphic contexts.*/ 
    273273        unsigned int getGLContextFlags() const { return _glContextFlags; } 
    274          
     274 
    275275        /** Set the hint of the profile mask to use in when creating graphic contexts.*/ 
    276276        void setGLContextProfileMask(unsigned int mask) { _glContextProfileMask = mask; } 
     
    280280 
    281281    protected: 
    282      
     282 
    283283        virtual ~DisplaySettings(); 
    284284 
     
    297297        int                             _splitStereoVerticalSeparation; 
    298298        bool                            _splitStereoAutoAdjustAspectRatio; 
    299      
     299 
    300300        bool                            _doubleBuffer; 
    301301        bool                            _RGB; 
     
    309309 
    310310        unsigned int                    _maxNumOfGraphicsContexts; 
    311          
     311 
    312312        unsigned int                    _numMultiSamples; 
    313          
     313 
    314314        bool                            _compileContextsHint; 
    315315        bool                            _serializeDrawDispatch; 
     
    317317        unsigned int                    _numDatabaseThreadsHint; 
    318318        unsigned int                    _numHttpDatabaseThreadsHint; 
    319          
     319 
    320320        std::string                     _application; 
    321321 
     
    325325        ImplicitBufferAttachmentMask    _implicitBufferAttachmentRenderMask; 
    326326        ImplicitBufferAttachmentMask    _implicitBufferAttachmentResolveMask; 
    327          
     327 
    328328        std::string                     _glContextVersion; 
    329329        unsigned int                    _glContextFlags;