--- ray/src/util/rfluxmtx.c	2014/07/22 23:21:56	2.5
+++ ray/src/util/rfluxmtx.c	2014/07/25 15:46:10	2.8
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rfluxmtx.c,v 2.5 2014/07/22 23:21:56 greg Exp $";
+static const char RCSid[] = "$Id: rfluxmtx.c,v 2.8 2014/07/25 15:46:10 greg Exp $";
 #endif
 /*
  * Calculate flux transfer matrix or matrices using rcontrib
@@ -96,6 +96,7 @@ typedef struct param_s {
 
 PARAMS		curparams;
 char		curmod[128];
+char		newparams[1024];
 
 typedef int	SURFSAMP(FVECT, SURF *, double);
 
@@ -109,7 +110,6 @@ SURFSAMP	*orig_in_surf[4] = {
 static void
 clear_params(PARAMS *p, int reset_only)
 {
-	curmod[0] = '\0';
 	while (p->slist != NULL) {
 		SURF	*sdel = p->slist;
 		p->slist = sdel->next;
@@ -124,7 +124,7 @@ clear_params(PARAMS *p, int reset_only)
 		p->outfn = NULL;
 		return;
 	}
-	memset(p, 0, sizeof(curparams));
+	memset(p, 0, sizeof(PARAMS));
 }
 
 /* Get surface type from name */
@@ -309,7 +309,7 @@ nextchar:
 
 /* Parse program parameters (directives) */
 static int
-parse_params(char *pargs)
+parse_params(PARAMS *p, char *pargs)
 {
 	char	*cp = pargs;
 	int	nparams = 0;
@@ -320,24 +320,23 @@ parse_params(char *pargs)
 		case 'h':
 			if (*cp++ != '=')
 				break;
-			curparams.hsiz = 0;
+			p->hsiz = 0;
 			i = 0;
 			while (*cp && !isspace(*cp)) {
 				if (isdigit(*cp))
-					curparams.hsiz = 10*curparams.hsiz +
-								*cp - '0';
-				curparams.hemis[i++] = *cp++;
+					p->hsiz = 10*p->hsiz + *cp - '0';
+				p->hemis[i++] = *cp++;
 			}
 			if (!i)
 				break;
-			curparams.hemis[i] = '\0';
-			curparams.hsiz += !curparams.hsiz;
+			p->hemis[i] = '\0';
+			p->hsiz += !p->hsiz;
 			++nparams;
 			continue;
 		case 'u':
 			if (*cp++ != '=')
 				break;
-			if (!get_direction(curparams.vup, cp))
+			if (!get_direction(p->vup, cp))
 				break;
 			++nparams;
 			continue;
@@ -350,7 +349,7 @@ parse_params(char *pargs)
 			if (!i)
 				break;
 			*--cp = '\0';
-			curparams.outfn = savqstr(cp-i);
+			p->outfn = savqstr(cp-i);
 			*cp++ = ' ';
 			++nparams;
 			continue;
@@ -554,7 +553,7 @@ ssamp_ring(FVECT orig, SURF *sp, double x)
 		sp->priv = (void *)uva;
 	}
 	SDmultiSamp(samp2, 2, x);
-	samp2[0] = sp->farg[6] + sqrt(samp2[0]*sp->area*(1./PI));
+	samp2[0] = sqrt(samp2[0]*sp->area*(1./PI) + sp->farg[6]*sp->farg[6]);
 	samp2[1] *= 2.*PI;
 	uv[0] = samp2[0]*tcos(samp2[1]);
 	uv[1] = samp2[0]*tsin(samp2[1]);
@@ -607,8 +606,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];
@@ -657,8 +660,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 */
@@ -672,8 +679,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++];
@@ -746,7 +757,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;
@@ -771,7 +782,7 @@ 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[2] = cos(alt);	/* measured from horizon */
 		duvw[0] = tcos(azi)*duvw[2];
 		duvw[1] = tsin(azi)*duvw[2];
 		duvw[2] = sqrt(1. - duvw[2]*duvw[2]);
@@ -989,7 +1000,8 @@ 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]);
@@ -1008,11 +1020,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);
 }
@@ -1044,13 +1056,15 @@ add_recv_object(FILE *fp)
 				finish_receiver();
 				clear_params(&curparams, 1);
 			}
+			parse_params(&curparams, newparams);
+			newparams[0] = '\0';
 			strcpy(curmod, thismod);
 		}
 		add_surface(st, oname, fp);	/* read & store surface */
 		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;
 	while (n-- > 0) fscanf(fp, "%*d");
@@ -1080,11 +1094,13 @@ add_send_object(FILE *fp)
 			fputs(": cannot use source as a sender!\n", stderr);
 			return(-1);
 		}
+		parse_params(&curparams, newparams);
+		newparams[0] = '\0';
 		add_surface(st, oname, fp);	/* read & store surface */
 		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;
 	while (n-- > 0) fscanf(fp, "%*d");
@@ -1128,7 +1144,7 @@ load_scene(const char *inspec, int (*ocb)(FILE *))
 			if (!isspace(c) && fscanf(fp, "%s", inpbuf) == 1 &&
 					!strcmp(inpbuf, PARAMSTART)) {
 				if (fgets(inpbuf, sizeof(inpbuf), fp) != NULL)
-					parse_params(inpbuf);
+					strcat(newparams, inpbuf);
 				continue;
 			}
 			while ((c = getc(fp)) != EOF && c != '\n');
@@ -1156,6 +1172,7 @@ main(int argc, char *argv[])
 {
 	char	fmtopt[6] = "-faa";	/* default output is ASCII */
 	char	*xrs=NULL, *yrs=NULL, *ldopt=NULL;
+	int	wantIrradiance = 0;
 	char	*sendfn;
 	char	sampcntbuf[32], nsbinbuf[32];
 	FILE	*rcfp;
@@ -1180,9 +1197,9 @@ main(int argc, char *argv[])
 			case 'f':
 			case 'd':
 			case 'c':
-				if (!(fmtopt[4] = argv[a][3]))
-					fmtopt[4] = argv[a][2];
-				fmtopt[3] = argv[a][2];
+				if (!(fmtopt[3] = argv[a][3]))
+					fmtopt[3] = argv[a][2];
+				fmtopt[2] = argv[a][2];
 				na = 0;
 				continue;	/* will pass later */
 			default:
@@ -1198,11 +1215,15 @@ main(int argc, char *argv[])
 			na = 0;
 			continue;
 		case 'c':		/* number of samples */
-			sampcnt = atoi(argv[a+1]);
+			sampcnt = atoi(argv[++a]);
 			if (sampcnt <= 0)
 				goto userr;
 			na = 0;		/* we re-add this later */
 			continue;
+		case 'I':		/* only for pass-through mode */
+			wantIrradiance = 1;
+			na = 0;
+			continue;
 		case 'V':		/* options without arguments */
 		case 'w':
 		case 'u':
@@ -1254,6 +1275,10 @@ done_opts:
 	if (sendfn[0] == '-') {		/* user wants pass-through mode? */
 		if (sendfn[1]) goto userr;
 		sendfn = NULL;
+		if (wantIrradiance) {
+			CHECKARGC(1);
+			rcarg[nrcargs++] = "-I";
+		}
 		if (xrs) {
 			CHECKARGC(2);
 			rcarg[nrcargs++] = "-x";
@@ -1269,8 +1294,13 @@ done_opts:
 			rcarg[nrcargs++] = ldopt;
 		}
 		if (sampcnt <= 0) sampcnt = 1;
-	} else {			/* else FVECT determines input format */
-		fmtopt[3] = (sizeof(RREAL)==sizeof(double)) ? 'd' : 'f';
+	} else {			/* else in sampling mode */
+		if (wantIrradiance) {
+			fputs(progname, stderr);
+			fputs(": -I supported for pass-through only\n", stderr);
+			return(1);
+		}
+		fmtopt[2] = (sizeof(RREAL)==sizeof(double)) ? 'd' : 'f';
 		if (sampcnt <= 0) sampcnt = 10000;
 	}
 	sprintf(sampcntbuf, "%d", sampcnt);
@@ -1309,7 +1339,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);
 	}