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/osgTerrain/TerrainTile.cpp

    r11479 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*/ 
     
    7979    _blendingPolicy(terrain._blendingPolicy) 
    8080{ 
    81     if (terrain.getTerrainTechnique())  
     81    if (terrain.getTerrainTechnique()) 
    8282    { 
    8383        setTerrainTechnique(dynamic_cast<TerrainTechnique*>(terrain.getTerrainTechnique()->cloneType())); 
     
    9898{ 
    9999    if (_terrain == ts) return; 
    100      
     100 
    101101    if (_terrain) _terrain->unregisterTerrainTile(this); 
    102      
     102 
    103103    _terrain = ts; 
    104104 
     
    132132                { 
    133133                    osgTerrain::Terrain* ts = dynamic_cast<Terrain*>(*itr); 
    134                     if (ts)  
     134                    if (ts) 
    135135                    { 
    136136                        OSG_INFO<<"Assigning terrain system "<<ts<<std::endl; 
     
    170170    { 
    171171        if (_terrain && _terrain->getTerrainTechniquePrototype()) 
    172         {             
     172        { 
    173173            osg::ref_ptr<osg::Object> object = _terrain->getTerrainTechniquePrototype()->clone(osg::CopyOp::DEEP_COPY_ALL); 
    174174            setTerrainTechnique(dynamic_cast<TerrainTechnique*>(object.get())); 
     
    188188void TerrainTile::setTerrainTechnique(TerrainTechnique* terrainTechnique) 
    189189{ 
    190     if (_terrainTechnique == terrainTechnique) return;  
     190    if (_terrainTechnique == terrainTechnique) return; 
    191191 
    192192    int dirtyDelta = (_dirtyMask==NOT_DIRTY) ? 0 : -1; 
    193193 
    194     if (_terrainTechnique.valid())  
     194    if (_terrainTechnique.valid()) 
    195195    { 
    196196        _terrainTechnique->setTerrainTile(0); 
     
    198198 
    199199    _terrainTechnique = terrainTechnique; 
    200      
    201     if (_terrainTechnique.valid())  
     200 
     201    if (_terrainTechnique.valid()) 
    202202    { 
    203203        _terrainTechnique->setTerrainTile(this); 
    204         ++dirtyDelta;         
    205     } 
    206      
     204        ++dirtyDelta; 
     205    } 
     206 
    207207    if (dirtyDelta>0) setDirtyMask(ALL_DIRTY); 
    208208    else if (dirtyDelta<0) setDirtyMask(NOT_DIRTY); 
     
    249249{ 
    250250    if (_colorLayers.size() <= i) _colorLayers.resize(i+1); 
    251      
     251 
    252252    _colorLayers[i] = layer; 
    253253} 
     
    256256{ 
    257257    osg::BoundingSphere bs; 
    258      
     258 
    259259    if (_elevationLayer.valid()) 
    260260    { 
     
    270270        } 
    271271    } 
    272      
     272 
    273273    return bs; 
    274274} 
     
    301301bool WhiteListTileLoadedCallback::readImageLayer(osgTerrain::ImageLayer* imageLayer, const osgDB::ReaderWriter::Options* options) const 
    302302{ 
    303    if (!imageLayer->getImage() &&  
     303   if (!imageLayer->getImage() && 
    304304        !imageLayer->getFileName().empty()) 
    305305    { 
     
    341341                { 
    342342                    if (readImageLayer(imageLayer, options)) 
    343                     {                         
    344                         // replace SwitchLayer by  
     343                    { 
     344                        // replace SwitchLayer by 
    345345                        if (_replaceSwitchLayer) tile->setColorLayer(i, imageLayer); 
    346346                        else if (switchLayer->getActiveLayer()<0) switchLayer->setActiveLayer(si);