experimental shapes hierarchy and raycasting

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

diff --git a/src/Moof/Frustum.cc b/src/Moof/Frustum.cc
index 86e4d5b1b22001b88df7a5e8ed718f873d577b1e..1db6d253299b489bf46690a72c62b5476a3a1491 100644 (file)
--- a/src/Moof/Frustum.cc
+++ b/src/Moof/Frustum.cc
@@ -60,7 +60,7 @@ void Frustum::init(const Matrix4& modelview, Scalar fovy, Scalar aspect,
        init(modelview, projection);
 }
 
-Frustum::Collision Frustum::contains(const Aabb& aabb) const
+Frustum::Collision Frustum::contains(const Aabb<3>& aabb) const
 {
        Vector3 corners[8];
        int nTotalInside = 0;
@@ -89,7 +89,7 @@ Frustum::Collision Frustum::contains(const Aabb& aabb) const
 }
 
 
-Frustum::Collision Frustum::contains(const Sphere& sphere) const
+Frustum::Collision Frustum::contains(const Sphere<3>& sphere) const
 {
        for (int i = 0; i < 6; ++i)
        {