miscellaneous cleanup

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

diff --git a/src/Moof/Frustum.cc b/src/Moof/Frustum.cc
index 4dc63400618883b95e877c2e288c724e7e0fdfe1..51705f2eba7ebe53b458f2b99a8ad1c01204b1b1 100644 (file)
--- a/src/Moof/Frustum.cc
+++ b/src/Moof/Frustum.cc
@@ -50,17 +50,17 @@ void Frustum::init(const Matrix4& modelview, const Matrix4& projection)
 }
 
 void Frustum::init(const Matrix4& modelview, Scalar fovy, Scalar aspect,
-               Scalar near, Scalar far)
+               Scalar abutting, Scalar distant)
 {
        Matrix4 projection;
 
-       cml::matrix_perspective_yfov_RH(projection, fovy, aspect, near, far,
+       cml::matrix_perspective_yfov_RH(projection, fovy, aspect, abutting, distant,
                        cml::z_clip_neg_one);
 
        init(modelview, projection);
 }
 
-Frustum::Collision Frustum::containsAabb(const Aabb& aabb) const
+Frustum::Collision Frustum::contains(const Aabb& aabb) const
 {
        Vector3 corners[8];
        int nTotalInside = 0;
@@ -73,7 +73,7 @@ Frustum::Collision Frustum::containsAabb(const Aabb& aabb) const
 
                for (int j = 0; j < 8; ++j)
                {
-                       if (planes_[i].intersectsPoint(corners[j]) ==
+                       if (planes_[i].intersects(corners[j]) ==
                                        Plane::NEGATIVE)
                        {
                                --nInside;
@@ -89,11 +89,11 @@ Frustum::Collision Frustum::containsAabb(const Aabb& aabb) const
 }
 
 
-Frustum::Collision Frustum::containsSphere(const Sphere& sphere) const
+Frustum::Collision Frustum::contains(const Sphere& sphere) const
 {
        for (int i = 0; i < 6; ++i)
        {
-               Plane::Halfspace halfspace = planes_[i].intersectsSphere(sphere);
+               Plane::Halfspace halfspace = planes_[i].intersects(sphere);
                
                if (halfspace == Plane::NEGATIVE)       return OUTSIDE;
                else if (halfspace == Plane::INTERSECT) return INTERSECT;