miscellaneous cleanup

[chaz/yoink] / src / Moof / Plane.cc

diff --git a/src/Moof/Plane.cc b/src/Moof/Plane.cc
index 975ef13c52194990ba54e712c0d3138fa56f5d03..539093438c6114da07e440f60bb3c94e94f75ec2 100644 (file)
--- a/src/Moof/Plane.cc
+++ b/src/Moof/Plane.cc
@@ -34,7 +34,7 @@
 namespace Mf {
 
 
 namespace Mf {
 
 

-Plane::Halfspace Plane::intersectsAabb(const Aabb& aabb) const
+Plane::Halfspace Plane::intersects(const Aabb& aabb) const

 {
        Vector3 corners[8];
        int nPositive = 8;
 {
        Vector3 corners[8];
        int nPositive = 8;


@@ -43,7 +43,7 @@ Plane::Halfspace Plane::intersectsAabb(const Aabb& aabb) const
 
        for (int i = 0; i < 8; ++i)
        {
 
        for (int i = 0; i < 8; ++i)
        {

-               if (intersectsPoint(corners[i]) == NEGATIVE)
+               if (intersects(corners[i]) == NEGATIVE)

                {
                        --nPositive;
                }
                {
                        --nPositive;
                }


@@ -54,7 +54,7 @@ Plane::Halfspace Plane::intersectsAabb(const Aabb& aabb) const
        else                     return INTERSECT;
 }
 
        else                     return INTERSECT;
 }
 

-Plane::Halfspace Plane::intersectsSphere(const Sphere& sphere) const
+Plane::Halfspace Plane::intersects(const Sphere& sphere) const

 {
        Scalar distance = getDistanceToPoint(sphere.point);
 
 {
        Scalar distance = getDistanceToPoint(sphere.point);