pch support

[chaz/yoink] / src / moof / ray.hh

diff --git a/src/moof/ray.hh b/src/moof/ray.hh
index 9413f0daba240cbeb88d0d15d4a65dde605365d6..71d1e7a96a40d58e67f0ba73b350aca85047c7e8 100644 (file)
--- a/src/moof/ray.hh
+++ b/src/moof/ray.hh
@@ -1,29 +1,27 @@
 
-/*]  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_
 
+#include <moof/drawable.hh>
+#include <moof/image.hh>
+#include <moof/math.hh>
+#include <moof/opengl.hh>
+
+
 /**
  * \file ray.hh
  * A class for lines that start at one point and go to infinity in some
  * direction.
  */
 
-#include <moof/drawable.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