minor refactoring and state progress

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

diff --git a/src/Moof/Frustum.cc b/src/Moof/Frustum.cc
index 51705f2eba7ebe53b458f2b99a8ad1c01204b1b1..86e4d5b1b22001b88df7a5e8ed718f873d577b1e 100644 (file)
--- a/src/Moof/Frustum.cc
+++ b/src/Moof/Frustum.cc
@@ -41,12 +41,12 @@ void Frustum::init(const Matrix4& modelview, const Matrix4& projection)
        cml::extract_frustum_planes(modelview, projection, planes,
                        cml::z_clip_neg_one);
 
-       planes_[0] = Plane(planes[0][0], planes[0][1], planes[0][2], planes[0][3]);
-       planes_[1] = Plane(planes[1][0], planes[1][1], planes[1][2], planes[1][3]);
-       planes_[2] = Plane(planes[2][0], planes[2][1], planes[2][2], planes[2][3]);
-       planes_[3] = Plane(planes[3][0], planes[3][1], planes[3][2], planes[3][3]);
-       planes_[4] = Plane(planes[4][0], planes[4][1], planes[4][2], planes[4][3]);
-       planes_[5] = Plane(planes[5][0], planes[5][1], planes[5][2], planes[5][3]);
+       mPlanes[0] = Plane(planes[0][0], planes[0][1], planes[0][2], planes[0][3]);
+       mPlanes[1] = Plane(planes[1][0], planes[1][1], planes[1][2], planes[1][3]);
+       mPlanes[2] = Plane(planes[2][0], planes[2][1], planes[2][2], planes[2][3]);
+       mPlanes[3] = Plane(planes[3][0], planes[3][1], planes[3][2], planes[3][3]);
+       mPlanes[4] = Plane(planes[4][0], planes[4][1], planes[4][2], planes[4][3]);
+       mPlanes[5] = Plane(planes[5][0], planes[5][1], planes[5][2], planes[5][3]);
 }
 
 void Frustum::init(const Matrix4& modelview, Scalar fovy, Scalar aspect,
@@ -73,7 +73,7 @@ Frustum::Collision Frustum::contains(const Aabb& aabb) const
 
                for (int j = 0; j < 8; ++j)
                {
-                       if (planes_[i].intersects(corners[j]) ==
+                       if (mPlanes[i].intersects(corners[j]) ==
                                        Plane::NEGATIVE)
                        {
                                --nInside;
@@ -93,7 +93,7 @@ Frustum::Collision Frustum::contains(const Sphere& sphere) const
 {
        for (int i = 0; i < 6; ++i)
        {
-               Plane::Halfspace halfspace = planes_[i].intersects(sphere);
+               Plane::Halfspace halfspace = mPlanes[i].intersects(sphere);
                
                if (halfspace == Plane::NEGATIVE)       return OUTSIDE;
                else if (halfspace == Plane::INTERSECT) return INTERSECT;