X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FFrustum.hh;h=0d08831911f721a9d2ed9f5b6a4ad4ec42cffdfb;hp=a50dc8338d0a10206bce3ebc900f93037b640e23;hb=fe9614821670d9affcb68fb3e45723b9d40d0b7e;hpb=72d4af22710317acffab861421c4364b1780b6fe

diff --git a/src/Moof/Frustum.hh b/src/Moof/Frustum.hh
index a50dc83..0d08831 100644
--- a/src/Moof/Frustum.hh
+++ b/src/Moof/Frustum.hh
@@ -57,17 +57,17 @@ public:
 		init(modelview, projection);
 	}
 	inline Frustum(const Matrix4& modelview, Scalar fovy, Scalar aspect,
-			Scalar near, Scalar far)
+			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;
 };