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/osgFX/MultiTextureControl.cpp

    r8611 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*/ 
     
    3838    } 
    3939    _textureWeightList[unit] = weight; 
    40      
     40 
    4141    updateStateSet(); 
    4242} 
     
    4545{ 
    4646    osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet; 
    47      
     47 
    4848    unsigned int numTextureUnitsOn = 0; 
    4949    unsigned int unit; 
     
    5252        if (_textureWeightList[unit]>0.0f) ++numTextureUnitsOn; 
    5353    } 
    54      
     54 
    5555    if (numTextureUnitsOn<=1) 
    5656    { 
    5757        for(unit=0;unit<_textureWeightList.size();++unit) 
    5858        { 
    59             if (_textureWeightList[unit]>0.0f)  
     59            if (_textureWeightList[unit]>0.0f) 
    6060            { 
    6161                osg::TexEnv* texenv = new osg::TexEnv(osg::TexEnv::MODULATE); 
     
    9898            stateset->setTextureAttribute(1, texenv); 
    9999        } 
    100     }  
     100    } 
    101101    else if (_textureWeightList.size()==3) 
    102102    { 
    103103        float b = (_textureWeightList[0]+_textureWeightList[1])/(_textureWeightList[0]+_textureWeightList[1]+_textureWeightList[2]); 
    104104        float a = _textureWeightList[0]/(_textureWeightList[0]+_textureWeightList[1]); 
    105          
     105 
    106106        { 
    107107            osg::TexEnvCombine* texenv = new osg::TexEnvCombine; 
     
    144144            stateset->setTextureAttribute(2, texenv); 
    145145        } 
    146     }  
     146    } 
    147147 
    148148    setStateSet(stateset.get());