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

    r12660 r13041  
    143143         *  The ContextID is used by classes like osg::StateAttribute's and osg::Drawable's to 
    144144         *  help manage seperate OpenGL objects, such as display lists, vertex buffer objects 
    145          *  and texture object for each graphics context. The ContextID simply acts as an index  
     145         *  and texture object for each graphics context. The ContextID simply acts as an index 
    146146         *  into arrays that these classes maintain for the purpose of storing GL object handles. 
    147          *  
     147         * 
    148148         *  Note, osgViewer::GraphicsWindow will automatically set up the ContextID for you, 
    149149         *  so you will rearely need to set this yourself. 
    150          *  
     150         * 
    151151         *  The exception is when creating your own graphics context, where you should set 
    152152         *  the ContextID uniquely for each graphics context. 
    153          *  
     153         * 
    154154         *  Typical settings for ContextID are 0,1,2,3... up to the maximum 
    155155         *  number of graphics contexts you have set up. By default contextID is 0. 
     
    408408        void haveAppliedAttribute(const StateAttribute* attribute); 
    409409 
    410         /** Attribute has been applied externally,  
    411           * and therefore this attribute type has been dirtied  
     410        /** Attribute has been applied externally, 
     411          * and therefore this attribute type has been dirtied 
    412412          * and will need to be re-applied on next osg::State.apply(..). 
    413413          * note, if you have an osg::StateAttribute which you have applied externally 
     
    11831183          * note, only updates values that change.*/ 
    11841184        inline bool setActiveTextureUnit( unsigned int unit ); 
    1185          
     1185 
    11861186        /** Get the current texture unit.*/ 
    11871187        unsigned int getActiveTextureUnit() const { return _currentActiveTextureUnit; } 
     
    12691269          * retrofited into OSG for backward compatibility with osgCal, 
    12701270          * after uniform ids were refactored from std::strings to GLints in OSG version 2.9.10. 
    1271           *  
    1272           * Drawbacks: This method is not particularly fast. It has to access mutexed static  
     1271          * 
     1272          * Drawbacks: This method is not particularly fast. It has to access mutexed static 
    12731273          * map of uniform ids. So don't overuse it or your app performance will suffer. 
    12741274        */ 
     
    13391339        /** Get the number of dynamic objects that will be rendered in this graphics context this frame.*/ 
    13401340        unsigned int getDynamicObjectCount() const { return _dynamicObjectCount; } 
    1341          
    1342         /** Decrement the number of dynamic objects left to render this frame, and once the count goes to zero call the  
     1341 
     1342        /** Decrement the number of dynamic objects left to render this frame, and once the count goes to zero call the 
    13431343          * DynamicObjectRenderingCompletedCallback to inform of completion.*/ 
    13441344        inline void decrementDynamicObjectCount() 
     
    15111511                last_applied_shadercomponent = 0L; 
    15121512                global_default_attribute = 0L; 
    1513                  
     1513 
    15141514            } 
    15151515 
     
    18461846 
    18471847        osg::ref_ptr<GraphicsCostEstimator> _graphicsCostEstimator; 
    1848          
     1848 
    18491849        Timer_t                      _startTick; 
    18501850        Timer_t                      _gpuTick;