--- ray/src/util/rfluxmtx.c	2014/08/26 19:10:10	2.18
+++ ray/src/util/rfluxmtx.c	2025/11/14 23:51:42	2.67
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rfluxmtx.c,v 2.18 2014/08/26 19:10:10 greg Exp $";
+static const char RCSid[] = "$Id: rfluxmtx.c,v 2.67 2025/11/14 23:51:42 greg Exp $";
 #endif
 /*
  * Calculate flux transfer matrix or matrices using rcontrib
@@ -18,26 +18,15 @@ static const char RCSid[] = "$Id: rfluxmtx.c,v 2.18 20
 #include "triangulate.h"
 #include "platform.h"
 
-#ifdef getc_unlocked		/* avoid horrendous overhead of flockfile */
-#undef getc
-#define getc    getc_unlocked
+#ifndef MAXRCARG
+#define MAXRCARG	10000
 #endif
 
-#ifdef _WIN32
-#define	SPECIALS	" \t\"$*?"
-#define QUOTCHAR	'"'
-#else
-#define SPECIALS	" \t\n'\"()${}*?[];|&"
-#define QUOTCHAR	'\''
-#define ALTQUOT		'"'
-#endif
+#define		NOWARN		1
+#define		VERBO		2
 
-#define MAXRCARG	512
+int		verbose = 0;		/* verbose/warning mode */
 
-char		*progname;		/* global argv[0] */
-
-int		verbose = 0;		/* verbose mode (< 0 no warnings) */
-
 char		*rcarg[MAXRCARG+1] = {"rcontrib", "-fo+"};
 int		nrcargs = 2;
 
@@ -53,9 +42,11 @@ char		*shirchiufn = "disk2square.cal";
 char		*kfullfn = "klems_full.cal";
 char		*khalffn = "klems_half.cal";
 char		*kquarterfn = "klems_quarter.cal";
+char		*ciefn = "cieskyscan.cal";
 
+char		*binjitter = NULL;
 					/* string indicating parameters */
-const char	PARAMSTART[] = "@rfluxmtx";
+#define	PARAMSTART	"@rfluxmtx"
 
 				/* surface type IDs */
 #define ST_NONE		0
@@ -78,19 +69,20 @@ typedef struct {
 	FVECT	uva[2];			/* tangent axes */
 	int	ntris;			/* number of triangles */
 	struct ptri {
-		float	afrac;			/* fraction of total area */
+		double	afrac;			/* fraction of total area */
 		short	vndx[3];		/* vertex indices */
 	}	tri[1];			/* triangle array (extends struct) */
 } POLYTRIS;			/* triangulated polygon */
 
 typedef struct param_s {
-	char		hemis[32];	/* hemispherical sampling spec. */
+	char		sign;		/* '-' for axis reversal */
+	char		hemis[31];	/* hemispherical sampling spec. */
 	int		hsiz;		/* hemisphere basis size */
 	int		nsurfs;		/* number of surfaces */
 	SURF		*slist;		/* list of surfaces */
 	FVECT		vup;		/* up vector (zero if unset) */
 	FVECT		nrm;		/* average normal direction */
-	FVECT		udir, vdir;	/* v-up tangent axes */
+	FVECT		udir, vdir;	/* tangent axes */
 	char		*outfn;		/* output file name (receiver) */
 	int		(*sample_basis)(struct param_s *p, int, FILE *);
 } PARAMS;			/* sender/receiver parameters */
@@ -108,7 +100,7 @@ SURFSAMP	*orig_in_surf[4] = {
 	};
 
 /* Clear parameter set */
-static void
+void
 clear_params(PARAMS *p, int reset_only)
 {
 	while (p->slist != NULL) {
@@ -119,6 +111,7 @@ clear_params(PARAMS *p, int reset_only)
 		free(sdel);
 	}
 	if (reset_only) {
+		p->slist = NULL;
 		p->nsurfs = 0;
 		memset(p->nrm, 0, sizeof(FVECT));
 		memset(p->vup, 0, sizeof(FVECT));
@@ -129,7 +122,7 @@ clear_params(PARAMS *p, int reset_only)
 }
 
 /* Get surface type from name */
-static int
+int
 surf_type(const char *otype)
 {
 	if (!strcmp(otype, "polygon"))
@@ -142,7 +135,7 @@ surf_type(const char *otype)
 }
 
 /* Add arguments to oconv command */
-static char *
+char *
 oconv_command(int ac, char *av[])
 {
 	static char	oconvbuf[2048] = "!oconv -f ";
@@ -151,72 +144,48 @@ oconv_command(int ac, char *av[])
 	
 	if (ac-- <= 0)
 		return(NULL);
-	while (ac-- > 0) {
-		strcpy(cp, *av++);
-		while (*cp) cp++;
-		*cp++ = ' ';
-		if (cp >= oconvbuf+(sizeof(oconvbuf)-32)) {
-			fputs(progname, stderr);
-			fputs(": too many file arguments!\n", stderr);
-			exit(1);
-		}
+	if (verbose & NOWARN) {	/* warnings off? */
+		strcpy(cp, "-w ");
+		cp += 3;
 	}
-	strcpy(cp, recv);	/* receiver goes last */
-	return(oconvbuf);
-}
-
-/* Check if any of the characters in str2 are found in str1 */
-static int
-matchany(const char *str1, const char *str2)
-{
-	while (*str1) {
-		const char	*cp = str2;
-		while (*cp)
-			if (*cp++ == *str1)
-				return(*str1);
-		++str1;
-	}
-	return(0);
-}
-
-
-/* Convert a set of arguments into a command line for pipe() or system() */
-static char *
-convert_commandline(char *cmd, const int len, char *av[])
-{
-	int	match;
-	char	*cp;
-
-	for (cp = cmd; *av != NULL; av++) {
-		const int	n = strlen(*av);
-		if (cp+n >= cmd+(len-3)) {
-			fputs(progname, stderr);
-			return(NULL);
-		}
-		if ((match = matchany(*av, SPECIALS))) {
-			const int	quote =
-#ifdef ALTQUOT
-				(match == QUOTCHAR) ? ALTQUOT :
-#endif
-					QUOTCHAR;
-			*cp++ = quote;
-			strcpy(cp, *av);
-			cp += n;
-			*cp++ = quote;
+	while (ac-- > 0) {	/* copy each argument */
+		int	len = strlen(*av);
+		if (cp+len+4 >= oconvbuf+sizeof(oconvbuf))
+			goto overrun;
+		if (matchany(*av, SPECIALS)) {
+			*cp++ = QUOTCHAR;
+			strcpy(cp, *av++);
+			cp += len;
+			*cp++ = QUOTCHAR;
 		} else {
-			strcpy(cp, *av);
-			cp += n;
+			strcpy(cp, *av++);
+			cp += len;
 		}
 		*cp++ = ' ';
 	}
-	if (cp <= cmd)
-		return(NULL);
-	*--cp = '\0';
-	return(cmd);
+				/* receiver goes last */
+	if (matchany(recv, SPECIALS)) {
+		*cp++ = QUOTCHAR;
+		while (*recv) {
+			if (cp >= oconvbuf+(sizeof(oconvbuf)-3))
+				goto overrun;
+			*cp++ = *recv++;
+		}
+		*cp++ = QUOTCHAR;
+		*cp = '\0';
+	} else
+		strcpy(cp, recv);
+	return(oconvbuf);
+overrun:
+	fputs(progname, stderr);
+	fputs(": too many file arguments!\n", stderr);
+	exit(1);
 }
 
+#if defined(_WIN32) || defined(_WIN64)
+
 /* Open a pipe to/from a command given as an argument list */
-static FILE *
+FILE *
 popen_arglist(char *av[], char *mode)
 {
 	char	cmd[10240];
@@ -226,15 +195,16 @@ popen_arglist(char *av[], char *mode)
 		fputs(": command line too long in popen_arglist()\n", stderr);
 		return(NULL);
 	}
-	if (verbose > 0)
+	if (verbose & VERBO)
 		fprintf(stderr, "%s: opening pipe %s: %s\n",
 				progname, (*mode=='w') ? "to" : "from", cmd);
 	return(popen(cmd, mode));
 }
 
-#ifdef _WIN32
+#define	pclose_al	pclose
+
 /* Execute system command (Windows version) */
-static int
+int
 my_exec(char *av[])
 {
 	char	cmd[10240];
@@ -244,13 +214,62 @@ my_exec(char *av[])
 		fputs(": command line too long in my_exec()\n", stderr);
 		return(1);
 	}
-	if (verbose > 0)
+	if (verbose & VERBO)
 		fprintf(stderr, "%s: running: %s\n", progname, cmd);
 	return(system(cmd));
 }
-#else
+
+#else	/* UNIX */
+
+static SUBPROC	rt_proc = SP_INACTIVE;	/* we only support one of these */
+
+/* Open a pipe to a command using an argument list */
+FILE *
+popen_arglist(char *av[], char *mode)
+{
+	int	fd;
+
+	if (rt_proc.pid > 0) {
+		fprintf(stderr, "%s: only one i/o pipe at a time!\n", progname);
+		return(NULL);
+	}
+	if (verbose & VERBO) {
+		char	cmd[4096];
+		if (!convert_commandline(cmd, sizeof(cmd), av))
+			strcpy(cmd, "COMMAND TOO LONG TO SHOW");
+		fprintf(stderr, "%s: opening pipe %s: %s\n",
+				progname, (*mode=='w') ? "to" : "from", cmd);
+	}
+	if (*mode == 'w') {
+		fd = rt_proc.w = dup(fileno(stdout));
+		rt_proc.flags |= PF_FILT_OUT;
+	} else if (*mode == 'r') {
+		fd = rt_proc.r = dup(fileno(stdin));
+		rt_proc.flags |= PF_FILT_INP;
+	}
+	if (fd < 0 || open_process(&rt_proc, av) <= 0) {
+		perror(av[0]);
+		return(NULL);
+	}
+	return(fdopen(fd, mode));
+}
+
+/* Close command pipe (returns -1 on error to match pclose) */
+int
+pclose_al(FILE *fp)
+{
+	int	prob = (fclose(fp) == EOF);
+
+	if (rt_proc.pid <= 0)
+		return(-1);
+
+	prob |= (close_process(&rt_proc) != 0);
+
+	return(-prob);
+}
+
 /* Execute system command in our stead (Unix version) */
-static int
+int
 my_exec(char *av[])
 {
 	char	*compath;
@@ -259,7 +278,7 @@ my_exec(char *av[])
 		fprintf(stderr, "%s: cannot locate %s\n", progname, av[0]);
 		return(1);
 	}
-	if (verbose > 0) {
+	if (verbose & VERBO) {
 		char	cmd[4096];
 		if (!convert_commandline(cmd, sizeof(cmd), av))
 			strcpy(cmd, "COMMAND TOO LONG TO SHOW");
@@ -269,10 +288,11 @@ my_exec(char *av[])
 	perror(compath);
 	return(1);
 }
+
 #endif
 
 /* Get normalized direction vector from string specification */
-static int
+int
 get_direction(FVECT dv, const char *s)
 {
 	int	sign = 1;
@@ -312,11 +332,12 @@ nextchar:
 }
 
 /* Parse program parameters (directives) */
-static int
+int
 parse_params(PARAMS *p, char *pargs)
 {
 	char	*cp = pargs;
 	int	nparams = 0;
+	int	quot;
 	int	i;
 
 	for ( ; ; ) {
@@ -324,6 +345,10 @@ parse_params(PARAMS *p, char *pargs)
 		case 'h':
 			if (*cp++ != '=')
 				break;
+			if ((*cp == '+') | (*cp == '-'))
+				p->sign = *cp++;
+			else
+				p->sign = '+';
 			p->hsiz = 0;
 			i = 0;
 			while (*cp && !isspace(*cp)) {
@@ -349,21 +374,30 @@ parse_params(PARAMS *p, char *pargs)
 		case 'o':
 			if (*cp++ != '=')
 				break;
+			quot = 0;
+			if ((*cp == '"') | (*cp == '\''))
+				quot = *cp++;
 			i = 0;
-			while (*cp && !isspace(*cp++))
-				i++;
+			while (*cp && (quot ? (*cp != quot) : !isspace(*cp))) {
+				i++; cp++;
+			}
 			if (!i)
 				break;
-			*--cp = '\0';
+			if (!*cp) {
+				if (quot)
+					break;
+				cp[1] = '\0';
+			}
+			*cp = '\0';
 			p->outfn = savqstr(cp-i);
-			*cp++ = ' ';
+			*cp++ = quot ? quot : ' ';
 			++nparams;
 			continue;
 		case ' ':
 		case '\t':
 		case '\r':
-			continue;
 		case '\n':
+			continue;
 		case '\0':
 			return(nparams);
 		default:
@@ -376,8 +410,20 @@ parse_params(PARAMS *p, char *pargs)
 	return(-1);	/* pro forma return */
 }
 
+/* Append bin jitter to the parameter string */
+int
+addbinjitter(char *s)
+{
+	if (binjitter == NULL)
+		return(0);
+	s += strlen(s);
+	strcpy(s, ",JTR=");
+	strcpy(s+5, binjitter);
+	return(1);
+}
+
 /* Add receiver arguments (directives) corresponding to the current modifier */
-static void
+void
 finish_receiver(void)
 {
 	char	sbuf[256];
@@ -416,8 +462,14 @@ finish_receiver(void)
 			curparams.vup[1] = 1;
 	}
 					/* determine sample type/bin */
-	if (tolower(curparams.hemis[0]) == 'u' | curparams.hemis[0] == '1') {
-		binv = "0";		/* uniform sampling -- one bin */
+	if ((tolower(curparams.hemis[0]) == 'u') | (curparams.hemis[0] == '1')) {
+		if (curparams.slist->styp != ST_SOURCE) {
+			sprintf(sbuf, "if(-Dx*%g-Dy*%g-Dz*%g,0,-1)",
+				curparams.nrm[0], curparams.nrm[1], curparams.nrm[2]);
+			binv = savqstr(sbuf);
+		} else
+			binv = "0";
+		nbins = "1";		/* uniform sampling -- one bin */
 		uniform = 1;
 	} else if (tolower(curparams.hemis[0]) == 's' &&
 				tolower(curparams.hemis[1]) == 'c') {
@@ -428,20 +480,24 @@ finish_receiver(void)
 			exit(1);
 		}
 		calfn = shirchiufn; shirchiufn = NULL;
-		sprintf(sbuf, "SCdim=%d,rNx=%g,rNy=%g,rNz=%g,Ux=%g,Uy=%g,Uz=%g",
+		sprintf(sbuf, "SCdim=%d,rNx=%g,rNy=%g,rNz=%g,Ux=%g,Uy=%g,Uz=%g,RHS=%c1",
 				curparams.hsiz,
 			curparams.nrm[0], curparams.nrm[1], curparams.nrm[2],
-			curparams.vup[0], curparams.vup[1], curparams.vup[2]);
+			curparams.vup[0], curparams.vup[1], curparams.vup[2],
+			curparams.sign);
+		addbinjitter(sbuf);
 		params = savqstr(sbuf);
 		binv = "scbin";
 		nbins = "SCdim*SCdim";
 	} else if ((tolower(curparams.hemis[0]) == 'r') |
 			(tolower(curparams.hemis[0]) == 't')) {
 		calfn = reinhfn; reinhfn = NULL;
-		sprintf(sbuf, "MF=%d,rNx=%g,rNy=%g,rNz=%g,Ux=%g,Uy=%g,Uz=%g",
+		sprintf(sbuf, "MF=%d,rNx=%g,rNy=%g,rNz=%g,Ux=%g,Uy=%g,Uz=%g,RHS=%c1",
 				curparams.hsiz,
 			curparams.nrm[0], curparams.nrm[1], curparams.nrm[2],
-			curparams.vup[0], curparams.vup[1], curparams.vup[2]);
+			curparams.vup[0], curparams.vup[1], curparams.vup[2],
+			curparams.sign);
+		addbinjitter(sbuf);
 		params = savqstr(sbuf);
 		binv = "rbin";
 		nbins = "Nrbins";
@@ -464,15 +520,30 @@ finish_receiver(void)
 		calfn = kquarterfn; kquarterfn = NULL;
 		binf = "kqbin";
 		nbins = "Nkqbins";
+	} else if (!strcasecmp(curparams.hemis, "cie")) {
+		calfn = ciefn; ciefn = NULL;
+		sprintf(sbuf, "rNx=%g,rNy=%g,rNz=%g,Ux=%g,Uy=%g,Uz=%g,RHS=%c1",
+			curparams.nrm[0], curparams.nrm[1], curparams.nrm[2],
+			curparams.vup[0], curparams.vup[1], curparams.vup[2],
+			curparams.sign);
+		addbinjitter(sbuf);
+		params = savqstr(sbuf);
+		binv = "cbin";
+		nbins = "Ncbins";
 	} else {
 		fprintf(stderr, "%s: unrecognized hemisphere sampling: h=%s\n",
 				progname, curparams.hemis);
 		exit(1);
 	}
-	if (!uniform & (curparams.slist->styp == ST_SOURCE)) {
+	if (tolower(curparams.hemis[0]) == 'k') {
+		sprintf(sbuf, "RHS=%c1", curparams.sign);
+		addbinjitter(sbuf);
+		params = savqstr(sbuf);
+	}
+	if (!uniform) {
 		SURF	*sp;
 		for (sp = curparams.slist; sp != NULL; sp = sp->next)
-			if (fabs(sp->area - PI) > 1e-3) {
+			if (sp->styp == ST_SOURCE && fabs(sp->area - PI) > 1e-3) {
 				fprintf(stderr, "%s: source '%s' must be 180-degrees\n",
 						progname, sp->sname);
 				exit(1);
@@ -511,30 +582,21 @@ finish_receiver(void)
 }
 
 /* Make randomly oriented tangent plane axes for given normal direction */
-static void
+void
 make_axes(FVECT uva[2], const FVECT nrm)
 {
 	int	i;
 
-	uva[1][0] = 0.5 - frandom();
-	uva[1][1] = 0.5 - frandom();
-	uva[1][2] = 0.5 - frandom();
-	for (i = 3; i--; )
-		if ((-0.6 < nrm[i]) & (nrm[i] < 0.6))
-			break;
-	if (i < 0) {
+	if (!getperpendicular(uva[0], nrm, 1)) {
 		fputs(progname, stderr);
 		fputs(": bad surface normal in make_axes!\n", stderr);
 		exit(1);
 	}
-	uva[1][i] = 1.0;
-	VCROSS(uva[0], uva[1], nrm);
-	normalize(uva[0]);
-	VCROSS(uva[1], nrm, uva[0]);
+	fcross(uva[1], nrm, uva[0]);
 }
 
 /* Illegal sender surfaces end up here */
-static int
+int
 ssamp_bad(FVECT orig, SURF *sp, double x)
 {
 	fprintf(stderr, "%s: illegal sender surface '%s'\n",
@@ -543,7 +605,7 @@ ssamp_bad(FVECT orig, SURF *sp, double x)
 }
 
 /* Generate origin on ring surface from uniform random variable */
-static int
+int
 ssamp_ring(FVECT orig, SURF *sp, double x)
 {
 	FVECT	*uva = (FVECT *)sp->priv;
@@ -572,7 +634,7 @@ ssamp_ring(FVECT orig, SURF *sp, double x)
 }
 
 /* Add triangle to polygon's list (call-back function) */
-static int
+int
 add_triangle(const Vert2_list *tp, int a, int b, int c)
 {
 	POLYTRIS	*ptp = (POLYTRIS *)tp->p;
@@ -585,7 +647,7 @@ add_triangle(const Vert2_list *tp, int a, int b, int c
 }
 
 /* Generate origin on polygon surface from uniform random variable */
-static int
+int
 ssamp_poly(FVECT orig, SURF *sp, double x)
 {
 	POLYTRIS	*ptp = (POLYTRIS *)sp->priv;
@@ -639,7 +701,7 @@ ssamp_poly(FVECT orig, SURF *sp, double x)
 		sp->priv = (void *)ptp;
 	}
 					/* pick triangle by partial area */
-	for (i = 0; i < ptp->ntris && x > ptp->tri[i].afrac; i++)
+	for (i = 0; i < ptp->ntris-1 && x > ptp->tri[i].afrac; i++)
 		x -= ptp->tri[i].afrac;
 	SDmultiSamp(samp2, 2, x/ptp->tri[i].afrac);
 	samp2[0] *= samp2[1] = sqrt(samp2[1]);
@@ -658,7 +720,7 @@ memerr:
 }
 
 /* Compute sample origin based on projected areas of sender subsurfaces */
-static int
+int
 sample_origin(PARAMS *p, FVECT orig, const FVECT rdir, double x)
 {
 	static double	*projsa;
@@ -669,7 +731,7 @@ sample_origin(PARAMS *p, FVECT orig, const FVECT rdir,
 					/* special case for lone surface */
 	if (p->nsurfs == 1) {
 		sp = p->slist;
-		if (DOT(sp->snrm, rdir) >= -FTINY) {
+		if (DOT(sp->snrm, rdir) >= FTINY) {
 			fprintf(stderr,
 				"%s: internal - sample behind sender '%s'\n",
 					progname, sp->sname);
@@ -680,15 +742,19 @@ sample_origin(PARAMS *p, FVECT orig, const FVECT rdir,
 	if (p->nsurfs > nall) {		/* (re)allocate surface area cache */
 		if (projsa) free(projsa);
 		projsa = (double *)malloc(sizeof(double)*p->nsurfs);
-		if (!projsa) return(0);
+		if (projsa == NULL) {
+			fputs(progname, stderr);
+			fputs(": out of memory in sample_origin!\n", stderr);
+			exit(1);
+		}
 		nall = p->nsurfs;
 	}
 					/* compute projected areas */
 	for (i = 0, sp = p->slist; sp != NULL; i++, sp = sp->next) {
 		projsa[i] = -DOT(sp->snrm, rdir) * sp->area;
-		tarea += projsa[i] *= (double)(projsa[i] > FTINY);
+		tarea += projsa[i] *= (double)(projsa[i] > 0);
 	}
-	if (tarea <= FTINY) {		/* wrong side of sender? */
+	if (tarea < FTINY*FTINY) {	/* wrong side of sender? */
 		fputs(progname, stderr);
 		fputs(": internal - sample behind all sender elements!\n",
 				stderr);
@@ -701,13 +767,12 @@ sample_origin(PARAMS *p, FVECT orig, const FVECT rdir,
 }
 
 /* Uniform sample generator */
-static int
+int
 sample_uniform(PARAMS *p, int b, FILE *fp)
 {
 	int	n = sampcnt;
 	double	samp3[3];
-	double	duvw[3];
-	FVECT	orig_dir[2];
+	FVECT	duvw, orig_dir[2];
 	int	i;
 
 	if (fp == NULL)			/* just requesting number of bins? */
@@ -715,7 +780,7 @@ sample_uniform(PARAMS *p, int b, FILE *fp)
 
 	while (n--) {			/* stratified hemisphere sampling */
 		SDmultiSamp(samp3, 3, (n+frandom())/sampcnt);
-		SDsquare2disk(duvw, samp3[1], samp3[2]);
+		square2disk(duvw, samp3[1], samp3[2]);
 		duvw[2] = -sqrt(1. - duvw[0]*duvw[0] - duvw[1]*duvw[1]);
 		for (i = 3; i--; )
 			orig_dir[1][i] = duvw[0]*p->udir[i] +
@@ -723,20 +788,19 @@ sample_uniform(PARAMS *p, int b, FILE *fp)
 						duvw[2]*p->nrm[i] ;
 		if (!sample_origin(p, orig_dir[0], orig_dir[1], samp3[0]))
 			return(0);
-		if (fwrite(orig_dir, sizeof(FVECT), 2, fp) != 2)
+		if (putbinary(orig_dir, sizeof(FVECT), 2, fp) != 2)
 			return(0);
 	}
 	return(1);
 }
 
 /* Shirly-Chiu sample generator */
-static int
+int
 sample_shirchiu(PARAMS *p, int b, FILE *fp)
 {
 	int	n = sampcnt;
 	double	samp3[3];
-	double	duvw[3];
-	FVECT	orig_dir[2];
+	FVECT	duvw, orig_dir[2];
 	int	i;
 
 	if (fp == NULL)			/* just requesting number of bins? */
@@ -744,7 +808,7 @@ sample_shirchiu(PARAMS *p, int b, FILE *fp)
 
 	while (n--) {			/* stratified sampling */
 		SDmultiSamp(samp3, 3, (n+frandom())/sampcnt);
-		SDsquare2disk(duvw, (b/p->hsiz + samp3[1])/curparams.hsiz,
+		square2disk(duvw, (b/p->hsiz + samp3[1])/curparams.hsiz,
 				(b%p->hsiz + samp3[2])/curparams.hsiz);
 		duvw[2] = sqrt(1. - duvw[0]*duvw[0] - duvw[1]*duvw[1]);
 		for (i = 3; i--; )
@@ -753,14 +817,14 @@ sample_shirchiu(PARAMS *p, int b, FILE *fp)
 						duvw[2]*p->nrm[i] ;
 		if (!sample_origin(p, orig_dir[0], orig_dir[1], samp3[0]))
 			return(0);
-		if (fwrite(orig_dir, sizeof(FVECT), 2, fp) != 2)
+		if (putbinary(orig_dir, sizeof(FVECT), 2, fp) != 2)
 			return(0);
 	}
 	return(1);
 }
 
 /* Reinhart/Tregenza sample generator */
-static int
+int
 sample_reinhart(PARAMS *p, int b, FILE *fp)
 {
 #define T_NALT	7
@@ -789,11 +853,13 @@ sample_reinhart(PARAMS *p, int b, FILE *fp)
 	}
 	while (n--) {			/* stratified sampling */
 		SDmultiSamp(samp3, 3, (n+frandom())/sampcnt);
+		if (row >= RowMax-1)	/* avoid crowding at zenith */
+			samp3[1] *= samp3[1];
 		alt = (row+samp3[1])*RAH;
 		azi = (2.*PI)*(col+samp3[2]-.5)/rnaz(row);
 		duvw[2] = cos(alt);	/* measured from horizon */
 		duvw[0] = tsin(azi)*duvw[2];
-		duvw[1] = tcos(azi)*duvw[2];
+		duvw[1] = -tcos(azi)*duvw[2];
 		duvw[2] = sqrt(1. - duvw[2]*duvw[2]);
 		for (i = 3; i--; )
 			orig_dir[1][i] = -duvw[0]*p->udir[i] -
@@ -801,7 +867,7 @@ sample_reinhart(PARAMS *p, int b, FILE *fp)
 						duvw[2]*p->nrm[i] ;
 		if (!sample_origin(p, orig_dir[0], orig_dir[1], samp3[0]))
 			return(0);
-		if (fwrite(orig_dir, sizeof(FVECT), 2, fp) != 2)
+		if (putbinary(orig_dir, sizeof(FVECT), 2, fp) != 2)
 			return(0);
 	}
 	return(1);
@@ -810,7 +876,7 @@ sample_reinhart(PARAMS *p, int b, FILE *fp)
 }
 
 /* Klems sample generator */
-static int
+int
 sample_klems(PARAMS *p, int b, FILE *fp)
 {
 	static const char	bname[4][20] = {
@@ -844,67 +910,72 @@ sample_klems(PARAMS *p, int b, FILE *fp)
 
 	while (n--) {			/* stratified sampling */
 		SDmultiSamp(samp2, 2, (n+frandom())/sampcnt);
-		if (!bi_getvec(duvw, b+samp2[1], kbasis[bi]))
+		if (!fo_getvec(duvw, b+samp2[1], kbasis[bi]))
 			return(0);
 		for (i = 3; i--; )
-			orig_dir[1][i] = duvw[0]*p->udir[i] +
-						duvw[1]*p->vdir[i] +
+			orig_dir[1][i] = -duvw[0]*p->udir[i] -
+						duvw[1]*p->vdir[i] -
 						duvw[2]*p->nrm[i] ;
 		if (!sample_origin(p, orig_dir[0], orig_dir[1], samp2[0]))
 			return(0);
-		if (fwrite(orig_dir, sizeof(FVECT), 2, fp) != 2)
+		if (putbinary(orig_dir, sizeof(FVECT), 2, fp) != 2)
 			return(0);
 	}
 	return(1);
 }
 
 /* Prepare hemisphere basis sampler that will send rays to rcontrib */
-static int
-prepare_sampler(void)
+int
+prepare_sampler(PARAMS *p)
 {
-	if (curparams.slist == NULL) {	/* missing sample surface! */
+	if (p->slist == NULL) {	/* missing sample surface! */
 		fputs(progname, stderr);
 		fputs(": no sender surface!\n", stderr);
 		return(-1);
 	}
 					/* misplaced output file spec. */
-	if ((curparams.outfn != NULL) & (verbose >= 0))
+	if ((p->outfn != NULL) & !(verbose & NOWARN))
 		fprintf(stderr, "%s: warning - ignoring output file in sender ('%s')\n",
-				progname, curparams.outfn);
+				progname, p->outfn);
 					/* check/set basis hemisphere */
-	if (!curparams.hemis[0]) {
+	if (!p->hemis[0]) {
 		fputs(progname, stderr);
 		fputs(": missing sender sampling type!\n", stderr);
 		return(-1);
 	}
-	if (normalize(curparams.nrm) == 0) {
+	if (normalize(p->nrm) == 0) {
 		fputs(progname, stderr);
 		fputs(": undefined normal for sender sampling\n", stderr);
 		return(-1);
 	}
-	if (normalize(curparams.vup) == 0) {
-		if (fabs(curparams.nrm[2]) < .7)
-			curparams.vup[2] = 1;
+	if (normalize(p->vup) == 0) {
+		if (fabs(p->nrm[2]) < .7)
+			p->vup[2] = 1;
 		else
-			curparams.vup[1] = 1;
+			p->vup[1] = 1;
 	}
-	VCROSS(curparams.udir, curparams.vup, curparams.nrm);
-	if (normalize(curparams.udir) == 0) {
+	fcross(p->udir, p->vup, p->nrm);
+	if (normalize(p->udir) == 0) {
 		fputs(progname, stderr);
 		fputs(": up vector coincides with sender normal\n", stderr);
 		return(-1);
 	}
-	VCROSS(curparams.vdir, curparams.nrm, curparams.udir);
-	if (tolower(curparams.hemis[0]) == 'u' | curparams.hemis[0] == '1')
-		curparams.sample_basis = sample_uniform;
-	else if (tolower(curparams.hemis[0]) == 's' &&
-				tolower(curparams.hemis[1]) == 'c')
-		curparams.sample_basis = sample_shirchiu;
-	else if ((tolower(curparams.hemis[0]) == 'r') |
-			(tolower(curparams.hemis[0]) == 't'))
-		curparams.sample_basis = sample_reinhart;
-	else if (tolower(curparams.hemis[0]) == 'k') {
-		switch (curparams.hemis[1]) {
+	fcross(p->vdir, p->nrm, p->udir);
+	if (p->sign == '-') {	/* left-handed coordinate system? */
+		p->udir[0] *= -1.;
+		p->udir[1] *= -1.;
+		p->udir[2] *= -1.;
+	}
+	if ((tolower(p->hemis[0]) == 'u') | (p->hemis[0] == '1'))
+		p->sample_basis = sample_uniform;
+	else if (tolower(p->hemis[0]) == 's' &&
+				tolower(p->hemis[1]) == 'c')
+		p->sample_basis = sample_shirchiu;
+	else if ((tolower(p->hemis[0]) == 'r') |
+			(tolower(p->hemis[0]) == 't'))
+		p->sample_basis = sample_reinhart;
+	else if (tolower(p->hemis[0]) == 'k') {
+		switch (p->hemis[1]) {
 		case '1':
 		case '2':
 		case '4':
@@ -912,33 +983,33 @@ prepare_sampler(void)
 		case 'f':
 		case 'F':
 		case '\0':
-			curparams.hemis[1] = '1';
+			p->hemis[1] = '1';
 			break;
 		case 'h':
 		case 'H':
-			curparams.hemis[1] = '2';
+			p->hemis[1] = '2';
 			break;
 		case 'q':
 		case 'Q':
-			curparams.hemis[1] = '4';
+			p->hemis[1] = '4';
 			break;
 		default:
 			goto unrecognized;
 		}
-		curparams.hemis[2] = '\0';
-		curparams.sample_basis = sample_klems;
+		p->hemis[2] = '\0';
+		p->sample_basis = sample_klems;
 	} else
 		goto unrecognized;
 					/* return number of bins */
-	return((*curparams.sample_basis)(&curparams,0,NULL));
+	return((*p->sample_basis)(p,0,NULL));
 unrecognized:
 	fprintf(stderr, "%s: unrecognized sender sampling: h=%s\n",
-			progname, curparams.hemis);
+			progname, p->hemis);
 	return(-1);
 }
 
 /* Compute normal and area for polygon */
-static int
+int
 finish_polygon(SURF *p)
 {
 	const int	nv = p->nfargs / 3;
@@ -956,11 +1027,11 @@ finish_polygon(SURF *p)
 		VCOPY(e1, e2);
 	}
 	p->area = normalize(p->snrm)*0.5;
-	return(p->area > FTINY);
+	return(p->area > FTINY*FTINY);
 }
 
 /* Add a surface to our current parameters */
-static void
+void
 add_surface(int st, const char *oname, FILE *fp)
 {
 	SURF	*snew;
@@ -974,7 +1045,7 @@ add_surface(int st, const char *oname, FILE *fp)
 	snew = (SURF *)malloc(sizeof(SURF) + sizeof(double)*(n-1));
 	if (snew == NULL) {
 		fputs(progname, stderr);
-		fputs(": out of memory!\n", stderr);
+		fputs(": out of memory in add_surface!\n", stderr);
 		exit(1);
 	}
 	strncpy(snew->sname, oname, sizeof(snew->sname)-1);
@@ -1019,7 +1090,7 @@ add_surface(int st, const char *oname, FILE *fp)
 		snew->area *= PI*snew->area;
 		break;
 	}
-	if ((snew->area <= FTINY) & (verbose >= 0)) {
+	if ((snew->area <= FTINY*FTINY) & !(verbose & NOWARN)) {
 		fprintf(stderr, "%s: warning - zero area for surface '%s'\n",
 				progname, oname);
 		free(snew);
@@ -1041,7 +1112,7 @@ badnorm:
 }
 
 /* Parse a receiver object (look for modifiers to add to rcontrib command) */
-static int
+int
 add_recv_object(FILE *fp)
 {
 	int		st;
@@ -1056,12 +1127,6 @@ add_recv_object(FILE *fp)
 	}
 					/* is it a new receiver? */
 	if ((st = surf_type(otype)) != ST_NONE) {
-		if (curparams.slist != NULL && (st == ST_SOURCE) ^
-				(curparams.slist->styp == ST_SOURCE)) {
-			fputs(progname, stderr);
-			fputs(": cannot mix source/non-source receivers!\n", stderr);
-			return(-1);
-		}
 		if (strcmp(thismod, curmod)) {
 			if (curmod[0]) {	/* output last receiver? */
 				finish_receiver();
@@ -1085,14 +1150,14 @@ add_recv_object(FILE *fp)
 }
 
 /* Parse a sender object */
-static int
+int
 add_send_object(FILE *fp)
 {
 	int		st;
-	char		otype[32], oname[128];
+	char		thismod[128], otype[32], oname[128];
 	int		n;
 
-	if (fscanf(fp, "%*s %s %s", otype, oname) != 2)
+	if (fscanf(fp, "%s %s %s", thismod, otype, oname) != 3)
 		return(0);		/* must have hit EOF! */
 	if (!strcmp(otype, "alias")) {
 		fscanf(fp, "%*s");	/* skip alias */
@@ -1105,6 +1170,14 @@ add_send_object(FILE *fp)
 			fputs(": cannot use source as a sender!\n", stderr);
 			return(-1);
 		}
+		if (strcmp(thismod, curmod)) {
+			if (curmod[0]) {
+				fputs(progname, stderr);
+				fputs(": warning - multiple modifiers in sender\n",
+						stderr);
+			}
+			strcpy(curmod, thismod);
+		}
 		parse_params(&curparams, newparams);
 		newparams[0] = '\0';
 		add_surface(st, oname, fp);	/* read & store surface */
@@ -1121,7 +1194,7 @@ add_send_object(FILE *fp)
 }
 
 /* Load a Radiance scene using the given callback function for objects */
-static int
+int
 load_scene(const char *inspec, int (*ocb)(FILE *))
 {
 	int	rv = 0;
@@ -1185,12 +1258,13 @@ main(int argc, char *argv[])
 	char	*xrs=NULL, *yrs=NULL, *ldopt=NULL;
 	char	*iropt = NULL;
 	char	*sendfn;
-	char	sampcntbuf[32], nsbinbuf[32];
+	char	sampcntbuf[32], nsbinbuf[32], binjitbuf[32];
 	FILE	*rcfp;
 	int	nsbins;
 	int	a, i;
+					/* set global progname */
+	fixargv0(argv[0]);
 					/* screen rcontrib options */
-	progname = argv[0];
 	for (a = 1; a < argc-2; a++) {
 		int	na;
 					/* check for argument expansion */
@@ -1206,13 +1280,14 @@ main(int argc, char *argv[])
 		na = 1;	
 		switch (argv[a][1]) {	/* !! Keep consistent !! */
 		case 'v':		/* verbose mode */
-			verbose = 1;
+			verbose ^= VERBO;
 			na = 0;
 			continue;
 		case 'f':		/* special case for -fo, -ff, etc. */
 			switch (argv[a][2]) {
 			case '\0':		/* cal file */
-				goto userr;
+				na = 2;
+				break;
 			case 'o':		/* force output */
 				goto userr;
 			case 'a':		/* output format */
@@ -1236,19 +1311,35 @@ main(int argc, char *argv[])
 			yrs = argv[++a];
 			na = 0;
 			continue;
-		case 'c':		/* number of samples */
-			sampcnt = atoi(argv[++a]);
-			if (sampcnt <= 0)
-				goto userr;
-			na = 0;		/* we re-add this later */
-			continue;
+		case 'c':		/* spectral sampling or count */
+			switch (argv[a][2]) {
+			case 's':
+				na = 2;
+				break;
+			case 'w':
+				na = 3;
+				break;
+			case '\0':
+				sampcnt = atoi(argv[++a]);
+				if (sampcnt <= 0)
+					goto userr;
+				na = 0;		/* we re-add this later */
+				continue;
+			}
+			break;
 		case 'I':		/* only for pass-through mode */
 		case 'i':
 			iropt = argv[a];
 			na = 0;
 			continue;
 		case 'w':		/* options without arguments */
-			if (argv[a][2] != '+') verbose = -1;
+			if (!argv[a][2])
+				verbose ^= NOWARN;
+			else if (strchr("+1tTyY", argv[a][2]) != NULL)
+				verbose &= ~NOWARN;
+			else
+				verbose |= NOWARN;
+			break;
 		case 'V':
 		case 'u':
 		case 'h':
@@ -1257,9 +1348,16 @@ main(int argc, char *argv[])
 		case 'n':		/* options with 1 argument */
 		case 's':
 		case 'o':
+		case 't':
+		case 'e':
 			na = 2;
 			break;
 		case 'b':		/* special case */
+			if (argv[a][2] == 'j') {
+				binjitter = argv[++a];
+				na = 0;
+				continue;
+			}
 			if (argv[a][2] != 'v') goto userr;
 			break;
 		case 'l':		/* special case */
@@ -1274,7 +1372,12 @@ main(int argc, char *argv[])
 			if (argv[a][2] != 'v') na = 2;
 			break;
 		case 'a':		/* special case */
-			na = (argv[a][2] == 'v') ? 4 : 2;
+			if (argv[a][2] == 'p') {
+				na = 2;	/* photon map [+ bandwidth(s)] */
+				if (a < argc-3 && atoi(argv[a+1]) > 0)
+					na += 1 + (a < argc-4 && atoi(argv[a+2]) > 0);
+			} else
+				na = (argv[a][2] == 'v') ? 4 : 2;
 			break;
 		case 'm':		/* special case */
 			if (!argv[a][2]) goto userr;
@@ -1320,7 +1423,11 @@ main(int argc, char *argv[])
 			fputs(": -i, -I supported for pass-through only\n", stderr);
 			return(1);
 		}
-		fmtopt[2] = (sizeof(RREAL)==sizeof(double)) ? 'd' : 'f';
+#ifdef SMLFLT
+		fmtopt[2] = 'f';
+#else
+		fmtopt[2] = 'd';
+#endif
 		if (sampcnt <= 0) sampcnt = 10000;
 	}
 	sprintf(sampcntbuf, "%d", sampcnt);
@@ -1339,9 +1446,10 @@ main(int argc, char *argv[])
 		return(my_exec(rcarg));	/* rcontrib does everything */
 	}
 	clear_params(&curparams, 0);	/* else load sender surface & params */
+	curmod[0] = '\0';
 	if (load_scene(sendfn, add_send_object) < 0)
 		return(1);
-	if ((nsbins = prepare_sampler()) <= 0)
+	if ((nsbins = prepare_sampler(&curparams)) <= 0)
 		return(1);
 	CHECKARGC(3);			/* add row count and octree */
 	rcarg[nrcargs++] = "-y";
@@ -1356,7 +1464,7 @@ main(int argc, char *argv[])
 #ifdef getc_unlocked
 	flockfile(rcfp);
 #endif
-	if (verbose) {
+	if (verbose & VERBO) {
 		fprintf(stderr, "%s: sampling %d directions", progname, nsbins);
 		if (curparams.nsurfs > 1)
 			fprintf(stderr, " (%d elements)\n", curparams.nsurfs);
@@ -1366,11 +1474,11 @@ main(int argc, char *argv[])
 	for (i = 0; i < nsbins; i++)	/* send rcontrib ray samples */
 		if (!(*curparams.sample_basis)(&curparams, i, rcfp))
 			return(1);
-	return(pclose(rcfp) == 0);	/* all finished! */
+	return(pclose_al(rcfp) < 0);	/* all finished! */
 userr:
 	if (a < argc-2)
-		fprintf(stderr, "%s: unsupported option '%s'", progname, argv[a]);
-	fprintf(stderr, "Usage: %s [-v][rcontrib options] sender.rad receiver.rad [-i system.oct] [system.rad ..]\n",
+		fprintf(stderr, "%s: unsupported option '%s'\n", progname, argv[a]);
+	fprintf(stderr, "Usage: %s [-v][-bj frac][rcontrib options] sender.rad receiver.rad [-i system.oct] [system.rad ..]\n",
 				progname);
 	return(1);
 }