--- ray/src/rt/rcontrib.h	2012/06/10 05:25:42	2.2
+++ ray/src/rt/rcontrib.h	2014/07/19 20:03:03	2.11
@@ -1,9 +1,12 @@
-/* RCSid $Id: rcontrib.h,v 2.2 2012/06/10 05:25:42 greg Exp $ */
+/* RCSid $Id: rcontrib.h,v 2.11 2014/07/19 20:03:03 greg Exp $ */
 
 /*
  * Header file for rcontrib modules
  */
 
+#include "platform.h"
+#include "paths.h"
+#include "rtprocess.h"
 #include "ray.h"
 #include "func.h"
 #include "lookup.h"
@@ -36,8 +39,8 @@ extern int		account;	/* current accumulation count */
 extern RNUMBER		raysleft;	/* number of rays left to trace */
 extern long		waitflush;	/* how long until next flush */
 
-extern int		lastray;	/* last ray number sent */
-extern int		lastdone;	/* last ray processed */
+extern RNUMBER		lastray;	/* last ray number sent */
+extern RNUMBER		lastdone;	/* last ray processed */
 
 typedef double		DCOLOR[3];	/* double-precision color */
 
@@ -54,6 +57,7 @@ typedef double		DCOLOR[3];	/* double-precision color *
 typedef struct {
 	const char	*outspec;	/* output file specification */
 	const char	*modname;	/* modifier name */
+	const char	*params;	/* parameter list */
 	EPNODE		*binv;		/* bin value expression */
 	int		nbins;		/* number of contribution bins */
 	DCOLOR		cbin[1];	/* contribution bins (extends struct) */
@@ -85,17 +89,12 @@ extern LUTAB		ofiletab;	/* output stream table */
 #ifndef	MAXMODLIST
 #define	MAXMODLIST	2048		/* maximum modifiers we'll track */
 #endif
-#ifndef  MAXTSET
-#define	 MAXTSET	16383		/* maximum number in trace set */
-#endif
 
 extern const char	*modname[MAXMODLIST];	/* ordered modifier name list */
 extern int		nmods;			/* number of modifiers */
 
 extern char		RCCONTEXT[];		/* special evaluation context */
 
-extern void		tranotify(OBJECT obj);	/* new trace modifier */
-
 extern char		*formstr(int f);	/* return format identifier */
 
 extern void		process_rcontrib(void);	/* trace ray contributions */
@@ -106,10 +105,12 @@ extern STREAMOUT *	getostream(const char *ospec, const
 extern void		mod_output(MODCONT *mp);
 extern void		end_record(void);
 
+extern void		set_eparams(char *prms);
+
 extern MODCONT		*addmodifier(char *modn, char *outf,
-						char *binv, int bincnt);
+					char *prms, char *binv, int bincnt);
 extern void		addmodfile(char *fname, char *outf,
-						char *binv, int bincnt);
+					char *prms, char *binv, int bincnt);
 
 extern void		reload_output(void);
 extern void		recover_output(void);
@@ -117,11 +118,12 @@ extern void		recover_output(void);
 extern int		getvec(FVECT vec);
 
 extern int		in_rchild(void);
-extern void		end_children(void);
+extern void		end_children(int immed);
 
 extern void		put_zero_record(int ndx);
-extern void		queue_modifiers(void);
 
 extern void		parental_loop(void);	/* controlling process */
+
+extern void		feeder_loop(void);	/* feeder process */
 
 extern void		rcontrib(void);		/* main calculation loop */