X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2Fmoof%2Fray.hh;h=b992903b8bb2d892bf853af68d409d1e136363fa;hp=9413f0daba240cbeb88d0d15d4a65dde605365d6;hb=574af38ed616d1adfa5e6ce35f67cda1f707f89d;hpb=831f04d4bc19a390415ac0bbac4331c7a65509bc

diff --git a/src/moof/ray.hh b/src/moof/ray.hh
index 9413f0d..b992903 100644
--- a/src/moof/ray.hh
+++ b/src/moof/ray.hh
@@ -1,13 +1,11 @@
 
-/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+/*]  Copyright (c) 2009-2011, 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_
@@ -19,9 +17,9 @@
  */
 
 #include <moof/drawable.hh>
+#include <moof/image.hh>
 #include <moof/math.hh>
 #include <moof/opengl.hh>
-#include <moof/texture.hh>
 
 
 namespace moof {
@@ -60,7 +58,7 @@ struct ray : public drawable
 		vector end = point + 1000.0 * direction;
 		// FIXME: this is kinda cheesy
 
-		moof::texture::reset_binding();
+		image::reset_binding();
 		glBegin(GL_LINES);
 			glVertex(point);
 			glVertex(end);
@@ -73,9 +71,8 @@ struct ray : public drawable
 	}
 };
 
-
-typedef ray<2>	ray2;
-typedef ray<3>	ray3;
+typedef ray<2> ray2;
+typedef ray<3> ray3;
 
 
 } // namespace moof