X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fmoof%2Fline.hh;h=0ba6bb368c6d56b628ed8ec9a38862fb91e0abac;hb=6f1b787a10d8ab1a3117a4b8c004dd2d90599608;hp=b40e7cf8c7c8190c9bb59ef5c8d566cda17edc65;hpb=831f04d4bc19a390415ac0bbac4331c7a65509bc;p=chaz%2Fyoink

diff --git a/src/moof/line.hh b/src/moof/line.hh
index b40e7cf..0ba6bb3 100644
--- a/src/moof/line.hh
+++ b/src/moof/line.hh
@@ -19,13 +19,13 @@
 
 #include <moof/contact.hh>
 #include <moof/drawable.hh>
+#include <moof/image.hh>
 #include <moof/log.hh>
 #include <moof/math.hh>
 #include <moof/opengl.hh>
 #include <moof/ray.hh>
 #include <moof/shape.hh>
 #include <moof/sphere.hh>
-#include <moof/texture.hh>
 
 
 namespace moof {
@@ -138,7 +138,7 @@ struct line : public drawable, public shape<D>
 	}
 
 
-	bool intersect_ray(const ray<2>& ray, ray<2>::contact& hit) const
+	bool intersect_ray(const ray<2>& ray, moof::ray<2>::contact& hit) const
 	{
 		vector2	v1 = a - ray.point;
 		scalar	a1 = signed_angle_2D(v1, b - ray.point);
@@ -225,7 +225,7 @@ struct line : public drawable, public shape<D>
 
 	void draw(scalar alpha = 0.0) const
 	{
-		texture::reset_binding();
+		image::reset_binding();
 		glBegin(GL_LINES);
 			glVertex(a);
 			glVertex(b);
@@ -247,14 +247,15 @@ struct polygon : public drawable, public shape<D>
 
 	polygon() {}
 
-	bool intersect_ray(const ray<D>& ray, typename ray<D>::contact& hit)
+	bool intersect_ray(const ray<D>& ray,
+					   typename moof::ray<D>::contact& hit)
 	{
 		return false;
 	}
 
 	void draw(scalar alpha = 0.0) const
 	{
-		texture::reset_binding();
+		image::reset_binding();
 		glBegin(GL_POLYGON);
 		for (int i = 0; i < D; ++i)
 		{