X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FShape.hh;h=d21e84d464d8f3c4cca0788d76e2c167b8a11ced;hp=c67a7798772e78b5e4992ba39b59e3c75b3428c9;hb=2f239b9ba2a556a5ca810cfffc60552a56a4fe86;hpb=7e84479de612a4ce287c6f63deb014b447a993ec

diff --git a/src/Moof/Shape.hh b/src/Moof/Shape.hh
index c67a779..d21e84d 100644
--- a/src/Moof/Shape.hh
+++ b/src/Moof/Shape.hh
@@ -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.
+*
+**************************************************************************/
 
 #ifndef _MOOF_SHAPE_HH_
 #define _MOOF_SHAPE_HH_
@@ -36,20 +19,21 @@
 
 
 // Frustum
-// Plane (can construct from Triangle<3>)
+// Plane (can construct from Triangle3)
 // Ray
 // Shape<>
 // +- Line<>
-// +- Ball<>
-// |  Circle		<- Ball<2>
-// |  Sphere		<- Ball<3>
-// +- Box<>
-// |  Rectangle		<- Box<2>
-// |  Aabb			<- Box<3>
+// -   Line2			Line<2>
+// -   Line3			Line<3>
+// +- Sphere<>
+// |   Sphere2, Circle	Sphere<2>
+// |   Sphere3			Sphere<3>
+// +- Aabb<>
+// |   Aabb2, Rectangle	Aabb<2>
+// |   Aabb3			Aabb<3>
 // +- Polygon<>
-// |  Triangle		<- Polygon<3>
-// +- Cylinder
-// +- Cone
+// |   Triangle2		Polygon<2,3>
+// |   Triangle3		Polygon<3,3>
 
 
 namespace Mf {
@@ -61,23 +45,26 @@ class Shape
 public:
 
 	virtual ~Shape() {}
+
 	/**
-	 * Checks if this shape is intersected by a given ray.  If so, returns the
-	 * distance from the start of the ray to the shape and information about the
-	 * intersection via the 2nd parameter.  A negative value is returned if
-	 * there is no intersection.
+	 * Checks if this shape is intersected by a given ray.  If so, returns
+	 * the distance from the start of the ray to the shape and information
+	 * about the contact via the 2nd parameter.  A negative value is
+	 * returned if there is no contact.
 	 */
-	virtual Scalar intersectRay(const Ray<D>& ray,
-			typename Ray<D>::Intersection& intersection)
+	virtual bool intersectRay(const Ray<D>& ray,
+							  typename Ray<D>::Contact& hit) const
 	{
-		return SCALAR(-1.0);
+		return false;
 	}
 };
 
 
+typedef Shape<2>	Shape2;
+typedef Shape<3>	Shape3;
+
+
 } // namespace Mf
 
 #endif // _MOOF_SHAPE_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-