--- ray/src/rt/ray.h	2003/06/27 06:53:22	2.19
+++ ray/src/rt/ray.h	2004/11/05 17:36:55	2.23
@@ -1,21 +1,19 @@
-/* RCSid $Id: ray.h,v 2.19 2003/06/27 06:53:22 greg Exp $ */
+/* RCSid $Id: ray.h,v 2.23 2004/11/05 17:36:55 greg Exp $ */
 /*
  *  ray.h - header file for routines using rays.
  */
 #ifndef _RAD_RAY_H_
 #define _RAD_RAY_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 #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 */
@@ -43,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 */
@@ -121,8 +119,10 @@ extern int	ambincl;	/* include == 1, exclude == 0 */
 extern int	ray_pnprocs;	/* number of child processes */
 extern int	ray_pnidle;	/* number of idle processes */
 
-#define AMBLLEN		128	/* max. ambient list length */
-#define AMBWORD		8	/* average word length */
+#ifndef AMBLLEN
+#define AMBLLEN		512	/* max. ambient list length */
+#endif
+#define AMBWORD		12	/* average word length */
 
 typedef struct {		/* rendering parameter holder */
 	int	do_irrad;
@@ -162,6 +162,8 @@ typedef struct {		/* rendering parameter holder */
 extern void	headclean(void);
 extern void	openheader(void);
 extern void	dupheader(void);
+					/* defined in persist.c */
+extern void persistfile(char *pfn);
 extern void	pfdetach(void);
 extern void	pfclean(void);
 extern void	pflock(int lf);
@@ -210,8 +212,12 @@ extern void	print_rdefaults(void);
 					/* defined in srcdraw.c */
 extern void	drawsources(COLOR *pic[], float *zbf[],
 			int x0, int xsiz, int y0, int ysiz);
+extern void init_drawsources(int rad);
+					/* defined in rt/initotypes.c */
+extern void initotypes(void);
 					/* module main procedures */
 extern void	rtrace(char *fname);
+extern char * formstr(int  f);
 extern void	rview(void);
 extern void	rpict(int seq, char *pout, char *zout, char *prvr);