--- ray/src/rt/rcontrib.h	2012/06/15 00:57:40	2.4
+++ ray/src/rt/rcontrib.h	2016/09/12 20:31:34	2.15
@@ -1,9 +1,12 @@
-/* RCSid $Id: rcontrib.h,v 2.4 2012/06/15 00:57:40 greg Exp $ */
+/* RCSid $Id: rcontrib.h,v 2.15 2016/09/12 20:31:34 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"
@@ -54,7 +57,9 @@ 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		bin0;		/* starting bin offset */
 	int		nbins;		/* number of contribution bins */
 	DCOLOR		cbin[1];	/* contribution bins (extends struct) */
 } MODCONT;			/* modifier contribution */
@@ -75,7 +80,7 @@ typedef struct {
 extern LUTAB		ofiletab;	/* output stream table */
 
 #ifndef MAXPROCESS
-#ifdef _WIN32
+#if defined(_WIN32) || defined(_WIN64)
 #define MAXPROCESS	1
 #else
 #define MAXPROCESS	128
@@ -83,7 +88,7 @@ extern LUTAB		ofiletab;	/* output stream table */
 #endif
 
 #ifndef	MAXMODLIST
-#define	MAXMODLIST	2048		/* maximum modifiers we'll track */
+#define	MAXMODLIST	10000		/* maximum modifiers we'll track */
 #endif
 
 extern const char	*modname[MAXMODLIST];	/* ordered modifier name list */
@@ -102,9 +107,9 @@ extern void		mod_output(MODCONT *mp);
 extern void		end_record(void);
 
 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);
@@ -112,11 +117,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 */