--- ray/src/rt/ray.h	2003/06/26 00:58:10	2.18
+++ ray/src/rt/ray.h	2003/08/28 03:22:16	2.21
@@ -1,24 +1,19 @@
-/* RCSid $Id: ray.h,v 2.18 2003/06/26 00:58:10 schorsch Exp $ */
+/* RCSid $Id: ray.h,v 2.21 2003/08/28 03:22:16 greg 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 */
@@ -46,8 +41,8 @@ typedef struct ray {
 	int	rsrc;		/* source we're aiming for */
 	OBJECT	*clipset;	/* set of objects currently clipped */
 	OBJECT	*newcset;	/* next clipset, used for transmission */
-	void	(*revf)();	/* evaluation function for this ray */
-	void	(*hitf)();	/* custom hit test for this traversal */
+	void	(*revf)(struct ray *);	/* evaluation function for this ray */
+	void	(*hitf)(OBJECT *, struct ray *);	/* custom hit test */
 	OBJECT	robj;		/* intersected object number */
  	OBJREC	*ro;		/* intersected object (one with material) */
 	double	rot;		/* distance to object */