X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FRay.hh;h=6d4705a81d4f24998597c17617e95f309caeb231;hp=5a693d29be996da95d2065b3e617ad971971a6cc;hb=2f239b9ba2a556a5ca810cfffc60552a56a4fe86;hpb=b357615aba1dbde81e3c6999366604e6001010a7

diff --git a/src/Moof/Ray.hh b/src/Moof/Ray.hh
index 5a693d2..6d4705a 100644
--- a/src/Moof/Ray.hh
+++ b/src/Moof/Ray.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_RAY_HH_
 #define _MOOF_RAY_HH_
@@ -51,12 +34,12 @@ struct Ray : public Drawable
 	Vector	point;
 	Vector	direction;
 
-	struct Intersection
+	struct Contact
 	{
 		Scalar	distance;	// distance from the origin to the nearest point
-		Vector	normal;		// surface normal at intersection point
+		Vector	normal;		// surface normal at contact point
 
-		bool operator < (const Intersection& rhs)
+		bool operator < (const Contact& rhs)
 		{
 			return distance < rhs.distance;
 		}
@@ -70,7 +53,7 @@ struct Ray : public Drawable
 	void draw(Scalar alpha = 0.0) const
 	{
 		Vector end = point + 1000.0 * direction;
-		// TODO this is kinda cheesy
+		// FIXME this is kinda cheesy
 
 		Mf::Texture::resetBind();
 		glBegin(GL_LINES);
@@ -86,9 +69,11 @@ struct Ray : public Drawable
 };
 
 
+typedef Ray<2>	Ray2;
+typedef Ray<3>	Ray3;
+
+
 } // namespace Mf
 
 #endif // _MOOF_RAY_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-