--- ray/src/rt/ray.h	2003/06/07 00:54:58	2.17
+++ ray/src/rt/ray.h	2003/07/14 22:24:00	2.20
@@ -1,24 +1,19 @@
-/* RCSid $Id: ray.h,v 2.17 2003/06/07 00:54:58 schorsch Exp $ */
+/* RCSid $Id: ray.h,v 2.20 2003/07/14 22:24:00 schorsch Exp $ */
 /*
  *  ray.h - header file for routines using rays.
  */
 #ifndef _RAD_RAY_H_
 #define _RAD_RAY_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
 
-
-#include "copyright.h"
-
 #include  "standard.h"
-
 #include  "octree.h"
-
 #include  "object.h"
-
 #include  "color.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define  MAXDIM		32	/* maximum number of dimensions */
 
 				/* ray type flags */
@@ -55,7 +50,7 @@ typedef struct ray {
 	FVECT	ron;		/* intersection surface normal */
 	double	rod;		/* -DOT(rdir, ron) */
 	FULLXF	*rox;		/* object transformation */
-	FLOAT	uv[2];		/* local coordinates */
+	RREAL	uv[2];		/* local coordinates */
 	FVECT	pert;		/* surface normal perturbation */
 	COLOR	pcol;		/* pattern color */
 	COLOR	rcol;		/* returned ray value */