Show
Ignore:
Timestamp:
03/21/12 18:36:20 (2 years ago)
Author:
robert
Message:

Ran script to remove trailing spaces and tabs

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgGA/StateSetManipulator.cpp

    r10946 r13041  
    3939    _stateset = stateset; 
    4040#if 0 
    41     // specify that this stateset is dynamic so it prevents  
    42     // the draw and update phase from overlapping - good for  
    43     // stability but breaks all the performance advantage of  
     41    // specify that this stateset is dynamic so it prevents 
     42    // the draw and update phase from overlapping - good for 
     43    // stability but breaks all the performance advantage of 
    4444    // DrawThreadPerContex. 
    4545    _stateset->setDataVariance(osg::Object::DYNAMIC); 
     
    6060{ 
    6161    if (!_stateset) return; 
    62      
     62 
    6363    // we clone the StateSet so that any draw traversals that might be running at the time of the 
    64     // event traversal won't change the same StateSet that is being read.  One could just set the  
     64    // event traversal won't change the same StateSet that is being read.  One could just set the 
    6565    // DataVariance to DYNAMIC to avoid this overlap, but this would introduce a performance penalty. 
    66      
     66 
    6767    StateSet::ParentList parents = _stateset->getParents(); 
    6868    osg::ref_ptr<osg::StateSet> newStateSet = dynamic_cast<osg::StateSet*>(_stateset->clone(osg::CopyOp::SHALLOW_COPY)); 
     
    8282        } 
    8383    } 
    84      
     84 
    8585    _stateset = newStateSet; 
    8686} 
     
    102102                   (_stateset->getTextureMode(0,GL_TEXTURE_RECTANGLE)&mode)!=0 || 
    103103                   (_stateset->getTextureMode(0,GL_TEXTURE_CUBE_MAP)&mode)!=0; 
    104                     
     104 
    105105        #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE) 
    106106            _texture |= ((_stateset->getTextureMode(0,GL_TEXTURE_1D)&mode)!=0); 
     
    154154{ 
    155155    if (_backface == newbackface) return; 
    156      
    157     clone(); 
    158      
     156 
     157    clone(); 
     158 
    159159    _backface = newbackface; 
    160160    if( _backface ) _stateset->setMode(GL_CULL_FACE,osg::StateAttribute::ON); 
     
    165165{ 
    166166    if (_lighting == newlighting) return; 
    167      
     167 
    168168    clone(); 
    169169 
     
    176176{ 
    177177    if (_texture==newtexture) return; 
    178      
     178 
    179179    clone(); 
    180180 
     
    214214 
    215215    osg::PolygonMode::Mode currentMode = getPolygonMode(); 
    216     // cycle through the available modes.   
     216    // cycle through the available modes. 
    217217    switch(currentMode) 
    218218    { 
     
    233233{ 
    234234    osg::PolygonMode* polyModeObj = dynamic_cast<osg::PolygonMode*>(_stateset->getAttribute(osg::StateAttribute::POLYGONMODE)); 
    235     if (!polyModeObj)  
     235    if (!polyModeObj) 
    236236    { 
    237237        polyModeObj = new osg::PolygonMode;