--- ray/src/util/rfluxmtx.c	2014/07/23 00:40:17	2.6
+++ ray/src/util/rfluxmtx.c	2014/08/26 19:10:10	2.18
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rfluxmtx.c,v 2.6 2014/07/23 00:40:17 greg Exp $";
+static const char RCSid[] = "$Id: rfluxmtx.c,v 2.18 2014/08/26 19:10:10 greg Exp $";
 #endif
 /*
  * Calculate flux transfer matrix or matrices using rcontrib
@@ -11,6 +11,7 @@ static const char RCSid[] = "$Id: rfluxmtx.c,v 2.6 201
 #include <stdlib.h>
 #include "rtio.h"
 #include "rtmath.h"
+#include "rtprocess.h"
 #include "bsdf.h"
 #include "bsdf_m.h"
 #include "random.h"
@@ -35,7 +36,7 @@ static const char RCSid[] = "$Id: rfluxmtx.c,v 2.6 201
 
 char		*progname;		/* global argv[0] */
 
-int		verbose = 0;		/* verbose mode? */
+int		verbose = 0;		/* verbose mode (< 0 no warnings) */
 
 char		*rcarg[MAXRCARG+1] = {"rcontrib", "-fo+"};
 int		nrcargs = 2;
@@ -144,20 +145,23 @@ surf_type(const char *otype)
 static char *
 oconv_command(int ac, char *av[])
 {
-	static char	oconvbuf[2048] = "!oconv -f";
-	char		*cp = oconvbuf + 9;
-
+	static char	oconvbuf[2048] = "!oconv -f ";
+	char		*cp = oconvbuf + 10;
+	char		*recv = *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);
 		}
-		*cp++ = ' ';
-		strcpy(cp, *av++);
-		while (*cp) cp++;
 	}
-	*cp = '\0';
+	strcpy(cp, recv);	/* receiver goes last */
 	return(oconvbuf);
 }
 
@@ -222,7 +226,7 @@ popen_arglist(char *av[], char *mode)
 		fputs(": command line too long in popen_arglist()\n", stderr);
 		return(NULL);
 	}
-	if (verbose)
+	if (verbose > 0)
 		fprintf(stderr, "%s: opening pipe %s: %s\n",
 				progname, (*mode=='w') ? "to" : "from", cmd);
 	return(popen(cmd, mode));
@@ -240,7 +244,7 @@ my_exec(char *av[])
 		fputs(": command line too long in my_exec()\n", stderr);
 		return(1);
 	}
-	if (verbose)
+	if (verbose > 0)
 		fprintf(stderr, "%s: running: %s\n", progname, cmd);
 	return(system(cmd));
 }
@@ -255,7 +259,7 @@ my_exec(char *av[])
 		fprintf(stderr, "%s: cannot locate %s\n", progname, av[0]);
 		return(1);
 	}
-	if (verbose) {
+	if (verbose > 0) {
 		char	cmd[4096];
 		if (!convert_commandline(cmd, sizeof(cmd), av))
 			strcpy(cmd, "COMMAND TOO LONG TO SHOW");
@@ -315,7 +319,7 @@ parse_params(PARAMS *p, char *pargs)
 	int	nparams = 0;
 	int	i;
 
-	for ( ; ; )
+	for ( ; ; ) {
 		switch (*cp++) {
 		case 'h':
 			if (*cp++ != '=')
@@ -338,6 +342,8 @@ parse_params(PARAMS *p, char *pargs)
 				break;
 			if (!get_direction(p->vup, cp))
 				break;
+			while (*cp && !isspace(*cp++))
+				;
 			++nparams;
 			continue;
 		case 'o':
@@ -356,14 +362,16 @@ parse_params(PARAMS *p, char *pargs)
 		case ' ':
 		case '\t':
 		case '\r':
-		case '\n':
 			continue;
+		case '\n':
 		case '\0':
 			return(nparams);
 		default:
 			break;
 		}
-	fprintf(stderr, "%s: bad parameter string '%s'\n", progname, pargs);
+		break;
+	}
+	fprintf(stderr, "%s: bad parameter string: %s", progname, pargs);
 	exit(1);
 	return(-1);	/* pro forma return */
 }
@@ -401,11 +409,12 @@ finish_receiver(void)
 		fputs(": undefined normal for hemisphere sampling\n", stderr);
 		exit(1);
 	}
-	if (normalize(curparams.vup) == 0)
+	if (normalize(curparams.vup) == 0) {
 		if (fabs(curparams.nrm[2]) < .7)
 			curparams.vup[2] = 1;
 		else
 			curparams.vup[1] = 1;
+	}
 					/* determine sample type/bin */
 	if (tolower(curparams.hemis[0]) == 'u' | curparams.hemis[0] == '1') {
 		binv = "0";		/* uniform sampling -- one bin */
@@ -419,7 +428,7 @@ finish_receiver(void)
 			exit(1);
 		}
 		calfn = shirchiufn; shirchiufn = NULL;
-		sprintf(sbuf, "SCdim=%d,Nx=%g,Ny=%g,Nz=%g,Ux=%g,Uy=%g,Uz=%g",
+		sprintf(sbuf, "SCdim=%d,rNx=%g,rNy=%g,rNz=%g,Ux=%g,Uy=%g,Uz=%g",
 				curparams.hsiz,
 			curparams.nrm[0], curparams.nrm[1], curparams.nrm[2],
 			curparams.vup[0], curparams.vup[1], curparams.vup[2]);
@@ -429,7 +438,7 @@ finish_receiver(void)
 	} else if ((tolower(curparams.hemis[0]) == 'r') |
 			(tolower(curparams.hemis[0]) == 't')) {
 		calfn = reinhfn; reinhfn = NULL;
-		sprintf(sbuf, "MF=%d,Nx=%g,Ny=%g,Nz=%g,Ux=%g,Uy=%g,Uz=%g",
+		sprintf(sbuf, "MF=%d,rNx=%g,rNy=%g,rNz=%g,Ux=%g,Uy=%g,Uz=%g",
 				curparams.hsiz,
 			curparams.nrm[0], curparams.nrm[1], curparams.nrm[2],
 			curparams.vup[0], curparams.vup[1], curparams.vup[2]);
@@ -606,8 +615,12 @@ ssamp_poly(FVECT orig, SURF *sp, double x)
 			}
 			ptp->ntris = 0;
 			v2l->p = (void *)ptp;
-			if (!polyTriangulate(v2l, add_triangle))
+			if (!polyTriangulate(v2l, add_triangle)) {
+				fprintf(stderr,
+					"%s: cannot triangulate polygon '%s'\n",
+						progname, sp->sname);
 				return(0);
+			}
 			for (i = ptp->ntris; i--; ) {
 				int	a = ptp->tri[i].vndx[0];
 				int	b = ptp->tri[i].vndx[1];
@@ -656,8 +669,12 @@ 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)
-			return(0);	/* behind surface! */
+		if (DOT(sp->snrm, rdir) >= -FTINY) {
+			fprintf(stderr,
+				"%s: internal - sample behind sender '%s'\n",
+					progname, sp->sname);
+			return(0);
+		}
 		return((*orig_in_surf[sp->styp])(orig, sp, x));
 	}
 	if (p->nsurfs > nall) {		/* (re)allocate surface area cache */
@@ -671,8 +688,12 @@ sample_origin(PARAMS *p, FVECT orig, const FVECT rdir,
 		projsa[i] = -DOT(sp->snrm, rdir) * sp->area;
 		tarea += projsa[i] *= (double)(projsa[i] > FTINY);
 	}
-	if (tarea <= FTINY)		/* wrong side of sender? */
+	if (tarea <= FTINY) {		/* wrong side of sender? */
+		fputs(progname, stderr);
+		fputs(": internal - sample behind all sender elements!\n",
+				stderr);
 		return(0);
+	}
 	tarea *= x;			/* get surface from list */
 	for (i = 0, sp = p->slist; tarea > projsa[i]; sp = sp->next)
 		tarea -= projsa[i++];
@@ -745,7 +766,7 @@ sample_reinhart(PARAMS *p, int b, FILE *fp)
 #define T_NALT	7
 	static const int	tnaz[T_NALT] = {30, 30, 24, 24, 18, 12, 6};
 	const int		RowMax = T_NALT*p->hsiz + 1;
-	const double		RAH = (.25*PI)/(RowMax-.5);
+	const double		RAH = (.5*PI)/(RowMax-.5);
 #define rnaz(r)			(r >= RowMax-1 ? 1 : p->hsiz*tnaz[r/p->hsiz])
 	int			n = sampcnt;
 	int			row, col;
@@ -770,9 +791,9 @@ sample_reinhart(PARAMS *p, int b, FILE *fp)
 		SDmultiSamp(samp3, 3, (n+frandom())/sampcnt);
 		alt = (row+samp3[1])*RAH;
 		azi = (2.*PI)*(col+samp3[2]-.5)/rnaz(row);
-		duvw[2] = tcos(alt);	/* measured from horizon */
-		duvw[0] = tcos(azi)*duvw[2];
-		duvw[1] = tsin(azi)*duvw[2];
+		duvw[2] = cos(alt);	/* measured from horizon */
+		duvw[0] = tsin(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] -
@@ -823,7 +844,7 @@ sample_klems(PARAMS *p, int b, FILE *fp)
 
 	while (n--) {			/* stratified sampling */
 		SDmultiSamp(samp2, 2, (n+frandom())/sampcnt);
-		if (!bo_getvec(duvw, b+samp2[1], kbasis[bi]))
+		if (!bi_getvec(duvw, b+samp2[1], kbasis[bi]))
 			return(0);
 		for (i = 3; i--; )
 			orig_dir[1][i] = duvw[0]*p->udir[i] +
@@ -846,7 +867,8 @@ prepare_sampler(void)
 		fputs(": no sender surface!\n", stderr);
 		return(-1);
 	}
-	if (curparams.outfn != NULL)	/* misplaced output file spec. */
+					/* misplaced output file spec. */
+	if ((curparams.outfn != NULL) & (verbose >= 0))
 		fprintf(stderr, "%s: warning - ignoring output file in sender ('%s')\n",
 				progname, curparams.outfn);
 					/* check/set basis hemisphere */
@@ -860,11 +882,12 @@ prepare_sampler(void)
 		fputs(": undefined normal for sender sampling\n", stderr);
 		return(-1);
 	}
-	if (normalize(curparams.vup) == 0)
+	if (normalize(curparams.vup) == 0) {
 		if (fabs(curparams.nrm[2]) < .7)
 			curparams.vup[2] = 1;
 		else
 			curparams.vup[1] = 1;
+	}
 	VCROSS(curparams.udir, curparams.vup, curparams.nrm);
 	if (normalize(curparams.udir) == 0) {
 		fputs(progname, stderr);
@@ -988,14 +1011,15 @@ add_surface(int st, const char *oname, FILE *fp)
 	case ST_SOURCE:
 		if (snew->nfargs != 4)
 			goto badcount;
-		VCOPY(snew->snrm, snew->farg);
+		for (n = 3; n--; )	/* need to reverse "normal" */
+			snew->snrm[n] = -snew->farg[n];
 		if (normalize(snew->snrm) == 0)
 			goto badnorm;
 		snew->area = sin((PI/180./2.)*snew->farg[3]);
 		snew->area *= PI*snew->area;
 		break;
 	}
-	if (snew->area <= FTINY) {
+	if ((snew->area <= FTINY) & (verbose >= 0)) {
 		fprintf(stderr, "%s: warning - zero area for surface '%s'\n",
 				progname, oname);
 		free(snew);
@@ -1007,11 +1031,11 @@ add_surface(int st, const char *oname, FILE *fp)
 	curparams.nsurfs++;
 	return;
 badcount:
-	fprintf(stderr, "%s: bad argument count for surface '%s'\n",
+	fprintf(stderr, "%s: bad argument count for surface element '%s'\n",
 			progname, oname);
 	exit(1);
 badnorm:
-	fprintf(stderr, "%s: bad orientation for surface '%s'\n",
+	fprintf(stderr, "%s: bad orientation for surface element '%s'\n",
 			progname, oname);
 	exit(1);
 }
@@ -1051,11 +1075,11 @@ add_recv_object(FILE *fp)
 		return(1);
 	}
 					/* else skip arguments */
-	if (!fscanf(fp, "%d", &n)) return;
+	if (!fscanf(fp, "%d", &n)) return(0);
 	while (n-- > 0) fscanf(fp, "%*s");
-	if (!fscanf(fp, "%d", &n)) return;
+	if (!fscanf(fp, "%d", &n)) return(0);
 	while (n-- > 0) fscanf(fp, "%*d");
-	if (!fscanf(fp, "%d", &n)) return;
+	if (!fscanf(fp, "%d", &n)) return(0);
 	while (n-- > 0) fscanf(fp, "%*f");
 	return(0);
 }
@@ -1087,11 +1111,11 @@ add_send_object(FILE *fp)
 		return(0);
 	}
 					/* else skip arguments */
-	if (!fscanf(fp, "%d", &n)) return;
+	if (!fscanf(fp, "%d", &n)) return(0);
 	while (n-- > 0) fscanf(fp, "%*s");
-	if (!fscanf(fp, "%d", &n)) return;
+	if (!fscanf(fp, "%d", &n)) return(0);
 	while (n-- > 0) fscanf(fp, "%*d");
-	if (!fscanf(fp, "%d", &n)) return;
+	if (!fscanf(fp, "%d", &n)) return(0);
 	while (n-- > 0) fscanf(fp, "%*f");
 	return(0);
 }
@@ -1134,7 +1158,7 @@ load_scene(const char *inspec, int (*ocb)(FILE *))
 					strcat(newparams, inpbuf);
 				continue;
 			}
-			while ((c = getc(fp)) != EOF && c != '\n');
+			while ((c = getc(fp)) != EOF && c != '\n')
 				;	/* else skipping comment */
 			continue;
 		}
@@ -1159,6 +1183,7 @@ main(int argc, char *argv[])
 {
 	char	fmtopt[6] = "-faa";	/* default output is ASCII */
 	char	*xrs=NULL, *yrs=NULL, *ldopt=NULL;
+	char	*iropt = NULL;
 	char	*sendfn;
 	char	sampcntbuf[32], nsbinbuf[32];
 	FILE	*rcfp;
@@ -1166,11 +1191,22 @@ main(int argc, char *argv[])
 	int	a, i;
 					/* screen rcontrib options */
 	progname = argv[0];
-	for (a = 1; a < argc-2 && argv[a][0] == '-'; a++) {
-		int	na = 1;		/* !! Keep consistent !! */
-		switch (argv[a][1]) {
+	for (a = 1; a < argc-2; a++) {
+		int	na;
+					/* check for argument expansion */
+		while ((na = expandarg(&argc, &argv, a)) > 0)
+			;
+		if (na < 0) {
+			fprintf(stderr, "%s: cannot expand '%s'\n",
+					progname, argv[a]);
+			return(1);
+		}
+		if (argv[a][0] != '-' || !argv[a][1])
+			break;
+		na = 1;	
+		switch (argv[a][1]) {	/* !! Keep consistent !! */
 		case 'v':		/* verbose mode */
-			verbose = !verbose;
+			verbose = 1;
 			na = 0;
 			continue;
 		case 'f':		/* special case for -fo, -ff, etc. */
@@ -1206,10 +1242,15 @@ main(int argc, char *argv[])
 				goto userr;
 			na = 0;		/* we re-add this later */
 			continue;
-		case 'V':		/* options without arguments */
-		case 'w':
-		case 'u':
+		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;
+		case 'V':
+		case 'u':
 		case 'h':
 		case 'r':
 			break;
@@ -1239,8 +1280,6 @@ main(int argc, char *argv[])
 			if (!argv[a][2]) goto userr;
 			na = (argv[a][2] == 'e') | (argv[a][2] == 'a') ? 4 : 2;
 			break;
-		case '\0':		/* pass-through mode */
-			goto done_opts;
 		default:		/* anything else is verbotten */
 			goto userr;
 		}
@@ -1250,13 +1289,16 @@ main(int argc, char *argv[])
 		while (--na)		/* + arguments if any */
 			rcarg[nrcargs++] = argv[++a];
 	}
-done_opts:
 	if (a > argc-2)
 		goto userr;		/* check at end of options */
 	sendfn = argv[a++];		/* assign sender & receiver inputs */
 	if (sendfn[0] == '-') {		/* user wants pass-through mode? */
 		if (sendfn[1]) goto userr;
 		sendfn = NULL;
+		if (iropt) {
+			CHECKARGC(1);
+			rcarg[nrcargs++] = iropt;
+		}
 		if (xrs) {
 			CHECKARGC(2);
 			rcarg[nrcargs++] = "-x";
@@ -1272,7 +1314,12 @@ done_opts:
 			rcarg[nrcargs++] = ldopt;
 		}
 		if (sampcnt <= 0) sampcnt = 1;
-	} else {			/* else FVECT determines input format */
+	} else {			/* else in sampling mode */
+		if (iropt) {
+			fputs(progname, stderr);
+			fputs(": -i, -I supported for pass-through only\n", stderr);
+			return(1);
+		}
 		fmtopt[2] = (sizeof(RREAL)==sizeof(double)) ? 'd' : 'f';
 		if (sampcnt <= 0) sampcnt = 10000;
 	}
@@ -1312,7 +1359,7 @@ done_opts:
 	if (verbose) {
 		fprintf(stderr, "%s: sampling %d directions", progname, nsbins);
 		if (curparams.nsurfs > 1)
-			fprintf(stderr, " (%d surfaces)\n", curparams.nsurfs);
+			fprintf(stderr, " (%d elements)\n", curparams.nsurfs);
 		else
 			fputc('\n', stderr);
 	}
@@ -1323,7 +1370,7 @@ done_opts:
 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 [system.rad ..]\n",
+	fprintf(stderr, "Usage: %s [-v][rcontrib options] sender.rad receiver.rad [-i system.oct] [system.rad ..]\n",
 				progname);
 	return(1);
 }