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/include/osg/BoundingBox

    r9762 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*/ 
     
    3636        typedef VT vec_type; 
    3737        typedef typename VT::value_type value_type; 
    38      
     38 
    3939        /** Minimum extent. (Smallest X, Y, and Z values of all coordinates.) */ 
    4040        vec_type _min; 
     
    5151                 -FLT_MAX) 
    5252        {} 
    53      
     53 
    5454        /** Creates a bounding box initialized to the given extents. */ 
    5555        inline BoundingBoxImpl(value_type xmin, value_type ymin, value_type zmin, 
     
    5959 
    6060        /** Creates a bounding box initialized to the given extents. */ 
    61         inline BoundingBoxImpl(const vec_type& min,const vec_type& max) :  
     61        inline BoundingBoxImpl(const vec_type& min,const vec_type& max) : 
    6262                    _min(min), 
    6363                    _max(max) {} 
     
    7373                     -FLT_MAX); 
    7474        } 
    75          
    76         /** Returns true if the bounding box extents are valid, false otherwise. */               
     75 
     76        /** Returns true if the bounding box extents are valid, false otherwise. */ 
    7777        inline bool valid() const 
    7878        { 
     
    9898        inline value_type& xMin() { return _min.x(); } 
    9999        inline value_type xMin() const { return _min.x(); } 
    100   
     100 
    101101        inline value_type& yMin() { return _min.y(); } 
    102102        inline value_type yMin() const { return _min.y(); } 
    103   
     103 
    104104        inline value_type& zMin() { return _min.z(); } 
    105105        inline value_type zMin() const { return _min.z(); } 
     
    107107        inline value_type& xMax() { return _max.x(); } 
    108108        inline value_type xMax() const { return _max.x(); } 
    109   
     109 
    110110        inline value_type& yMax() { return _max.y(); } 
    111111        inline value_type yMax() const { return _max.y(); } 
    112   
     112 
    113113        inline value_type& zMax() { return _max.z(); } 
    114114        inline value_type zMax() const { return _max.z(); } 
     
    203203            if(sh._center.z()+sh._radius>_max.z()) _max.z() = sh._center.z()+sh._radius; 
    204204        } 
    205          
     205 
    206206 
    207207        /** Returns the intersection of this bounding box and the specified bounding box. */ 
     
    223223        inline bool contains(const vec_type& v) const 
    224224        { 
    225             return valid() &&  
     225            return valid() && 
    226226                   (v.x()>=_min.x() && v.x()<=_max.x()) && 
    227227                   (v.y()>=_min.y() && v.y()<=_max.y()) &&