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

diff --git a/src/Moof/Frustum.hh b/src/Moof/Frustum.hh
index 4154f14..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,11 +52,11 @@ 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,
+	Frustum(const Matrix4& modelview, Scalar fovy, Scalar aspect,
 			Scalar abutting, Scalar distant)
 	{
 		init(modelview, fovy, aspect, abutting, distant);
@@ -66,8 +66,8 @@ public:
 	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;
 };