X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2Fmoof%2Ffrustum.hh;h=8386d702a824d956a87b6a572613d9e4257d0c38;hp=1e44701402577b26c2edc29c3c1dc948a717d471;hb=44b3014bce798789e795242d1556cb7449e6386a;hpb=831f04d4bc19a390415ac0bbac4331c7a65509bc

diff --git a/src/moof/frustum.hh b/src/moof/frustum.hh
index 1e44701..8386d70 100644
--- a/src/moof/frustum.hh
+++ b/src/moof/frustum.hh
@@ -1,36 +1,33 @@
 
-/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+/*]  Copyright (c) 2009-2011, 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>
+
+
 /**
  * \file frustum.hh
  * All things related to frustums!
  */
 	
-#include <moof/math.hh>
-#include <moof/plane.hh>
-
-
 namespace moof {
 
 
 template <int D> class aabb;
 template <int D> class sphere;
 
-
 /**
- * A six-sided volume for representing the space visible by a position
- * looking outward.
+ * A six-sided volume for representing the space visible by a position looking
+ * outward.
  */
 class frustum
 {
@@ -38,8 +35,8 @@ public:
 
 	enum collision
 	{
-		outside			= 0,
-		inside			= 1,
+		outside		= 0,
+		inside		= 1,
 		intersecting	= 2
 	};
 
@@ -56,12 +53,11 @@ public:
 
 	void init(const matrix4& modelview, const matrix4& projection);
 	void init(const matrix4& modelview, scalar fovy, scalar aspect,
-			  scalar abutting, scalar distant);
+			scalar abutting, scalar distant);
 
 	collision contains(const aabb<3>& aabb) const;
 	collision contains(const sphere<3>& sphere) const;
 
-
 private:
 
 	plane planes_[6]; // left, right, bottom, top, near, far