ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/util/dctimestep.c

Comparing ray/src/util/dctimestep.c (file contents):
Revision 2.14 by greg, Sun Apr 3 03:06:19 2011 UTC vs.
Revision 2.15 by greg, Fri Apr 8 18:13:48 2011 UTC

#	Line 10 | Line 10 | static const char RCSid[] = "$Id$";
10		#include <ctype.h>
11		#include "standard.h"
12		#include "platform.h"
13	+	#include "paths.h"
14		#include "color.h"
15		#include "resolu.h"
16		#include "bsdf.h"
17	+	#include "bsdf_m.h"
18
19		char    *progname;                      /* global argv[0] */
20
#	Line 291 | Line 293 | cm_print(const CMATRIX *cm, FILE *fp)
293		}
294		}
295
296	<	/* convert a BSDF to our matrix representation */
296	>	/* Convert a BSDF to our matrix representation */
297		static CMATRIX *
298	<	cm_bsdf(const struct BSDF_data *bsdf)
298	>	cm_bsdf(const COLOR bsdfLamb, const COLOR specCol, const SDMat *bsdf)
299		{
300	<	CMATRIX *cm = cm_alloc(bsdf->nout, bsdf->ninc);
300	>	CMATRIX *cm;
301		int     nbadohm = 0;
302		int     nneg = 0;
303	+	FVECT   v;
304	+	float   dom;
305	+	int     doforward;
306		int     r, c;
307	<
308	<	for (c = 0; c < cm->ncols; c++) {
309	<	float   dom = getBSDF_incohm(bsdf,c);
310	<	FVECT   v;
311	<
312	<	if (dom <= .0) {
313	<	nbadohm++;
314	<	continue;
307	>
308	>	mBSDF_incvec(v, bsdf, .5);      /* check BTDF orientation */
309	>
310	>	if (v[2] < 0) {                 /* incident from outside */
311	>	cm = cm_alloc(bsdf->nout, bsdf->ninc);
312	>	for (c = 0; c < cm->ncols; c++) {
313	>	dom = mBSDF_incohm(bsdf,c);
314	>
315	>	nbadohm += (dom <= 0);
316	>
317	>	if (!mBSDF_incvec(v,bsdf,c+.5) || v[2] > 0)
318	>	error(USER, "illegal incoming BTDF direction");
319	>	dom *= -v[2];
320	>
321	>	for (r = 0; r < cm->nrows; r++) {
322	>	float   f = mBSDF_value(bsdf,c,r);
323	>	COLORV  *mp = cm_lval(cm,r,c);
324	>
325	>	if ((f <= 0) | (dom <= 0)) {
326	>	nneg += (f < -FTINY);
327	>	f = .0f;
328	>	}
329	>	copycolor(mp, specCol);
330	>	f *= dom;
331	>	scalecolor(mp, f);
332	>	addcolor(mp, bsdfLamb);
333	>	}
334		}
335	<	if (!getBSDF_incvec(v,bsdf,c) || v[2] > FTINY)
336	<	error(USER, "illegal incoming BTDF direction");
337	<	dom *= -v[2];
335	>	} else {                        /* rely on reciprocity */
336	>	cm = cm_alloc(bsdf->ninc, bsdf->nout);
337	>	for (c = 0; c < cm->ncols; c++) {
338	>	dom = mBSDF_outohm(bsdf,c);
339	>
340	>	nbadohm += (dom <= 0);
341
342	<	for (r = 0; r < cm->nrows; r++) {
343	<	float   f = BSDF_value(bsdf,c,r);
344	<	COLORV  *mp = cm_lval(cm,r,c);
342	>	if (!mBSDF_outvec(v,bsdf,c+.5) || v[2] > 0)
343	>	error(USER, "illegal outgoing BTDF direction");
344	>	dom *= -v[2];
345
346	<	if (f <= .0) {
347	<	nneg += (f < -FTINY);
348	<	f = .0f;
346	>	for (r = 0; r < cm->nrows; r++) {
347	>	float   f = mBSDF_value(bsdf,r,c);
348	>	COLORV  *mp = cm_lval(cm,r,c);
349	>
350	>	if ((f <= 0) | (dom <= 0)) {
351	>	nneg += (f < -FTINY);
352	>	f = .0f;
353	>	}
354	>	copycolor(mp, specCol);
355	>	f *= dom;
356	>	scalecolor(mp, f);
357	>	addcolor(mp, bsdfLamb);
358		}
323	–	mp[0] = mp[1] = mp[2] = f * dom;
359		}
360		}
361	<	if (nneg || nbadohm) {
361	>	if (nneg | nbadohm) {
362		sprintf(errmsg,
363		"BTDF has %d negatives and %d bad incoming solid angles",
364		nneg, nbadohm);
#	Line 332 | Line 367 | cm_bsdf(const struct BSDF_data *bsdf)
367		return(cm);
368		}
369
370	+	/* Load and convert a matrix BSDF from the given XML file */
371	+	static CMATRIX *
372	+	cm_loadBSDF(char *fname)
373	+	{
374	+	CMATRIX *Tmat;
375	+	char    *fpath;
376	+	SDError ec;
377	+	SDData  myBSDF;
378	+	COLOR   bsdfLamb, specCol;
379	+	/* find path to BSDF file */
380	+	fpath = getpath(fname, getrlibpath(), R_OK);
381	+	if (fpath == NULL) {
382	+	sprintf(errmsg, "cannot find BSDF file '%s'", fname);
383	+	error(USER, errmsg);
384	+	}
385	+	SDclipName(myBSDF.name, fname);
386	+	/* load XML and check type */
387	+	ec = SDloadFile(&myBSDF, fpath);
388	+	if (ec)
389	+	error(USER, transSDError(ec));
390	+	if (myBSDF.tf == NULL || myBSDF.tf->ncomp != 1 ||
391	+	myBSDF.tf->comp[0].func != &SDhandleMtx) {
392	+	sprintf(errmsg, "unsupported BSDF '%s'", fpath);
393	+	error(USER, errmsg);
394	+	}
395	+	/* convert BTDF to matrix */
396	+	ccy2rgb(&myBSDF.tLamb.spec, myBSDF.tLamb.cieY/PI, bsdfLamb);
397	+	ccy2rgb(&myBSDF.tf->comp[0].cspec[0], 1., specCol);
398	+	Tmat = cm_bsdf(bsdfLamb, specCol, (SDMat *)myBSDF.tf->comp[0].dist);
399	+	/* free BSDF and return */
400	+	SDfreeBSDF(&myBSDF);
401	+	return(Tmat);
402	+	}
403	+
404		/* Sum together a set of images and write result to stdout */
405		static int
406		sum_images(const char *fspec, const CMATRIX *cv, FILE *fout)
#	Line 351 | Line 420 | sum_images(const char *fspec, const CMATRIX *cv, FILE
420		int             dt, xr, yr;
421		COLORV          *psp;
422		/* check for zero */
423	<	if ((scv[RED] == .0) & (scv[GRN] == .0) & (scv[BLU] == .0))
423	>	if ((scv[RED] == 0) & (scv[GRN] == 0) & (scv[BLU] == 0))
424		continue;
425		/* open next picture */
426		sprintf(fname, fspec, i);
#	Line 421 | Line 490 | hasNumberFormat(const char *s)
490		++s;
491		while (isdigit(*s));
492
493	<	return(*s == 'd' | *s == 'i' | *s == 'o' | *s == 'x' | *s == 'X');
493	>	return((*s == 'd') | (*s == 'i') | (*s == 'o') |
494	>	(*s == 'x') | (*s == 'X'));
495		}
496
497		int
#	Line 440 | Line 510 | main(int argc, char *argv[])
510
511		if (argc > 3) {                         /* VTDs expression */
512		CMATRIX *svec, *Dmat, *Tmat, *ivec;
443	–	struct BSDF_data        *btdf;
513		/* get sky vector */
514		svec = cm_load(argv[4], 0, 1, DTascii);
515		/* load BSDF */
516	<	btdf = load_BSDF(argv[2]);
448	<	if (btdf == NULL)
449	<	return(1);
516	>	Tmat = cm_loadBSDF(argv[2]);
517		/* load Daylight matrix */
518	<	Dmat = cm_load(argv[3], btdf->ninc, svec->nrows, DTfromHeader);
518	>	Dmat = cm_load(argv[3], Tmat->ncols, svec->nrows, DTfromHeader);
519		/* multiply vector through */
520		ivec = cm_multiply(Dmat, svec);
521		cm_free(Dmat); cm_free(svec);
455	–	Tmat = cm_bsdf(btdf);           /* convert BTDF to matrix */
456	–	free_BSDF(btdf);
522		cvec = cm_multiply(Tmat, ivec); /* cvec = component vector */
523		cm_free(Tmat); cm_free(ivec);
524		} else {                                /* else just use sky vector */

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)