port to NetBSD

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

diff --git a/src/Moof/Frustum.hh b/src/Moof/Frustum.hh
index a50dc8338d0a10206bce3ebc900f93037b640e23..c708c065bd79209cfcf0a17fa51e533cceb43de8 100644 (file)
--- a/src/Moof/Frustum.hh
+++ b/src/Moof/Frustum.hh
@@ -41,7 +41,7 @@ class Sphere;
 
 class Frustum
 {
-       Plane   planes_[6]; // left, right, bottom, top, near, far
+       Plane   mPlanes[6]; // left, right, bottom, top, near, far
 
 public:
        typedef enum
@@ -52,22 +52,22 @@ public:
        } Collision;
 
        Frustum() {}
-       inline Frustum(const Matrix4& modelview, const Matrix4& projection)
+       Frustum(const Matrix4& modelview, const Matrix4& projection)
        {
                init(modelview, projection);
        }
-       inline Frustum(const Matrix4& modelview, Scalar fovy, Scalar aspect,
-                       Scalar near, Scalar far)
+       Frustum(const Matrix4& modelview, Scalar fovy, Scalar aspect,
+                       Scalar abutting, Scalar distant)
        {
-               init(modelview, fovy, aspect, near, far);
+               init(modelview, fovy, aspect, abutting, distant);
        }
        
        void init(const Matrix4& modelview, const Matrix4& projection);
-       void init(const Matrix4& modelview, Scalar fovy, Scalar aspect, Scalar near,
-                       Scalar far);
+       void init(const Matrix4& modelview, Scalar fovy, Scalar aspect,
+                       Scalar abutting, Scalar distant);
 
-       Collision containsAabb(const Aabb& aabb) const;
-       Collision containsSphere(const Sphere& sphere) const;
+       Collision contains(const Aabb& aabb) const;
+       Collision contains(const Sphere& sphere) const;
 };