X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMoof%2FShape.hh;h=c97296004b7a80aa73d5ff3594ed4ae658b38c40;hb=b714ba98cb92a1be42acba91d44fe5bfb0783a3b;hp=b78eaade7179cd9e5a2a9274509984dabaf89c10;hpb=2d77fb5fb3480f522658f30af6addd5146530517;p=chaz%2Fyoink

diff --git a/src/Moof/Shape.hh b/src/Moof/Shape.hh
index b78eaad..c972960 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_
@@ -58,14 +41,18 @@ namespace Mf {
 template <int D>
 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 intersection via the 2nd parameter.  A negative value is
+	 * returned if there is no intersection.
 	 */
-	virtual Scalar intersectRay(const Ray<D>& ray,
-			typename Ray<D>::Intersection& intersection)
+	virtual bool intersectRay(const Ray<D>& ray,
+							  typename Ray<D>::Intersection& hit)
 	{
 		return SCALAR(-1.0);
 	}
@@ -76,5 +63,3 @@ class Shape
 
 #endif // _MOOF_SHAPE_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-