--- ray/src/gen/mkillum.h	1991/07/25 10:59:03	1.4
+++ ray/src/gen/mkillum.h	2007/09/13 17:52:35	2.9
@@ -1,17 +1,16 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
-/* SCCSid "$SunId$ LBL" */
-
+/* 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  "ray.h"
 #include  "otypes.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 				/* illum flags */
 #define  IL_LIGHT	0x1		/* light rather than illum */
 #define  IL_COLDST	0x2		/* use color distribution */
@@ -26,13 +25,27 @@ struct illum_args {
 	char	altmat[MAXSTR];		/* alternate material name */
 	int	sampdens;		/* point sample density */
 	int	nsamps;			/* # of samples in each direction */
-	float	col[3];			/* computed average color */
+	float	minbrt;			/* minimum average brightness */
+	COLOR	col;			/* computed average color */
 };				/* illum options */
 
-struct rtproc {
-	int	pd[3];			/* 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 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
+
+#endif /* _RAD_MKILLUM_H_ */
+