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

4
src/osg/BoundingBox.cpp
View File

@@ -18,7 +18,7 @@ void BoundingBox::expandBy(const Vec3& v)
void BoundingBox::expandBy(const BoundingBox& bb)
{
if (!bb.isValid()) return;
if (!bb.valid()) return;
if(bb._min.x()<_min.x()) _min.x() = bb._min.x();
if(bb._max.x()>_max.x()) _max.x() = bb._max.x();
@@ -33,7 +33,7 @@ void BoundingBox::expandBy(const BoundingBox& bb)
void BoundingBox::expandBy(const BoundingSphere& sh)
{
if (!sh.isValid()) return;
if (!sh.valid()) return;
if(sh._center.x()-sh._radius<_min.x()) _min.x() = sh._center.x()-sh._radius;
if(sh._center.x()+sh._radius>_max.x()) _max.x() = sh._center.x()+sh._radius;