X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FFrustum.hh;h=5710004c58989115622b779fedfcdfb9096279c3;hp=82eba17140a0bcf6ecdb1e644d4969df0eb7ec82;hb=00612586426be6d9a976f141a25ffc1f0d284501;hpb=29e3d45f7bbbf31eadf793c41ff2b3d9c47b7539

diff --git a/src/Moof/Frustum.hh b/src/Moof/Frustum.hh
index 82eba17..5710004 100644
--- a/src/Moof/Frustum.hh
+++ b/src/Moof/Frustum.hh
@@ -1,50 +1,56 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #ifndef _MOOF_FRUSTUM_HH_
 #define _MOOF_FRUSTUM_HH_
 	
+#include <Moof/Math.hh>
 #include <Moof/Plane.hh>
 
 
 namespace Mf {
 
 
+template <int D> class Aabb;
+template <int D> class Sphere;
+
 class Frustum
 {
-	Matrix4 projection;
-	//Plane left, right, bottom, top, near, far;
+	Plane	mPlanes[6]; // 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);
-
-	const Matrix4& getMatrix() const;
+	typedef enum
+	{
+		OUTSIDE		= 0,
+		INSIDE		= 1,
+		INTERSECT	= 2
+	} Collision;
+
+	Frustum() {}
+	Frustum(const Matrix4& modelview, const Matrix4& projection)
+	{
+		init(modelview, projection);
+	}
+	Frustum(const Matrix4& modelview, Scalar fovy, Scalar aspect,
+			Scalar abutting, Scalar distant)
+	{
+		init(modelview, fovy, aspect, abutting, distant);
+	}
+
+	void init(const Matrix4& modelview, const Matrix4& projection);
+	void init(const Matrix4& modelview, Scalar fovy, Scalar aspect,
+			  Scalar abutting, Scalar distant);
+
+	Collision contains(const Aabb<3>& aabb) const;
+	Collision contains(const Sphere<3>& sphere) const;
 };
 
 
@@ -52,5 +58,3 @@ public:
 
 #endif // _MOOF_FRUSTUM_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-