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

diff --git a/src/Moof/Frustum.hh b/src/Moof/Frustum.hh
index a50dc83..406e230 100644
--- a/src/Moof/Frustum.hh
+++ b/src/Moof/Frustum.hh
@@ -36,12 +36,12 @@
 namespace Mf {
 
 
-class Aabb;
-class Sphere;
+template <int D> class Aabb;
+template <int D> 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<3>& aabb) const;
+	Collision contains(const Sphere<3>& sphere) const;
 };