X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FFrustum.cc;h=e56fb7bec94a1056433c91fc2c6c5b8fb980e66f;hp=4dc63400618883b95e877c2e288c724e7e0fdfe1;hb=41f8dd670e963aad94527ce2be0486268993a477;hpb=72d4af22710317acffab861421c4364b1780b6fe

diff --git a/src/Moof/Frustum.cc b/src/Moof/Frustum.cc
index 4dc6340..e56fb7b 100644
--- a/src/Moof/Frustum.cc
+++ b/src/Moof/Frustum.cc
@@ -1,30 +1,13 @@
 
-/*******************************************************************************
-
- 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.
+*
+**************************************************************************/
 
 #include <Moof/Aabb.hh>
 #include <Moof/Frustum.hh>
@@ -39,28 +22,34 @@ void Frustum::init(const Matrix4& modelview, const Matrix4& projection)
 	Scalar planes[6][4];
 
 	cml::extract_frustum_planes(modelview, projection, planes,
-			cml::z_clip_neg_one);
-
-	planes_[0] = Plane(planes[0][0], planes[0][1], planes[0][2], planes[0][3]);
-	planes_[1] = Plane(planes[1][0], planes[1][1], planes[1][2], planes[1][3]);
-	planes_[2] = Plane(planes[2][0], planes[2][1], planes[2][2], planes[2][3]);
-	planes_[3] = Plane(planes[3][0], planes[3][1], planes[3][2], planes[3][3]);
-	planes_[4] = Plane(planes[4][0], planes[4][1], planes[4][2], planes[4][3]);
-	planes_[5] = Plane(planes[5][0], planes[5][1], planes[5][2], planes[5][3]);
+								cml::z_clip_neg_one);
+
+	mPlanes[0] = Plane(planes[0][0], planes[0][1],
+					   planes[0][2], planes[0][3]);
+	mPlanes[1] = Plane(planes[1][0], planes[1][1],
+					   planes[1][2], planes[1][3]);
+	mPlanes[2] = Plane(planes[2][0], planes[2][1],
+					   planes[2][2], planes[2][3]);
+	mPlanes[3] = Plane(planes[3][0], planes[3][1],
+					   planes[3][2], planes[3][3]);
+	mPlanes[4] = Plane(planes[4][0], planes[4][1],
+					   planes[4][2], planes[4][3]);
+	mPlanes[5] = Plane(planes[5][0], planes[5][1],
+					   planes[5][2], planes[5][3]);
 }
 
 void Frustum::init(const Matrix4& modelview, Scalar fovy, Scalar aspect,
-		Scalar near, Scalar far)
+				   Scalar abutting, Scalar distant)
 {
 	Matrix4 projection;
 
-	cml::matrix_perspective_yfov_RH(projection, fovy, aspect, near, far,
-			cml::z_clip_neg_one);
+	cml::matrix_perspective_yfov_RH(projection, fovy, aspect, abutting,
+									distant, cml::z_clip_neg_one);
 
 	init(modelview, projection);
 }
 
-Frustum::Collision Frustum::containsAabb(const Aabb& aabb) const
+Frustum::Collision Frustum::contains(const Aabb<3>& aabb) const
 {
 	Vector3 corners[8];
 	int nTotalInside = 0;
@@ -73,8 +62,7 @@ Frustum::Collision Frustum::containsAabb(const Aabb& aabb) const
 
 		for (int j = 0; j < 8; ++j)
 		{
-			if (planes_[i].intersectsPoint(corners[j]) ==
-					Plane::NEGATIVE)
+			if (mPlanes[i].intersects(corners[j]) == Plane::NEGATIVE)
 			{
 				--nInside;
 			}
@@ -89,11 +77,11 @@ Frustum::Collision Frustum::containsAabb(const Aabb& aabb) const
 }
 
 
-Frustum::Collision Frustum::containsSphere(const Sphere& sphere) const
+Frustum::Collision Frustum::contains(const Sphere<3>& sphere) const
 {
 	for (int i = 0; i < 6; ++i)
 	{
-		Plane::Halfspace halfspace = planes_[i].intersectsSphere(sphere);
+		Plane::Halfspace halfspace = mPlanes[i].intersects(sphere);
 		
 		if (halfspace == Plane::NEGATIVE)       return OUTSIDE;
 		else if (halfspace == Plane::INTERSECT) return INTERSECT;
@@ -105,5 +93,3 @@ Frustum::Collision Frustum::containsSphere(const Sphere& sphere) const
 
 } // namespace Mf
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-