X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FLine.hh;h=f8a2b66111f34a6de84a480fe461cd118064b77e;hp=a88405effe417bf8d3329dc362e3ae64038f6826;hb=76b3f4be992514a740ac03cdbdd57844142a0b4c;hpb=7f3984f3f9524f5b6813e01ceb2fe576dadff94e

diff --git a/src/Moof/Line.hh b/src/Moof/Line.hh
index a88405e..f8a2b66 100644
--- a/src/Moof/Line.hh
+++ b/src/Moof/Line.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_LINE_HH_
 #define _MOOF_LINE_HH_
@@ -33,10 +16,9 @@
 #include <Moof/Math.hh>
 #include <Moof/OpenGL.hh>
 #include <Moof/Ray.hh>
+#include <Moof/Shape.hh>
 #include <Moof/Texture.hh>
 
-#include <Moof/Log.hh>
-
 
 namespace Mf {
 
@@ -56,7 +38,7 @@ struct Line : public Drawable, public Shape<D>
 		a(point1),
 		b(point2) {}
 
-	bool intersectRay(const Ray<2>& ray, Ray<2>::Intersection& hit) const
+	bool intersectRay(const Ray<2>& ray, Ray<2>::Contact& hit) const
 	{
 		// solve: Cx + r*Dx = Ax + s(Bx - Ax)
 		//        Cy + r*Dy = Ay + s(By - Ay)
@@ -97,6 +79,8 @@ struct Line : public Drawable, public Shape<D>
 		hit.distance = -(a[0] * (ray.point[1] - b[1]) +
 						 b[0] * (a[1] - ray.point[1]) +
 						 ray.point[0] * (b[1] - a[1])) / denom;
+
+		// check if the intersection is behind the ray
 		if (hit.distance < SCALAR(0.0)) return false;
 
 		Vector normal = cml::perp(a - b);
@@ -116,18 +100,42 @@ struct Line : public Drawable, public Shape<D>
 };
 
 
+typedef Line<2>		Line2;
+typedef Line<3>		Line3;
+
+
 template <int D, int N>
-struct Polygon : public Shape<D>
+struct Polygon : public Drawable, public Shape<D>
 {
 	typedef cml::vector< Scalar, cml::fixed<D> > Vector;
 
 	Vector	points[N];
+
+	Polygon() {}
+
+	bool intersectRay(const Ray<D>& ray, typename Ray<D>::Contact& hit)
+	{
+		return false;
+	}
+
+	void draw(Scalar alpha = 0.0) const
+	{
+		Mf::Texture::resetBind();
+		glBegin(GL_POLYGON);
+		for (int i = 0; i < D; ++i)
+		{
+			glVertex(points[0]);
+		}
+		glEnd();
+	}
 };
 
 
+typedef Polygon<2,3>	Triangle2;
+typedef Polygon<3,3>	Triangle3;
+
+
 } // namespace Mf
 
 #endif // _MOOF_LINE_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-