FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved the code referencing osg::BoundingBox::isValid() and

Browse Source 
osg::BoundingSphere::isValid() across to use the valid() methods, the later
being more consitent with other classes such as osg::ref_ptr<>.
This commit is contained in:
Robert Osfield
2002-07-11 14:32:21 +00:00
parent b015d80d68
commit c4c97a0f64
12 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/osg/BoundingBox
View File

@@ -50,12 +50,8 @@ class SG_EXPORT BoundingBox
_max.set(-FLT_MAX,-FLT_MAX,-FLT_MAX);
}
/** return true if the bounding box contains valid values,
false if the bounding box is effectively unset/empty.*/
inline const bool isValid() const
{
return _max.x()>=_min.x();
}
/** deprecated, use valid() instead.*/
inline const bool isValid() const { return _max.x()>=_min.x(); }
inline const bool valid() const
{
@@ -139,7 +135,7 @@ class SG_EXPORT BoundingBox
/** return true is vertex v is within the box.*/
inline const bool contains(const Vec3& v) const
{
return isValid() &&
return valid() &&
(v.x()>=_min.x() && v.x()<=_max.x()) &&
(v.y()>=_min.y() && v.y()<=_max.y()) &&
(v.z()>=_min.z() && v.z()<=_max.z());