port to NetBSD

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

diff --git a/src/Moof/Aabb.cc b/src/Moof/Aabb.cc
index c844251b1d0551b2fcf9c94a8ddf2929c11baf6e..17ce66312e4888a6a51dfed6e6654e0319aa00a7 100644 (file)
--- a/src/Moof/Aabb.cc
+++ b/src/Moof/Aabb.cc
@@ -26,10 +26,10 @@
 
 *******************************************************************************/
 
-#include <Moof/Aabb.hh>
-#include <Moof/Camera.hh>
-#include <Moof/OpenGL.hh>
-#include <Moof/Texture.hh>
+#include "Aabb.hh"
+#include "Frustum.hh"
+#include "OpenGL.hh"
+#include "Texture.hh"
 
 
 namespace Mf {
@@ -45,28 +45,35 @@ void Aabb::getOctant(Aabb& octant, int num) const
                        octant.init(Vector3(min[0], min[1], mid[2]),
                                                Vector3(mid[0], mid[1], max[2]));
                        break;
+
                case 1:
                        octant.init(Vector3(mid[0], min[1], mid[2]),
                                                Vector3(max[0], mid[1], max[2]));
                        break;
+
                case 2:
                        octant.init(mid, max);
                        break;
+
                case 3:
                        octant.init(Vector3(min[0], mid[1], mid[2]),
                                                Vector3(mid[0], max[1], max[2]));
                        break;
+
                case 4:
                        octant.init(min, mid);
                        break;
+
                case 5:
                        octant.init(Vector3(mid[0], min[1], min[2]),
                                                Vector3(max[0], mid[1], mid[2]));
                        break;
+
                case 6:
                        octant.init(Vector3(mid[0], mid[1], min[2]),
                                                Vector3(max[0], max[1], mid[2]));
                        break;
+
                case 7:
                        octant.init(Vector3(min[0], mid[1], min[2]),
                                                Vector3(mid[0], max[1], mid[2]));
@@ -138,9 +145,9 @@ void Aabb::draw(Scalar alpha) const
        glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
 }
 
-bool Aabb::isVisible(const Camera& cam) const
+bool Aabb::isVisible(const Frustum& frustum) const
 {
-       return cam.getFrustum().containsAabb(*this);
+       return frustum.contains(*this);
 }