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

    r11316 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*/ 
     
    3131{ 
    3232    public: 
    33      
     33 
    3434        TileID(); 
    3535 
    3636        TileID(int in_level, int in_x, int in_y); 
    37              
    38         bool operator == (const TileID& rhs) const         
     37 
     38        bool operator == (const TileID& rhs) const 
    3939        { 
    4040            return (level==rhs.level) && (x==rhs.x) && (y==rhs.y); 
    4141        } 
    4242 
    43         bool operator != (const TileID& rhs) const         
     43        bool operator != (const TileID& rhs) const 
    4444        { 
    4545            return (level!=rhs.level) || (x!=rhs.x) || (y!=rhs.y); 
     
    5454            return y<rhs.y; 
    5555        } 
    56          
     56 
    5757        bool valid() const { return level>=0; } 
    5858 
     
    9090        const Terrain* getTerrain() const { return _terrain; } 
    9191 
    92          
     92 
    9393        /** Set the TileID (layer, x,y) of the TerrainTile. 
    94           * The TileID is used so it can be located by its neighbours  
     94          * The TileID is used so it can be located by its neighbours 
    9595          * via the enclosing Terrain node that manages a map of TileID to TerraiTiles.*/ 
    9696        void setTileID(const TileID& tileID); 
    97          
     97 
    9898        /** Get the TileID (layer, x,y) of the TerrainTile.*/ 
    9999        const TileID& getTileID() const { return _tileID; } 
    100          
     100 
    101101 
    102102        /** Set the TerrainTechnique*/ 
     
    105105        /** Get the TerrainTechnique*/ 
    106106        TerrainTechnique* getTerrainTechnique() { return _terrainTechnique.get(); } 
    107          
     107 
    108108        /** Get the const TerrainTechnique*/ 
    109109        const TerrainTechnique* getTerrainTechnique() const { return _terrainTechnique.get(); } 
     
    141141        /** Get the number of colour layers.*/ 
    142142        unsigned int getNumColorLayers() const { return _colorLayers.size(); } 
    143          
    144          
     143 
     144 
    145145        /** Set hint to whether the TerrainTechnique should create per vertex normals for lighting purposes.*/ 
    146146        void setRequiresNormals(bool flag) { _requiresNormals = flag; } 
     
    260260 
    261261        void allow(const std::string& setname) { _setWhiteList.insert(setname); } 
    262          
     262 
    263263        void setMinimumNumOfLayers(unsigned int numLayers) { _minumumNumberOfLayers = numLayers; } 
    264264        unsigned int getMinimumNumOfLayers() const { return _minumumNumberOfLayers; } 
     
    276276 
    277277        virtual void loaded(osgTerrain::TerrainTile* tile, const osgDB::ReaderWriter::Options* options) const; 
    278      
     278 
    279279    protected: 
    280280 
    281281        virtual ~WhiteListTileLoadedCallback(); 
    282      
     282 
    283283        typedef std::set<std::string> SetWhiteList; 
    284284        SetWhiteList    _setWhiteList;