revamped scene drawing in preparation for octree

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

diff --git a/src/Moof/Frustum.hh b/src/Moof/Frustum.hh
index 82eba17140a0bcf6ecdb1e644d4969df0eb7ec82..ac2b353e263409f1be648a60854f249fc263ff9b 100644 (file)
--- a/src/Moof/Frustum.hh
+++ b/src/Moof/Frustum.hh
@@ -35,16 +35,31 @@
 namespace Mf {
 
 
+class Aabb;
+
 class Frustum
 {
-       Matrix4 projection;
-       //Plane left, right, bottom, top, near, far;
+       //Matrix4 projection;
+       Plane left, right, bottom, top, near, far;
 
 public:
-       Frustum(Scalar l, Scalar r, Scalar b, Scalar t, Scalar n, Scalar f);
-       Frustum(Scalar fovy, Scalar aspect, Scalar near, Scalar far);
+       typedef enum
+       {
+               OUTSIDE         = 0,
+               INSIDE          = 1,
+               INTERSECT       = 2
+       } Collision;
+
+       //Frustum() {}
+       //Frustum(Scalar l, Scalar r, Scalar b, Scalar t, Scalar n, Scalar f);
+       //Frustum(Scalar fovy, Scalar aspect, Scalar near, Scalar far);
+
+       inline Collision checkAabb(const Aabb& aabb) const
+       {
+               return INSIDE;
+       }
 
-       const Matrix4& getMatrix() const;
+       //const Matrix4& getMatrix() const;
 };