cade lab fixes

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

diff --git a/src/Moof/Frustum.hh b/src/Moof/Frustum.hh
index 87e654fd12c8c0b4f5cbbe27dcab1152ee954e33..406e2304895db75ea5c519e6e8ec1a0a6685f799 100644 (file)
--- 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
@@ -66,8 +66,8 @@ public:
        void init(const Matrix4& modelview, Scalar fovy, Scalar aspect,
                        Scalar abutting, Scalar distant);
 
-       Collision contains(const Aabb& aabb) const;
-       Collision contains(const Sphere& sphere) const;
+       Collision contains(const Aabb<3>& aabb) const;
+       Collision contains(const Sphere<3>& sphere) const;
 };