Changeset 13041 for OpenSceneGraph/trunk/include/osg/BoundingSphere

Timestamp:

03/21/12 18:36:20 (14 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/include/osg/BoundingSphere (modified) (11 diffs)

OpenSceneGraph/trunk/include/osg/BoundingSphere

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
  *
- * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * OpenSceneGraph Public License for more details.
 */
@@ -36 +36 @@
     public:
         typedef VT vec_type;
-        typedef typename VT::value_type value_type;        
+        typedef typename VT::value_type value_type;
 
         vec_type    _center;
         value_type  _radius;
 
-        /** Construct a default bounding sphere with radius to -1.0f, representing an invalid/unset bounding sphere.*/ 
+        /** Construct a default bounding sphere with radius to -1.0f, representing an invalid/unset bounding sphere.*/
         BoundingSphereImpl() : _center(0.0,0.0,0.0),_radius(-1.0) {}
-    
+
         /** Creates a bounding sphere initialized to the given extents. */
         BoundingSphereImpl(const vec_type& center, value_type radius) : _center(center),_radius(radius) {}
@@ -64 +64 @@
         inline bool valid() const { return _radius>=0.0; }
 
-        /** Set the bounding sphere to the given center/radius using floats. */ 
+        /** Set the bounding sphere to the given center/radius using floats. */
         inline void set(const vec_type& center,value_type radius)
         {
@@ -73 +73 @@
         /** Returns the center of the bounding sphere. */
         inline vec_type& center() { return _center; }
-        
+
         /** Returns the const center of the bounding sphere. */
         inline const vec_type& center() const { return _center; }
@@ -81 +81 @@
         /** Returns the const radius of the bounding sphere. */
         inline value_type radius() const { return _radius; }
-        
+
         /** Returns the squared length of the radius. Note, For performance
           * reasons, the calling method is responsible for checking to make
@@ -131 +131 @@
                    ((_center - bs._center).length2() <= (_radius + bs._radius)*(_radius + bs._radius));
         }
-        
+
 };
 
@@ -188 +188 @@
         return;
     }
-    
-    
-    // Calculate d == The distance between the sphere centers   
+
+
+    // Calculate d == The distance between the sphere centers
     double d = ( _center - sh.center() ).length();
 
     // New sphere is already inside this one
-    if ( d + sh.radius() <= _radius )  
+    if ( d + sh.radius() <= _radius )
     {
         return;
     }
 
-    //  New sphere completely contains this one 
-    if ( d + _radius <= sh.radius() )  
+    //  New sphere completely contains this one
+    if ( d + _radius <= sh.radius() )
     {
         _center = sh._center;
@@ -207 +207 @@
     }
 
-    
+
     // Build a new sphere that completely contains the other two:
     //
@@ -244 +244 @@
 }
 
-template<typename VT>        
+template<typename VT>
 void BoundingSphereImpl<VT>::expandBy(const BoundingBoxImpl<VT>& bb)
 {
@@ -261 +261 @@
                 newbb.expandBy(v); // add it into the new bounding box.
             }
-            
+
             _center = newbb.center();
             _radius = newbb.radius();
-            
+
         }
         else
@@ -300 +300 @@
         typedef BoundingSpheref BoundingSphere;
 #else
-        typedef BoundingSphered BoundingSphere;        
+        typedef BoundingSphered BoundingSphere;
 #endif
 }