--- ray/src/gen/mkillum.h	2003/11/21 07:15:30	2.6
+++ ray/src/gen/mkillum.h	2007/09/13 17:52:35	2.9
@@ -1,13 +1,12 @@
-/* RCSid: $Id: mkillum.h,v 2.6 2003/11/21 07:15:30 greg Exp $ */
+/* RCSid: $Id: mkillum.h,v 2.9 2007/09/13 17:52:35 greg Exp $ */
 /*
  * Common definitions for mkillum
  */
 #ifndef _RAD_MKILLUM_H_
 #define _RAD_MKILLUM_H_
 
-#include  "standard.h"
-#include  "object.h"
-#include  "rtprocess.h"
+#include  "ray.h"
+#include  "otypes.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -27,30 +26,26 @@ struct illum_args {
 	int	sampdens;		/* point sample density */
 	int	nsamps;			/* # of samples in each direction */
 	float	minbrt;			/* minimum average brightness */
-	float	col[3];			/* computed average color */
+	COLOR	col;			/* computed average color */
 };				/* illum options */
 
-struct rtproc {
-	SUBPROC pd;			/* rtrace pipe descriptors */
-	float	*buf;			/* rtrace i/o buffer */
-	int	bsiz;			/* maximum rays for rtrace buffer */
-	float	**dest;			/* destination for each ray result */
-	int	nrays;			/* current length of rtrace buffer */
-};				/* rtrace process */
+extern void printobj(char *mod, register OBJREC *obj);
+extern int average(register struct illum_args *il, COLORV *da, int n);
+extern void flatout(struct illum_args *il, COLORV *da, int n, int m,
+	FVECT u, FVECT v, FVECT w);
+extern void illumout(register struct illum_args *il, OBJREC *ob);
+extern void roundout(struct illum_args *il, COLORV *da, int n, int m);
 
-extern void printobj(char  *mod, register OBJREC  *obj);
-extern int average(register struct illum_args  *il, float  *da, int  n);
-extern void flatout(struct illum_args  *il, float  *da, int  n, int  m,
-	FVECT  u, FVECT  v, FVECT  w);
-extern void illumout(register struct illum_args  *il, OBJREC  *ob);
-extern void roundout(struct illum_args  *il, float  *da, int  n, int  m);
+extern int my_default(OBJREC *, struct illum_args *, char *);
+extern int my_face(OBJREC *, struct illum_args *, char *);
+extern int my_sphere(OBJREC *, struct illum_args *, char *);
+extern int my_ring(OBJREC *, struct illum_args *, char *);
 
+extern char	*progname;
+
 #ifdef __cplusplus
 }
 #endif
-
-#define FUN_ARGLIST	OBJREC *, struct illum_args *, struct rtproc *, char *
-#include  "otypes.h"
 
 #endif /* _RAD_MKILLUM_H_ */