X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2Fmoof%2Fshape.hh;fp=src%2Fmoof%2Fshape.hh;h=9af106bf424831e4808956631b647946d4be6947;hp=25c8c2aa5c43c201436b9708f4042c3a6d4ad28e;hb=574af38ed616d1adfa5e6ce35f67cda1f707f89d;hpb=6c9943707d4f33035830eba0587a61a34eaecbc2 diff --git a/src/moof/shape.hh b/src/moof/shape.hh index 25c8c2a..9af106b 100644 --- a/src/moof/shape.hh +++ b/src/moof/shape.hh @@ -1,13 +1,11 @@ -/*] 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_ @@ -22,23 +20,22 @@ #include #include - // 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 +55,14 @@ public: * returned if there is no contact. */ virtual bool intersect_ray(const ray& ray, - typename moof::ray::contact& hit) const + typename moof::ray::contact& hit) const { return false; } }; - -typedef shape<2> shape2; -typedef shape<3> shape3; +typedef shape<2> shape2; +typedef shape<3> shape3; } // namespace moof