X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2Fmoof%2Fshape.hh;h=1d6d73674606cf945596bb9bc8bd9ab3338bde00;hp=25c8c2aa5c43c201436b9708f4042c3a6d4ad28e;hb=HEAD;hpb=85783316365181491a3e3c0c63659972477cebba

diff --git a/src/moof/shape.hh b/src/moof/shape.hh
index 25c8c2a..1d6d736 100644
--- a/src/moof/shape.hh
+++ b/src/moof/shape.hh
@@ -1,44 +1,42 @@
 
-/*]  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_SHAPE_HH_
 #define _MOOF_SHAPE_HH_
 
-/**
- * \file shape.hh
- * Declares an interface for shapes.
- */
-
 #include <moof/drawable.hh>
 #include <moof/math.hh>
 #include <moof/opengl.hh>
 #include <moof/ray.hh>
 
 
+/**
+ * \file shape.hh
+ * Declares an interface for shapes.
+ */
+
 // frustum
 // plane (can construct from triangle2)
 // ray
 // shape<>
 // +- line<>
-// -   line2			line<2>
-// -   line3			line<3>
+// -   line2		line<2>
+// -   line3		line<3>
 // +- sphere<>
 // |   sphere2, circle	sphere<2>
-// |   sphere3			sphere<3>
+// |   sphere3		sphere<3>
 // +- aabb<>
 // |   aabb2, rectangle	aabb<2>
-// |   aabb3			aabb<3>
+// |   aabb3		aabb<3>
 // +- polygon<>
-// |   triangle2		polygon<2,3>
-// |   triangle3		polygon<3,3>
+// |   triangle2	polygon<2,3>
+// |   triangle3	polygon<3,3>
 
 
 namespace moof {
@@ -58,15 +56,14 @@ public:
 	 * returned if there is no contact.
 	 */
 	virtual bool intersect_ray(const ray<D>& ray,
-							   typename moof::ray<D>::contact& hit) const
+			typename moof::ray<D>::contact& hit) const
 	{
 		return false;
 	}
 };
 
-
-typedef shape<2>	shape2;
-typedef shape<3>	shape3;
+typedef shape<2> shape2;
+typedef shape<3> shape3;
 
 
 } // namespace moof