X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FFrustum.cc;h=1db6d253299b489bf46690a72c62b5476a3a1491;hp=4dc63400618883b95e877c2e288c724e7e0fdfe1;hb=3f6e44698c38b74bb622ad81ea9d2daa636981d2;hpb=72d4af22710317acffab861421c4364b1780b6fe

diff --git a/src/Moof/Frustum.cc b/src/Moof/Frustum.cc
index 4dc6340..1db6d25 100644
--- a/src/Moof/Frustum.cc
+++ b/src/Moof/Frustum.cc
@@ -41,26 +41,26 @@ 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,
-		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<3>& 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 (mPlanes[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<3>& sphere) const
 {
 	for (int i = 0; i < 6; ++i)
 	{
-		Plane::Halfspace halfspace = planes_[i].intersectsSphere(sphere);
+		Plane::Halfspace halfspace = mPlanes[i].intersects(sphere);
 		
 		if (halfspace == Plane::NEGATIVE)       return OUTSIDE;
 		else if (halfspace == Plane::INTERSECT) return INTERSECT;