--- ray/src/util/dctimestep.c	2009/06/17 20:41:47	2.1
+++ ray/src/util/dctimestep.c	2009/12/09 20:33:48	2.11
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: dctimestep.c,v 2.1 2009/06/17 20:41:47 greg Exp $";
+static const char RCSid[] = "$Id: dctimestep.c,v 2.11 2009/12/09 20:33:48 greg Exp $";
 #endif
 /*
  * Compute time-step result using Daylight Coefficient method.
@@ -16,7 +16,7 @@ static const char RCSid[] = "$Id: dctimestep.c,v 2.1 2
 
 char	*progname;			/* global argv[0] */
 
-/* Data types for matrix loading */
+/* Data types for file loading */
 enum {DTfromHeader, DTascii, DTfloat, DTdouble, DTrgbe, DTxyze};
 
 /* A color coefficient matrix -- vectors have ncols==1 */
@@ -38,7 +38,7 @@ cm_alloc(int nrows, int ncols)
 	CMATRIX	*cm;
 
 	if ((nrows <= 0) | (ncols <= 0))
-		return(NULL);
+		error(USER, "attempt to create empty matrix");
 	cm = (CMATRIX *)malloc(sizeof(CMATRIX) +
 				3*sizeof(COLORV)*(nrows*ncols - 1));
 	if (cm == NULL)
@@ -125,7 +125,6 @@ cm_load(const char *fname, int nrows, int ncols, int d
 		break;
 	default:
 		error(USER, "unexpected data type in cm_load()");
-		return(NULL);
 	}
 	if (nrows <= 0) {			/* don't know length? */
 		int	guessrows = 147;	/* usually big enough */
@@ -135,15 +134,21 @@ cm_load(const char *fname, int nrows, int ncols, int d
 				long	endpos = ftell(fp);
 				long	elemsiz = 3*(dtype==DTfloat ?
 					    sizeof(float) : sizeof(double));
-				guessrows = (endpos - startpos)/elemsiz;
+
+				if ((endpos - startpos) % (ncols*elemsiz)) {
+					sprintf(errmsg,
+					"improper length for binary file '%s'",
+							fname);
+					error(USER, errmsg);
+				}
+				guessrows = (endpos - startpos)/(ncols*elemsiz);
 				if (fseek(fp, startpos, SEEK_SET) < 0) {
 					sprintf(errmsg,
 						"fseek() error on file '%s'",
 							fname);
 					error(SYSTEM, errmsg);
 				}
-				if ((endpos - startpos) % elemsiz == 0)
-					nrows = guessrows;	/* confident */
+				nrows = guessrows;	/* we're confident */
 			}
 		}
 		cm = cm_alloc(guessrows, ncols);
@@ -155,12 +160,12 @@ cm_load(const char *fname, int nrows, int ncols, int d
 		int	maxrow = (nrows > 0 ? nrows : 32000);
 		int	r, c;
 		for (r = 0; r < maxrow; r++) {
-		    if (r >= cm->nrows)		/* need more space? */
+		    if (r >= cm->nrows)			/* need more space? */
 			cm = cm_resize(cm, 2*cm->nrows);
 		    for (c = 0; c < ncols; c++) {
 		        COLORV	*cv = cm_lval(cm,r,c);
 			if (fscanf(fp, COLSPEC, cv, cv+1, cv+2) != 3)
-				if ((nrows <= 0) & (r > 0) & (c == 0)) {
+				if ((nrows <= 0) & (r > 0) & !c) {
 					cm = cm_resize(cm, maxrow=r);
 					break;
 				} else
@@ -188,7 +193,7 @@ cm_load(const char *fname, int nrows, int ncols, int d
 					if (nread == cm->nrows*cm->ncols)
 							/* need more space? */
 						cm = cm_resize(cm, 2*cm->nrows);
-					else if (nread % cm->ncols == 0)
+					else if (nread && !(nread % cm->ncols))
 							/* seem to be  done */
 						cm = cm_resize(cm, nread/cm->ncols);
 					else		/* ended mid-row */
@@ -210,7 +215,6 @@ cm_load(const char *fname, int nrows, int ncols, int d
 				copycolor(cvp, dc);
 				cvp += 3;
 			}
-
 		} else /* dtype == DTfloat */ {
 			float	fc[3];			/* load from float */
 			COLORV	*cvp = cm->cmem;
@@ -290,12 +294,39 @@ static CMATRIX *
 cm_bsdf(const struct BSDF_data *bsdf)
 {
 	CMATRIX	*cm = cm_alloc(bsdf->nout, bsdf->ninc);
-	COLORV	*mp = cm->cmem;
+	int	nbadohm = 0;
+	int	nneg = 0;
 	int	r, c;
 	
-	for (r = 0; r < cm->nrows; r++)
-		for (c = 0; c < cm->ncols; c++, mp += 3)
-			mp[0] = mp[1] = mp[2] = BSDF_value(bsdf,c,r);
+	for (c = 0; c < cm->ncols; c++) {
+		float	dom = getBSDF_incohm(bsdf,c);
+		FVECT	v;
+		
+		if (dom <= .0) {
+			nbadohm++;
+			continue;
+		}
+		if (!getBSDF_incvec(v,bsdf,c) || v[2] > FTINY)
+			error(USER, "illegal incoming BTDF direction");
+		dom *= -v[2];
+
+		for (r = 0; r < cm->nrows; r++) {
+			float	f = BSDF_value(bsdf,c,r);
+			COLORV	*mp = cm_lval(cm,r,c);
+
+			if (f <= .0) {
+				nneg += (f < -FTINY);
+				f = .0f;
+			}
+			mp[0] = mp[1] = mp[2] = f * dom;
+		}
+	}
+	if (nneg || nbadohm) {
+		sprintf(errmsg,
+		    "BTDF has %d negatives and %d bad incoming solid angles",
+				nneg, nbadohm);
+		error(WARNING, errmsg);
+	}
 	return(cm);
 }
 
@@ -338,6 +369,11 @@ sum_images(const char *fspec, const CMATRIX *cv)
 				error(SYSTEM, "out of memory in sum_images()");
 			pmat = cm_alloc(myYR, myXR);
 			memset(pmat->cmem, 0, sizeof(COLOR)*myXR*myYR);
+							/* finish header */
+			fputformat(myDT==DTrgbe ? COLRFMT : CIEFMT, stdout);
+			fputc('\n', stdout);
+			fprtresolu(myXR, myYR, stdout);
+			fflush(stdout);
 		} else if ((dt != myDT) | (xr != myXR) | (yr != myYR)) {
 			sprintf(errmsg, "picture '%s' format/size mismatch",
 					fname);
@@ -360,10 +396,6 @@ sum_images(const char *fspec, const CMATRIX *cv)
 		fclose(fp);				/* done this picture */
 	}
 	free(scanline);
-							/* finish header */
-	fputformat(myDT==DTrgbe ? COLRFMT : CIEFMT, stdout);
-	fputc('\n', stdout);
-	fprtresolu(myXR, myYR, stdout);
 							/* write scanlines */
 	for (y = 0; y < myYR; y++)
 		if (fwritescan((COLOR *)cm_lval(pmat, y, 0), myXR, stdout) < 0)
@@ -372,9 +404,9 @@ sum_images(const char *fspec, const CMATRIX *cv)
 	return(fflush(stdout) == 0);
 }
 
-/* check to see if a string contains a %d specification */
-int
-hasDecimalSpec(const char *s)
+/* check to see if a string contains a %d or %o specification */
+static int
+hasNumberFormat(const char *s)
 {
 	while (*s && *s != '%')
 		s++;
@@ -384,13 +416,13 @@ hasDecimalSpec(const char *s)
 		++s;
 	while (isdigit(*s));
 
-	return(*s == 'd');
+	return(*s == 'd' | *s == 'i' | *s == 'o' | *s == 'x' | *s == 'X');
 }
 
 int
 main(int argc, char *argv[])
 {
-	CMATRIX			*tvec, *Dmat, *Tmat, *vtmp, *cvec;
+	CMATRIX			*tvec, *Dmat, *Tmat, *ivec, *cvec;
 	struct BSDF_data	*btdf;
 
 	progname = argv[0];
@@ -400,24 +432,22 @@ main(int argc, char *argv[])
 				progname);
 		return(1);
 	}
+						/* load Tregenza vector */
 	tvec = cm_load(argv[4], 0, 1, DTascii);	/* argv[4]==NULL iff argc==4 */
-	Dmat = cm_load(argv[3], 0, tvec->nrows, DTfromHeader);
+						/* load BTDF */
 	btdf = load_BSDF(argv[2]);
 	if (btdf == NULL)
 		return(1);
-	if (btdf->ninc != Dmat->nrows) {
-		sprintf(errmsg, "Incoming BTDF dir (%d) mismatch to D (%d)",
-				btdf->ninc, Dmat->nrows);
-		error(USER, errmsg);
-	}
+						/* load Daylight matrix */
+	Dmat = cm_load(argv[3], btdf->ninc, tvec->nrows, DTfromHeader);
 						/* multiply vector through */
-	vtmp = cm_multiply(Dmat, tvec);
+	ivec = cm_multiply(Dmat, tvec);
 	cm_free(Dmat); cm_free(tvec);
 	Tmat = cm_bsdf(btdf);			/* convert BTDF to matrix */
 	free_BSDF(btdf);
-	cvec = cm_multiply(Tmat, vtmp);		/* cvec = component vector */
-	cm_free(Tmat); cm_free(vtmp);
-	if (hasDecimalSpec(argv[1])) {		/* generating image */
+	cvec = cm_multiply(Tmat, ivec);		/* cvec = component vector */
+	cm_free(Tmat); cm_free(ivec);
+	if (hasNumberFormat(argv[1])) {		/* generating image */
 		SET_FILE_BINARY(stdout);
 		newheader("RADIANCE", stdout);
 		printargs(argc, argv, stdout);