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.19 by greg, Tue Feb 21 20:09:25 2012 UTC vs.
Revision 2.20 by greg, Tue Aug 7 18:17:17 2012 UTC

#	Line 252 | Line 252 | not_handled:
252		return(NULL);   /* gratis return */
253		}
254
255	<	/* Multiply two matrices (or a matrix and a vector) and allocate the result*/
255	>	/* Scale a matrix by a single value */
256		static CMATRIX *
257	+	cm_scale(const CMATRIX *cm1, const COLOR sca)
258	+	{
259	+	CMATRIX *cmr;
260	+	int     dr, dc;
261	+
262	+	cmr = cm_alloc(cm1->nrows, cm1->ncols);
263	+	if (cmr == NULL)
264	+	return(NULL);
265	+	for (dr = 0; dr < cmr->nrows; dr++)
266	+	for (dc = 0; dc < cmr->ncols; dc++) {
267	+	const COLORV    *sp = cm_lval(cm1,dr,dc);
268	+	COLORV          *dp = cm_lval(cmr,dr,dc);
269	+	dp[0] = sp[0] * sca[0];
270	+	dp[1] = sp[1] * sca[1];
271	+	dp[2] = sp[2] * sca[2];
272	+	}
273	+	return(cmr);
274	+	}
275	+
276	+	/* Multiply two matrices (or a matrix and a vector) and allocate the result */
277	+	static CMATRIX *
278		cm_multiply(const CMATRIX *cm1, const CMATRIX *cm2)
279		{
280		CMATRIX *cmr;
#	Line 332 | Line 353 | cm_bsdf(const COLOR bsdfLamb, const COLOR specCol, con
353
354		/* Load and convert a matrix BSDF from the given XML file */
355		static CMATRIX *
356	<	cm_loadBSDF(char *fname)
356	>	cm_loadBSDF(char *fname, COLOR cLamb)
357		{
358		CMATRIX *Tmat;
359		char    *fpath;
#	Line 349 | Line 370 | cm_loadBSDF(char *fname)
370		ec = SDloadFile(&myBSDF, fpath);
371		if (ec)
372		error(USER, transSDError(ec));
373	<	if (myBSDF.tf == NULL || myBSDF.tf->ncomp != 1 ||
374	<	myBSDF.tf->comp[0].func != &SDhandleMtx) {
373	>	ccy2rgb(&myBSDF.tLamb.spec, myBSDF.tLamb.cieY/PI, bsdfLamb);
374	>	if (myBSDF.tf == NULL) {        /* no non-Lambertian transmission? */
375	>	if (cLamb != NULL)
376	>	copycolor(cLamb, bsdfLamb);
377	>	SDfreeBSDF(&myBSDF);
378	>	return(NULL);
379	>	}
380	>	if (myBSDF.tf->ncomp != 1 || myBSDF.tf->comp[0].func != &SDhandleMtx) {
381		sprintf(errmsg, "unsupported BSDF '%s'", fpath);
382		error(USER, errmsg);
383		}
384		/* convert BTDF to matrix */
358	–	ccy2rgb(&myBSDF.tLamb.spec, myBSDF.tLamb.cieY/PI, bsdfLamb);
385		ccy2rgb(&myBSDF.tf->comp[0].cspec[0], 1., specCol);
386		Tmat = cm_bsdf(bsdfLamb, specCol, (SDMat *)myBSDF.tf->comp[0].dist);
387	+	if (cLamb != NULL)              /* Lambertian is included */
388	+	setcolor(cLamb, .0, .0, .0);
389		/* free BSDF and return */
390		SDfreeBSDF(&myBSDF);
391		return(Tmat);
#	Line 466 | Line 494 | hasNumberFormat(const char *s)
494		int
495		main(int argc, char *argv[])
496		{
497	<	CMATRIX                 *cvec;
497	>	CMATRIX                 *cvec;          /* component vector result */
498
499		progname = argv[0];
500
#	Line 479 | Line 507 | main(int argc, char *argv[])
507
508		if (argc > 3) {                         /* VTDs expression */
509		CMATRIX *svec, *Dmat, *Tmat, *ivec;
510	+	COLOR   tLamb;
511		/* get sky vector */
512		svec = cm_load(argv[4], 0, 1, DTascii);
513		/* load BSDF */
514	<	Tmat = cm_loadBSDF(argv[2]);
514	>	Tmat = cm_loadBSDF(argv[2], tLamb);
515		/* load Daylight matrix */
516	<	Dmat = cm_load(argv[3], Tmat->ncols, svec->nrows, DTfromHeader);
516	>	Dmat = cm_load(argv[3], Tmat==NULL ? 0 : Tmat->ncols,
517	>	svec->nrows, DTfromHeader);
518		/* multiply vector through */
519		ivec = cm_multiply(Dmat, svec);
520		cm_free(Dmat); cm_free(svec);
521	<	cvec = cm_multiply(Tmat, ivec); /* cvec = component vector */
522	<	cm_free(Tmat); cm_free(ivec);
521	>	if (Tmat == NULL) {             /* diffuse only */
522	>	cvec = cm_scale(ivec, tLamb);
523	>	} else {                        /* else apply BTDF matrix */
524	>	cvec = cm_multiply(Tmat, ivec);
525	>	cm_free(Tmat);
526	>	}
527	>	cm_free(ivec);
528		} else {                                /* else just use sky vector */
529		cvec = cm_load(argv[2], 0, 1, DTascii);
530		}

Diff Legend

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