[ViewVC] Diff of: radiance/ray/src/common/bsdf.c

Comparing ray/src/common/bsdf.c (file contents):
Revision 2.18 by greg, Fri Apr 8 23:23:28 2011 UTC vs.
Revision 2.46 by greg, Thu Jul 4 15:14:45 2013 UTC

#	Line 10 \| Line 10 \| static const char RCSid[] = "$Id$";
10		*
11		*/
12
13	+	#define _USE_MATH_DEFINES
14		#include <stdio.h>
15		#include <stdlib.h>
16	+	#include <string.h>
17		#include <math.h>
18	+	#include <ctype.h>
19		#include "ezxml.h"
20		#include "hilbert.h"
21		#include "bsdf.h"
#	Line 32 \| Line 35 \| *const char SDerrorEnglish[] = {**
35		"Unknown error"
36		};
37
38	+	/* Pointer to error list in preferred language */
39	+	const char **SDerrorList = SDerrorEnglish;
40	+
41		/* Additional information on last error (ASCII English) */
42		char SDerrorDetail[256];
43
44	+	/* Empty distribution for getCDist() calls that fail for some reason */
45	+	const SDCDst SDemptyCD;
46	+
47		/* Cache of loaded BSDFs */
48		struct SDCache_s *SDcacheList = NULL;
49
50		/* Retain BSDFs in cache list */
51		int SDretainSet = SDretainNone;
52
53	<	/* Report any error to the indicated stream (in English) */
53	>	/* Report any error to the indicated stream */
54		SDError
55	<	SDreportEnglish(SDError ec, FILE *fp)
55	>	SDreportError(SDError ec, FILE *fp)
56		{
48	–	if (fp == NULL)
49	–	return ec;
57		if (!ec)
58		return SDEnone;
59	<	fputs(SDerrorEnglish[ec], fp);
59	>	if ((ec < SDEnone) \| (ec > SDEunknown)) {
60	>	SDerrorDetail[0] = '\0';
61	>	ec = SDEunknown;
62	>	}
63	>	if (fp == NULL)
64	>	return ec;
65	>	fputs(SDerrorList[ec], fp);
66		if (SDerrorDetail[0]) {
67		fputs(": ", fp);
68		fputs(SDerrorDetail, fp);
#	Line 77 \| Line 90 \| *to_meters( / return factor to convert given unit to**
90
91		/* Load geometric dimensions and description (if any) */
92		static SDError
93	<	SDloadGeometry(SDData *sd, ezxml_t wdb)
93	>	SDloadGeometry(SDData *sd, ezxml_t wtl)
94		{
95	<	ezxml_t geom;
95	>	ezxml_t node, matl, geom;
96		double cfact;
97	<	const char fmt, mgfstr;
97	>	const char fmt = NULL, mgfstr;
98
99	<	if (wdb == NULL) /* no geometry section? */
100	<	return SDEnone;
101	<	sd->dim[0] = sd->dim[1] = sd->dim[2] = .0;
102	<	if ((geom = ezxml_child(wdb, "Width")) != NULL)
103	<	sd->dim[0] = atof(ezxml_txt(geom)) *
104	<	to_meters(ezxml_attr(geom, "unit"));
105	<	if ((geom = ezxml_child(wdb, "Height")) != NULL)
106	<	sd->dim[1] = atof(ezxml_txt(geom)) *
107	<	to_meters(ezxml_attr(geom, "unit"));
108	<	if ((geom = ezxml_child(wdb, "Thickness")) != NULL)
109	<	sd->dim[2] = atof(ezxml_txt(geom)) *
110	<	to_meters(ezxml_attr(geom, "unit"));
111	<	if ((sd->dim[0] < .0) \| (sd->dim[1] < .0) \| (sd->dim[2] < .0)) {
112	<	sprintf(SDerrorDetail, "Negative size in \"%s\"", sd->name);
113	<	return SDEdata;
99	>	SDerrorDetail[0] = '\0';
100	>	sd->matn[0] = '\0'; sd->makr[0] = '\0';
101	>	sd->dim[0] = sd->dim[1] = sd->dim[2] = 0;
102	>	matl = ezxml_child(wtl, "Material");
103	>	if (matl != NULL) { /* get material info. */
104	>	if ((node = ezxml_child(matl, "Name")) != NULL) {
105	>	strncpy(sd->matn, ezxml_txt(node), SDnameLn);
106	>	if (sd->matn[SDnameLn-1])
107	>	strcpy(sd->matn+(SDnameLn-4), "...");
108	>	}
109	>	if ((node = ezxml_child(matl, "Manufacturer")) != NULL) {
110	>	strncpy(sd->makr, ezxml_txt(node), SDnameLn);
111	>	if (sd->makr[SDnameLn-1])
112	>	strcpy(sd->makr+(SDnameLn-4), "...");
113	>	}
114	>	if ((node = ezxml_child(matl, "Width")) != NULL)
115	>	sd->dim[0] = atof(ezxml_txt(node)) *
116	>	to_meters(ezxml_attr(node, "unit"));
117	>	if ((node = ezxml_child(matl, "Height")) != NULL)
118	>	sd->dim[1] = atof(ezxml_txt(node)) *
119	>	to_meters(ezxml_attr(node, "unit"));
120	>	if ((node = ezxml_child(matl, "Thickness")) != NULL)
121	>	sd->dim[2] = atof(ezxml_txt(node)) *
122	>	to_meters(ezxml_attr(node, "unit"));
123	>	if ((sd->dim[0] < 0) \| (sd->dim[1] < 0) \| (sd->dim[2] < 0)) {
124	>	if (!SDerrorDetail[0])
125	>	sprintf(SDerrorDetail, "Negative dimension in \"%s\"",
126	>	sd->name);
127	>	return SDEdata;
128	>	}
129		}
130	<	if ((geom = ezxml_child(wdb, "Geometry")) == NULL \|\|
131	<	(mgfstr = ezxml_txt(geom)) == NULL)
130	>	sd->mgf = NULL;
131	>	geom = ezxml_child(wtl, "Geometry");
132	>	if (geom == NULL) /* no actual geometry? */
133		return SDEnone;
134	<	if ((fmt = ezxml_attr(geom, "format")) != NULL &&
135	<	strcasecmp(fmt, "MGF")) {
134	>	fmt = ezxml_attr(geom, "format");
135	>	if (fmt != NULL && strcasecmp(fmt, "MGF")) {
136		sprintf(SDerrorDetail,
137		"Unrecognized geometry format '%s' in \"%s\"",
138		fmt, sd->name);
139		return SDEsupport;
140		}
141	<	cfact = to_meters(ezxml_attr(geom, "unit"));
141	>	if ((node = ezxml_child(geom, "MGFblock")) == NULL \|\|
142	>	(mgfstr = ezxml_txt(node)) == NULL)
143	>	return SDEnone;
144	>	while (isspace(*mgfstr))
145	>	++mgfstr;
146	>	if (!*mgfstr)
147	>	return SDEnone;
148	>	cfact = to_meters(ezxml_attr(node, "unit"));
149	>	if (cfact <= 0)
150	>	return SDEformat;
151		sd->mgf = (char *)malloc(strlen(mgfstr)+32);
152		if (sd->mgf == NULL) {
153		strcpy(SDerrorDetail, "Out of memory in SDloadGeometry");
#	Line 151 \| Line 189 \| *SDloadFile(SDData sd, const char fname)*
189		ezxml_free(fl);
190		return SDEformat;
191		}
192	+	wtl = ezxml_child(fl, "FileType");
193	+	if (wtl != NULL && strcmp(ezxml_txt(wtl), "BSDF")) {
194	+	sprintf(SDerrorDetail,
195	+	"XML \"%s\": wrong FileType (must be 'BSDF')",
196	+	sd->name);
197	+	ezxml_free(fl);
198	+	return SDEformat;
199	+	}
200		wtl = ezxml_child(ezxml_child(fl, "Optical"), "Layer");
201		if (wtl == NULL) {
202	<	sprintf(SDerrorDetail, "BSDF \"%s\": no optical layer'",
202	>	sprintf(SDerrorDetail, "BSDF \"%s\": no optical layers'",
203		sd->name);
204		ezxml_free(fl);
205		return SDEformat;
206		}
207		/* load geometry if present */
208	<	lastErr = SDloadGeometry(sd, ezxml_child(wtl, "Material"));
209	<	if (lastErr)
208	>	lastErr = SDloadGeometry(sd, wtl);
209	>	if (lastErr) {
210	>	ezxml_free(fl);
211		return lastErr;
212	+	}
213		/* try loading variable resolution data */
214		lastErr = SDloadTre(sd, wtl);
215		/* check our result */
216	<	switch (lastErr) {
169	<	case SDEformat:
170	<	case SDEdata:
171	<	case SDEsupport: /* possibly we just tried the wrong format */
216	>	if (lastErr == SDEsupport) /* try matrix BSDF if not tree data */
217		lastErr = SDloadMtx(sd, wtl);
218	<	break;
174	<	default: /* variable res. OK else serious error */
175	<	break;
176	<	}
218	>
219		/* done with XML file */
220		ezxml_free(fl);
221
#	Line 191 \| Line 233 \| *SDloadFile(SDData sd, const char fname)*
233		if (sd->tf != NULL && sd->tf->maxHemi <= .001) {
234		SDfreeSpectralDF(sd->tf); sd->tf = NULL;
235		}
236	+	if (sd->tb != NULL && sd->tb->maxHemi <= .001) {
237	+	SDfreeSpectralDF(sd->tb); sd->tb = NULL;
238	+	}
239		/* return success */
240		return SDEnone;
241		}
#	Line 219 \| Line 264 \| SDnewSpectralDF(int nc)
264		return df;
265		}
266
267	+	/* Add component(s) to spectral distribution function */
268	+	SDSpectralDF *
269	+	SDaddComponent(SDSpectralDF *odf, int nadd)
270	+	{
271	+	SDSpectralDF *df;
272	+
273	+	if (odf == NULL)
274	+	return SDnewSpectralDF(nadd);
275	+	if (nadd <= 0)
276	+	return odf;
277	+	df = (SDSpectralDF *)realloc(odf, sizeof(SDSpectralDF) +
278	+	(odf->ncomp+nadd-1)*sizeof(SDComponent));
279	+	if (df == NULL) {
280	+	sprintf(SDerrorDetail,
281	+	"Cannot add %d component(s) to spectral DF", nadd);
282	+	SDfreeSpectralDF(odf);
283	+	return NULL;
284	+	}
285	+	memset(df->comp+df->ncomp, 0, nadd*sizeof(SDComponent));
286	+	df->ncomp += nadd;
287	+	return df;
288	+	}
289	+
290		/* Free cached cumulative distributions for BSDF component */
291		void
292		SDfreeCumulativeCache(SDSpectralDF *df)
#	Line 245 \| Line 313 \| *SDfreeSpectralDF(SDSpectralDF df)**
313		return;
314		SDfreeCumulativeCache(df);
315		for (n = df->ncomp; n-- > 0; )
316	<	(*df->comp[n].func->freeSC)(df->comp[n].dist);
316	>	if (df->comp[n].dist != NULL)
317	>	(*df->comp[n].func->freeSC)(df->comp[n].dist);
318		free(df);
319		}
320
#	Line 269 \| Line 338 \| *SDclipName(char res, const char fname)*
338
339		/* Initialize an unused BSDF struct (simply clears to zeroes) */
340		void
341	<	SDclearBSDF(SDData *sd)
341	>	SDclearBSDF(SDData sd, const char fname)
342		{
343	<	if (sd != NULL)
344	<	memset(sd, 0, sizeof(SDData));
343	>	if (sd == NULL)
344	>	return;
345	>	memset(sd, 0, sizeof(SDData));
346	>	if (fname == NULL)
347	>	return;
348	>	SDclipName(sd->name, fname);
349		}
350
351		/* Free data associated with BSDF struct */
#	Line 297 \| Line 370 \| *SDfreeBSDF(SDData sd)**
370		SDfreeSpectralDF(sd->tf);
371		sd->tf = NULL;
372		}
373	+	if (sd->tb != NULL) {
374	+	SDfreeSpectralDF(sd->tb);
375	+	sd->tb = NULL;
376	+	}
377		sd->rLambFront.cieY = .0;
378		sd->rLambFront.spec.flags = 0;
379		sd->rLambBack.cieY = .0;
#	Line 330 \| Line 407 \| *SDgetCache(const char bname)**
407		sdl->next = SDcacheList;
408		SDcacheList = sdl;
409
410	<	sdl->refcnt++;
410	>	sdl->refcnt = 1;
411		return &sdl->bsdf;
412		}
413
#	Line 346 \| Line 423 \| *SDcacheFile(const char fname)**
423		return NULL;
424		SDerrorDetail[0] = '\0';
425		if ((sd = SDgetCache(fname)) == NULL) {
426	<	SDreportEnglish(SDEmemory, stderr);
426	>	SDreportError(SDEmemory, stderr);
427		return NULL;
428		}
429		if (!SDisLoaded(sd) && (ec = SDloadFile(sd, fname))) {
430	<	SDreportEnglish(ec, stderr);
430	>	SDreportError(ec, stderr);
431		SDfreeCache(sd);
432		return NULL;
433		}
#	Line 374 \| Line 451 \| *SDfreeCache(const SDData sd)**
451		for (sdl = SDcacheList; sdl != NULL; sdl = (sdLast=sdl)->next)
452		if (&sdl->bsdf == sd)
453		break;
454	<	if (sdl == NULL \|\| --sdl->refcnt)
454	>	if (sdl == NULL \|\| (sdl->refcnt -= (sdl->refcnt > 0)))
455		return; /* missing or still in use */
456		/* keep unreferenced data? */
457		if (SDisLoaded(sd) && SDretainSet) {
#	Line 384 \| Line 461 \| *SDfreeCache(const SDData sd)**
461		SDfreeCumulativeCache(sd->rf);
462		SDfreeCumulativeCache(sd->rb);
463		SDfreeCumulativeCache(sd->tf);
464	+	SDfreeCumulativeCache(sd->tb);
465		return;
466		}
467		/* remove from list and free */
#	Line 397 \| Line 475 \| *SDfreeCache(const SDData sd)**
475
476		/* Sample an individual BSDF component */
477		SDError
478	<	SDsampComponent(SDValue *sv, FVECT outVec, const FVECT inVec,
401	<	double randX, SDComponent *sdc)
478	>	SDsampComponent(SDValue sv, FVECT ioVec, double randX, SDComponent sdc)
479		{
480		float coef[SDmaxCh];
481		SDError ec;
482	+	FVECT inVec;
483		const SDCDst *cd;
484		double d;
485		int n;
486		/* check arguments */
487	<	if ((sv == NULL) \| (outVec == NULL) \| (inVec == NULL) \| (sdc == NULL))
487	>	if ((sv == NULL) \| (ioVec == NULL) \| (sdc == NULL))
488		return SDEargument;
489		/* get cumulative distribution */
490	+	VCOPY(inVec, ioVec);
491	+	sv->cieY = 0;
492		cd = (*sdc->func->getCDist)(inVec, sdc);
493	<	if (cd == NULL)
494	<	return SDEmemory;
495	<	if (cd->cTotal <= 1e-7) { /* anything to sample? */
493	>	if (cd != NULL)
494	>	sv->cieY = cd->cTotal;
495	>	if (sv->cieY <= 1e-6) { /* nothing to sample? */
496		sv->spec = c_dfcolor;
497	<	sv->cieY = .0;
418	<	memset(outVec, 0, 3*sizeof(double));
497	>	memset(ioVec, 0, 3*sizeof(double));
498		return SDEnone;
499		}
421	–	sv->cieY = cd->cTotal;
500		/* compute sample direction */
501	<	ec = (*sdc->func->sampCDist)(outVec, randX, cd);
501	>	ec = (*sdc->func->sampCDist)(ioVec, randX, cd);
502		if (ec)
503		return ec;
504		/* get BSDF color */
505	<	n = (*sdc->func->getBSDFs)(coef, outVec, inVec, sdc->dist);
505	>	n = (*sdc->func->getBSDFs)(coef, ioVec, inVec, sdc);
506		if (n <= 0) {
507		strcpy(SDerrorDetail, "BSDF sample value error");
508		return SDEinternal;
#	Line 449 \| Line 527 \| SDmultiSamp(double t[], int n, double randX)
527		unsigned nBits;
528		double scale;
529		bitmask_t ndx, coord[MS_MAXDIM];
530	<
530	>
531	>	if (n <= 0) /* check corner cases */
532	>	return;
533	>	if (randX < 0) randX = 0;
534	>	else if (randX >= 1.) randX = 0.999999999999999;
535	>	if (n == 1) {
536	>	t[0] = randX;
537	>	return;
538	>	}
539		while (n > MS_MAXDIM) /* punt for higher dimensions */
540	<	t[--n] = rand()*(1./RAND_MAX);
540	>	t[--n] = rand()*(1./(RAND_MAX+.5));
541		nBits = (8*sizeof(bitmask_t) - 1) / n;
542		ndx = randX * (double)((bitmask_t)1 << (nBits*n));
543		/* get coordinate on Hilbert curve */
#	Line 459 \| Line 545 \| SDmultiSamp(double t[], int n, double randX)
545		/* convert back to [0,1) range */
546		scale = 1. / (double)((bitmask_t)1 << nBits);
547		while (n--)
548	<	t[n] = scale * ((double)coord[n] + rand()*(1./RAND_MAX));
548	>	t[n] = scale * ((double)coord[n] + rand()*(1./(RAND_MAX+.5)));
549		}
550
551		#undef MS_MAXDIM
#	Line 472 \| Line 558 \| SDdiffuseSamp(FVECT outVec, int outFront, double randX
558		SDmultiSamp(outVec, 2, randX);
559		SDsquare2disk(outVec, outVec[0], outVec[1]);
560		outVec[2] = 1. - outVec[0]outVec[0] - outVec[1]outVec[1];
561	<	if (outVec[2] > .0) /* a bit of paranoia */
561	>	if (outVec[2] > 0) /* a bit of paranoia */
562		outVec[2] = sqrt(outVec[2]);
563		if (!outFront) /* going out back? */
564		outVec[2] = -outVec[2];
#	Line 480 \| Line 566 \| SDdiffuseSamp(FVECT outVec, int outFront, double randX
566
567		/* Query projected solid angle coverage for non-diffuse BSDF direction */
568		SDError
569	<	SDsizeBSDF(double projSA, const FVECT vec, int qflags, const SDData sd)
569	>	SDsizeBSDF(double projSA, const FVECT v1, const RREAL v2,
570	>	int qflags, const SDData *sd)
571		{
572	<	SDSpectralDF *rdf;
572	>	SDSpectralDF rdf, tdf;
573		SDError ec;
574		int i;
575		/* check arguments */
576	<	if ((projSA == NULL) \| (vec == NULL) \| (sd == NULL))
576	>	if ((projSA == NULL) \| (v1 == NULL) \| (sd == NULL))
577		return SDEargument;
578		/* initialize extrema */
579		switch (qflags) {
#	Line 502 \| Line 589 \| *SDsizeBSDF(double projSA, const FVECT vec, int qflags**
589		case 0:
590		return SDEargument;
591		}
592	<	if (vec[2] > .0) /* front surface query? */
592	>	if (v1[2] > 0) { /* front surface query? */
593		rdf = sd->rf;
594	<	else
594	>	tdf = (sd->tf != NULL) ? sd->tf : sd->tb;
595	>	} else {
596		rdf = sd->rb;
597	+	tdf = (sd->tb != NULL) ? sd->tb : sd->tf;
598	+	}
599	+	if (v2 != NULL) /* bidirectional? */
600	+	if (v1[2] > 0 ^ v2[2] > 0)
601	+	rdf = NULL;
602	+	else
603	+	tdf = NULL;
604		ec = SDEdata; /* run through components */
605		for (i = (rdf==NULL) ? 0 : rdf->ncomp; i--; ) {
606	<	ec = (*rdf->comp[i].func->queryProjSA)(projSA, vec, qflags,
607	<	rdf->comp[i].dist);
606	>	ec = (*rdf->comp[i].func->queryProjSA)(projSA, v1, v2,
607	>	qflags, &rdf->comp[i]);
608		if (ec)
609		return ec;
610		}
611	<	for (i = (sd->tf==NULL) ? 0 : sd->tf->ncomp; i--; ) {
612	<	ec = (*sd->tf->comp[i].func->queryProjSA)(projSA, vec, qflags,
613	<	sd->tf->comp[i].dist);
611	>	for (i = (tdf==NULL) ? 0 : tdf->ncomp; i--; ) {
612	>	ec = (*tdf->comp[i].func->queryProjSA)(projSA, v1, v2,
613	>	qflags, &tdf->comp[i]);
614		if (ec)
615		return ec;
616		}
#	Line 523 \| Line 618 \| *SDsizeBSDF(double projSA, const FVECT vec, int qflags**
618		projSA[0] = M_PI;
619		if (qflags == SDqueryMin+SDqueryMax)
620		projSA[1] = M_PI;
621	<	}
621	>	} else if (qflags == SDqueryMin+SDqueryMax && projSA[0] > projSA[1])
622	>	projSA[0] = projSA[1];
623		return SDEnone;
624		}
625
#	Line 539 \| Line 635 \| *SDevalBSDF(SDValue sv, const FVECT outVec, const FVEC**
635		if ((sv == NULL) \| (outVec == NULL) \| (inVec == NULL) \| (sd == NULL))
636		return SDEargument;
637		/* whose side are we on? */
638	<	inFront = (inVec[2] > .0);
639	<	outFront = (outVec[2] > .0);
638	>	inFront = (inVec[2] > 0);
639	>	outFront = (outVec[2] > 0);
640		/* start with diffuse portion */
641		if (inFront & outFront) {
642		*sv = sd->rLambFront;
#	Line 548 \| Line 644 \| *SDevalBSDF(SDValue sv, const FVECT outVec, const FVEC**
644		} else if (!(inFront \| outFront)) {
645		*sv = sd->rLambBack;
646		sdf = sd->rb;
647	<	} else /* inFront ^ outFront */ {
647	>	} else if (inFront) {
648		*sv = sd->tLamb;
649	<	sdf = sd->tf;
649	>	sdf = (sd->tf != NULL) ? sd->tf : sd->tb;
650	>	} else /* inBack */ {
651	>	*sv = sd->tLamb;
652	>	sdf = (sd->tb != NULL) ? sd->tb : sd->tf;
653		}
654		sv->cieY *= 1./M_PI;
655		/* add non-diffuse components */
656		i = (sdf != NULL) ? sdf->ncomp : 0;
657		while (i-- > 0) {
658		nch = (*sdf->comp[i].func->getBSDFs)(coef, outVec, inVec,
659	<	sdf->comp[i].dist);
659	>	&sdf->comp[i]);
660		while (nch-- > 0) {
661		c_cmix(&sv->spec, sv->cieY, &sv->spec,
662		coef[nch], &sdf->comp[i].cspec[nch]);
#	Line 574 \| Line 673 \| double
673		SDdirectHemi(const FVECT inVec, int sflags, const SDData *sd)
674		{
675		double hsum;
676	<	SDSpectralDF *rdf;
676	>	SDSpectralDF rdf, tdf;
677		const SDCDst *cd;
678		int i;
679		/* check arguments */
680		if ((inVec == NULL) \| (sd == NULL))
681		return .0;
682		/* gather diffuse components */
683	<	if (inVec[2] > .0) {
683	>	if (inVec[2] > 0) {
684		hsum = sd->rLambFront.cieY;
685		rdf = sd->rf;
686	+	tdf = (sd->tf != NULL) ? sd->tf : sd->tb;
687		} else /* !inFront */ {
688		hsum = sd->rLambBack.cieY;
689		rdf = sd->rb;
690	+	tdf = (sd->tb != NULL) ? sd->tb : sd->tf;
691		}
692		if ((sflags & SDsampDf+SDsampR) != SDsampDf+SDsampR)
693		hsum = .0;
694		if ((sflags & SDsampDf+SDsampT) == SDsampDf+SDsampT)
695		hsum += sd->tLamb.cieY;
696		/* gather non-diffuse components */
697	<	i = ((sflags & SDsampSp+SDsampR) == SDsampSp+SDsampR &&
698	<	rdf != NULL) ? rdf->ncomp : 0;
697	>	i = (((sflags & SDsampSp+SDsampR) == SDsampSp+SDsampR) &
698	>	(rdf != NULL)) ? rdf->ncomp : 0;
699		while (i-- > 0) { /* non-diffuse reflection */
700		cd = (*rdf->comp[i].func->getCDist)(inVec, &rdf->comp[i]);
701		if (cd != NULL)
702		hsum += cd->cTotal;
703		}
704	<	i = ((sflags & SDsampSp+SDsampT) == SDsampSp+SDsampT &&
705	<	sd->tf != NULL) ? sd->tf->ncomp : 0;
704	>	i = (((sflags & SDsampSp+SDsampT) == SDsampSp+SDsampT) &
705	>	(tdf != NULL)) ? tdf->ncomp : 0;
706		while (i-- > 0) { /* non-diffuse transmission */
707	<	cd = (*sd->tf->comp[i].func->getCDist)(inVec, &sd->tf->comp[i]);
707	>	cd = (*tdf->comp[i].func->getCDist)(inVec, &tdf->comp[i]);
708		if (cd != NULL)
709		hsum += cd->cTotal;
710		}
#	Line 612 \| Line 713 \| SDdirectHemi(const FVECT inVec, int sflags, const SDDa
713
714		/* Sample BSDF direction based on the given random variable */
715		SDError
716	<	SDsampBSDF(SDValue *sv, FVECT outVec, const FVECT inVec,
616	<	double randX, int sflags, const SDData *sd)
716	>	SDsampBSDF(SDValue sv, FVECT ioVec, double randX, int sflags, const SDData sd)
717		{
718		SDError ec;
719	+	FVECT inVec;
720		int inFront;
721	<	SDSpectralDF *rdf;
721	>	SDSpectralDF rdf, tdf;
722		double rdiff;
723		float coef[SDmaxCh];
724		int i, j, n, nr;
725		SDComponent *sdc;
726		const SDCDst **cdarr = NULL;
727		/* check arguments */
728	<	if ((sv == NULL) \| (outVec == NULL) \| (inVec == NULL) \| (sd == NULL) \|
729	<	(randX < .0) \| (randX >= 1.))
728	>	if ((sv == NULL) \| (ioVec == NULL) \| (sd == NULL) \|
729	>	(randX < 0) \| (randX >= 1.))
730		return SDEargument;
731		/* whose side are we on? */
732	<	inFront = (inVec[2] > .0);
732	>	VCOPY(inVec, ioVec);
733	>	inFront = (inVec[2] > 0);
734		/* remember diffuse portions */
735		if (inFront) {
736		*sv = sd->rLambFront;
737		rdf = sd->rf;
738	+	tdf = (sd->tf != NULL) ? sd->tf : sd->tb;
739		} else /* !inFront */ {
740		*sv = sd->rLambBack;
741		rdf = sd->rb;
742	+	tdf = (sd->tb != NULL) ? sd->tb : sd->tf;
743		}
744		if ((sflags & SDsampDf+SDsampR) != SDsampDf+SDsampR)
745		sv->cieY = .0;
#	Line 643 \| Line 747 \| *SDsampBSDF(SDValue sv, FVECT outVec, const FVECT inVe**
747		if ((sflags & SDsampDf+SDsampT) == SDsampDf+SDsampT)
748		sv->cieY += sd->tLamb.cieY;
749		/* gather non-diffuse components */
750	<	i = nr = ((sflags & SDsampSp+SDsampR) == SDsampSp+SDsampR &&
751	<	rdf != NULL) ? rdf->ncomp : 0;
752	<	j = ((sflags & SDsampSp+SDsampT) == SDsampSp+SDsampT &&
753	<	sd->tf != NULL) ? sd->tf->ncomp : 0;
750	>	i = nr = (((sflags & SDsampSp+SDsampR) == SDsampSp+SDsampR) &
751	>	(rdf != NULL)) ? rdf->ncomp : 0;
752	>	j = (((sflags & SDsampSp+SDsampT) == SDsampSp+SDsampT) &
753	>	(tdf != NULL)) ? tdf->ncomp : 0;
754		n = i + j;
755		if (n > 0 && (cdarr = (const SDCDst *)malloc(nsizeof(SDCDst *))) == NULL)
756		return SDEmemory;
757		while (j-- > 0) { /* non-diffuse transmission */
758	<	cdarr[i+j] = (*sd->tf->comp[j].func->getCDist)(inVec, &sd->tf->comp[j]);
759	<	if (cdarr[i+j] == NULL) {
760	<	free(cdarr);
657	<	return SDEmemory;
658	<	}
758	>	cdarr[i+j] = (*tdf->comp[j].func->getCDist)(inVec, &tdf->comp[j]);
759	>	if (cdarr[i+j] == NULL)
760	>	cdarr[i+j] = &SDemptyCD;
761		sv->cieY += cdarr[i+j]->cTotal;
762		}
763		while (i-- > 0) { /* non-diffuse reflection */
764		cdarr[i] = (*rdf->comp[i].func->getCDist)(inVec, &rdf->comp[i]);
765	<	if (cdarr[i] == NULL) {
766	<	free(cdarr);
767	<	return SDEmemory;
768	<	}
667	<	sv->cieY += cdarr[i]->cTotal;
765	>	if (cdarr[i] == NULL)
766	>	cdarr[i] = &SDemptyCD;
767	>	else
768	>	sv->cieY += cdarr[i]->cTotal;
769		}
770	<	if (sv->cieY <= 1e-7) { /* anything to sample? */
770	>	if (sv->cieY <= 1e-6) { /* anything to sample? */
771		sv->cieY = .0;
772	<	memset(outVec, 0, 3*sizeof(double));
772	>	memset(ioVec, 0, 3*sizeof(double));
773		return SDEnone;
774		}
775		/* scale random variable */
776		randX *= sv->cieY;
777		/* diffuse reflection? */
778		if (randX < rdiff) {
779	<	SDdiffuseSamp(outVec, inFront, randX/rdiff);
779	>	SDdiffuseSamp(ioVec, inFront, randX/rdiff);
780		goto done;
781		}
782		randX -= rdiff;
#	Line 683 \| Line 784 \| *SDsampBSDF(SDValue sv, FVECT outVec, const FVECT inVe**
784		if ((sflags & SDsampDf+SDsampT) == SDsampDf+SDsampT) {
785		if (randX < sd->tLamb.cieY) {
786		sv->spec = sd->tLamb.spec;
787	<	SDdiffuseSamp(outVec, !inFront, randX/sd->tLamb.cieY);
787	>	SDdiffuseSamp(ioVec, !inFront, randX/sd->tLamb.cieY);
788		goto done;
789		}
790		randX -= sd->tLamb.cieY;
#	Line 694 \| Line 795 \| *SDsampBSDF(SDValue sv, FVECT outVec, const FVECT inVe**
795		if (i >= n)
796		return SDEinternal;
797		/* compute sample direction */
798	<	sdc = (i < nr) ? &rdf->comp[i] : &sd->tf->comp[i-nr];
799	<	ec = (*sdc->func->sampCDist)(outVec, randX/cdarr[i]->cTotal, cdarr[i]);
798	>	sdc = (i < nr) ? &rdf->comp[i] : &tdf->comp[i-nr];
799	>	ec = (*sdc->func->sampCDist)(ioVec, randX/cdarr[i]->cTotal, cdarr[i]);
800		if (ec)
801		return ec;
802		/* compute color */
803	<	j = (*sdc->func->getBSDFs)(coef, outVec, inVec, sdc->dist);
803	>	j = (*sdc->func->getBSDFs)(coef, ioVec, inVec, sdc);
804		if (j <= 0) {
805		sprintf(SDerrorDetail, "BSDF \"%s\" sampling value error",
806		sd->name);
#	Line 726 \| Line 827 \| SDcompXform(RREAL vMtx[3][3], const FVECT sNrm, const
827		if ((vMtx == NULL) \| (sNrm == NULL) \| (uVec == NULL))
828		return SDEargument;
829		VCOPY(vMtx[2], sNrm);
830	<	if (normalize(vMtx[2]) == .0)
830	>	if (normalize(vMtx[2]) == 0)
831		return SDEargument;
832		fcross(vMtx[0], uVec, vMtx[2]);
833	<	if (normalize(vMtx[0]) == .0)
833	>	if (normalize(vMtx[0]) == 0)
834		return SDEargument;
835		fcross(vMtx[1], vMtx[2], vMtx[0]);
836		return SDEnone;
#	Line 749 \| Line 850 \| SDinvXform(RREAL iMtx[3][3], RREAL vMtx[3][3])
850		mTmp[0][1] = vMtx[2][1]vMtx[0][2] - vMtx[2][2]vMtx[0][1];
851		mTmp[0][2] = vMtx[1][2]vMtx[0][1] - vMtx[1][1]vMtx[0][2];
852		d = vMtx[0][0]mTmp[0][0] + vMtx[1][0]mTmp[0][1] + vMtx[2][0]*mTmp[0][2];
853	<	if (d == .0) {
853	>	if (d == 0) {
854		strcpy(SDerrorDetail, "Zero determinant in matrix inversion");
855		return SDEargument;
856		}
#	Line 776 \| Line 877 \| SDmapDir(FVECT resVec, RREAL vMtx[3][3], const FVECT i
877		if (vMtx == NULL) { /* assume they just want to normalize */
878		if (resVec != inpVec)
879		VCOPY(resVec, inpVec);
880	<	return (normalize(resVec) > .0) ? SDEnone : SDEargument;
880	>	return (normalize(resVec) > 0) ? SDEnone : SDEargument;
881		}
882		vTmp[0] = DOT(vMtx[0], inpVec);
883		vTmp[1] = DOT(vMtx[1], inpVec);
884		vTmp[2] = DOT(vMtx[2], inpVec);
885	<	if (normalize(vTmp) == .0)
885	>	if (normalize(vTmp) == 0)
886		return SDEargument;
887		VCOPY(resVec, vTmp);
888		return SDEnone;
889		}
789	–
790	–	/################################################################/
791	–	/######### DEPRECATED ROUTINES AWAITING PERMANENT REMOVAL #######/
792	–
793	–	/*
794	–	* Routines for handling BSDF data
795	–	*/
796	–
797	–	#include "standard.h"
798	–	#include "paths.h"
799	–	#include <ctype.h>
800	–
801	–	#define MAXLATS 46 /* maximum number of latitudes */
802	–
803	–	/* BSDF angle specification */
804	–	typedef struct {
805	–	char name[64]; /* basis name */
806	–	int nangles; /* total number of directions */
807	–	struct {
808	–	float tmin; /* starting theta */
809	–	short nphis; /* number of phis (0 term) */
810	–	} lat[MAXLATS+1]; /* latitudes */
811	–	} ANGLE_BASIS;
812	–
813	–	#define MAXABASES 7 /* limit on defined bases */
814	–
815	–	static ANGLE_BASIS abase_list[MAXABASES] = {
816	–	{
817	–	"LBNL/Klems Full", 145,
818	–	{ {-5., 1},
819	–	{5., 8},
820	–	{15., 16},
821	–	{25., 20},
822	–	{35., 24},
823	–	{45., 24},
824	–	{55., 24},
825	–	{65., 16},
826	–	{75., 12},
827	–	{90., 0} }
828	–	}, {
829	–	"LBNL/Klems Half", 73,
830	–	{ {-6.5, 1},
831	–	{6.5, 8},
832	–	{19.5, 12},
833	–	{32.5, 16},
834	–	{46.5, 20},
835	–	{61.5, 12},
836	–	{76.5, 4},
837	–	{90., 0} }
838	–	}, {
839	–	"LBNL/Klems Quarter", 41,
840	–	{ {-9., 1},
841	–	{9., 8},
842	–	{27., 12},
843	–	{46., 12},
844	–	{66., 8},
845	–	{90., 0} }
846	–	}
847	–	};
848	–
849	–	static int nabases = 3; /* current number of defined bases */
850	–
851	–	#define FEQ(a,b) ((a)-(b) <= 1e-6 && (b)-(a) <= 1e-6)
852	–
853	–	static int
854	–	fequal(double a, double b)
855	–	{
856	–	if (b != .0)
857	–	a = a/b - 1.;
858	–	return((a <= 1e-6) & (a >= -1e-6));
859	–	}
860	–
861	–	/* Returns the name of the given tag */
862	–	#ifdef ezxml_name
863	–	#undef ezxml_name
864	–	static char *
865	–	ezxml_name(ezxml_t xml)
866	–	{
867	–	if (xml == NULL)
868	–	return(NULL);
869	–	return(xml->name);
870	–	}
871	–	#endif
872	–
873	–	/* Returns the given tag's character content or empty string if none */
874	–	#ifdef ezxml_txt
875	–	#undef ezxml_txt
876	–	static char *
877	–	ezxml_txt(ezxml_t xml)
878	–	{
879	–	if (xml == NULL)
880	–	return("");
881	–	return(xml->txt);
882	–	}
883	–	#endif
884	–
885	–
886	–	static int
887	–	ab_getvec( /* get vector for this angle basis index */
888	–	FVECT v,
889	–	int ndx,
890	–	void *p
891	–	)
892	–	{
893	–	ANGLE_BASIS ab = (ANGLE_BASIS )p;
894	–	int li;
895	–	double pol, azi, d;
896	–
897	–	if ((ndx < 0) \| (ndx >= ab->nangles))
898	–	return(0);
899	–	for (li = 0; ndx >= ab->lat[li].nphis; li++)
900	–	ndx -= ab->lat[li].nphis;
901	–	pol = PI/180.0.5(ab->lat[li].tmin + ab->lat[li+1].tmin);
902	–	azi = 2.PIndx/ab->lat[li].nphis;
903	–	v[2] = d = cos(pol);
904	–	d = sqrt(1. - dd); / sin(pol) */
905	–	v[0] = cos(azi)*d;
906	–	v[1] = sin(azi)*d;
907	–	return(1);
908	–	}
909	–
910	–
911	–	static int
912	–	ab_getndx( /* get index corresponding to the given vector */
913	–	FVECT v,
914	–	void *p
915	–	)
916	–	{
917	–	ANGLE_BASIS ab = (ANGLE_BASIS )p;
918	–	int li, ndx;
919	–	double pol, azi, d;
920	–
921	–	if ((v[2] < -1.0) \| (v[2] > 1.0))
922	–	return(-1);
923	–	pol = 180.0/PI*acos(v[2]);
924	–	azi = 180.0/PI*atan2(v[1], v[0]);
925	–	if (azi < 0.0) azi += 360.0;
926	–	for (li = 1; ab->lat[li].tmin <= pol; li++)
927	–	if (!ab->lat[li].nphis)
928	–	return(-1);
929	–	--li;
930	–	ndx = (int)((1./360.)aziab->lat[li].nphis + 0.5);
931	–	if (ndx >= ab->lat[li].nphis) ndx = 0;
932	–	while (li--)
933	–	ndx += ab->lat[li].nphis;
934	–	return(ndx);
935	–	}
936	–
937	–
938	–	static double
939	–	ab_getohm( /* get solid angle for this angle basis index */
940	–	int ndx,
941	–	void *p
942	–	)
943	–	{
944	–	ANGLE_BASIS ab = (ANGLE_BASIS )p;
945	–	int li;
946	–	double theta, theta1;
947	–
948	–	if ((ndx < 0) \| (ndx >= ab->nangles))
949	–	return(0);
950	–	for (li = 0; ndx >= ab->lat[li].nphis; li++)
951	–	ndx -= ab->lat[li].nphis;
952	–	theta1 = PI/180. * ab->lat[li+1].tmin;
953	–	if (ab->lat[li].nphis == 1) { /* special case */
954	–	if (ab->lat[li].tmin > FTINY)
955	–	error(USER, "unsupported BSDF coordinate system");
956	–	return(2.PI(1. - cos(theta1)));
957	–	}
958	–	theta = PI/180. * ab->lat[li].tmin;
959	–	return(2.PI(cos(theta) - cos(theta1))/(double)ab->lat[li].nphis);
960	–	}
961	–
962	–
963	–	static int
964	–	ab_getvecR( /* get reverse vector for this angle basis index */
965	–	FVECT v,
966	–	int ndx,
967	–	void *p
968	–	)
969	–	{
970	–	if (!ab_getvec(v, ndx, p))
971	–	return(0);
972	–
973	–	v[0] = -v[0];
974	–	v[1] = -v[1];
975	–	v[2] = -v[2];
976	–
977	–	return(1);
978	–	}
979	–
980	–
981	–	static int
982	–	ab_getndxR( /* get index corresponding to the reverse vector */
983	–	FVECT v,
984	–	void *p
985	–	)
986	–	{
987	–	FVECT v2;
988	–
989	–	v2[0] = -v[0];
990	–	v2[1] = -v[1];
991	–	v2[2] = -v[2];
992	–
993	–	return ab_getndx(v2, p);
994	–	}
995	–
996	–
997	–	static void
998	–	load_angle_basis( /* load custom BSDF angle basis */
999	–	ezxml_t wab
1000	–	)
1001	–	{
1002	–	char *abname = ezxml_txt(ezxml_child(wab, "AngleBasisName"));
1003	–	ezxml_t wbb;
1004	–	int i;
1005	–
1006	–	if (!abname \|\| !*abname)
1007	–	return;
1008	–	for (i = nabases; i--; )
1009	–	if (!strcasecmp(abname, abase_list[i].name))
1010	–	return; /* assume it's the same */
1011	–	if (nabases >= MAXABASES)
1012	–	error(INTERNAL, "too many angle bases");
1013	–	strcpy(abase_list[nabases].name, abname);
1014	–	abase_list[nabases].nangles = 0;
1015	–	for (i = 0, wbb = ezxml_child(wab, "AngleBasisBlock");
1016	–	wbb != NULL; i++, wbb = wbb->next) {
1017	–	if (i >= MAXLATS)
1018	–	error(INTERNAL, "too many latitudes in custom basis");
1019	–	abase_list[nabases].lat[i+1].tmin = atof(ezxml_txt(
1020	–	ezxml_child(ezxml_child(wbb,
1021	–	"ThetaBounds"), "UpperTheta")));
1022	–	if (!i)
1023	–	abase_list[nabases].lat[i].tmin =
1024	–	-abase_list[nabases].lat[i+1].tmin;
1025	–	else if (!fequal(atof(ezxml_txt(ezxml_child(ezxml_child(wbb,
1026	–	"ThetaBounds"), "LowerTheta"))),
1027	–	abase_list[nabases].lat[i].tmin))
1028	–	error(WARNING, "theta values disagree in custom basis");
1029	–	abase_list[nabases].nangles +=
1030	–	abase_list[nabases].lat[i].nphis =
1031	–	atoi(ezxml_txt(ezxml_child(wbb, "nPhis")));
1032	–	}
1033	–	abase_list[nabases++].lat[i].nphis = 0;
1034	–	}
1035	–
1036	–
1037	–	static void
1038	–	load_geometry( /* load geometric dimensions and description (if any) */
1039	–	struct BSDF_data *dp,
1040	–	ezxml_t wdb
1041	–	)
1042	–	{
1043	–	ezxml_t geom;
1044	–	double cfact;
1045	–	const char fmt, mgfstr;
1046	–
1047	–	dp->dim[0] = dp->dim[1] = dp->dim[2] = 0;
1048	–	dp->mgf = NULL;
1049	–	if ((geom = ezxml_child(wdb, "Width")) != NULL)
1050	–	dp->dim[0] = atof(ezxml_txt(geom)) *
1051	–	to_meters(ezxml_attr(geom, "unit"));
1052	–	if ((geom = ezxml_child(wdb, "Height")) != NULL)
1053	–	dp->dim[1] = atof(ezxml_txt(geom)) *
1054	–	to_meters(ezxml_attr(geom, "unit"));
1055	–	if ((geom = ezxml_child(wdb, "Thickness")) != NULL)
1056	–	dp->dim[2] = atof(ezxml_txt(geom)) *
1057	–	to_meters(ezxml_attr(geom, "unit"));
1058	–	if ((geom = ezxml_child(wdb, "Geometry")) == NULL \|\|
1059	–	(mgfstr = ezxml_txt(geom)) == NULL)
1060	–	return;
1061	–	if ((fmt = ezxml_attr(geom, "format")) != NULL &&
1062	–	strcasecmp(fmt, "MGF")) {
1063	–	sprintf(errmsg, "unrecognized geometry format '%s'", fmt);
1064	–	error(WARNING, errmsg);
1065	–	return;
1066	–	}
1067	–	cfact = to_meters(ezxml_attr(geom, "unit"));
1068	–	dp->mgf = (char *)malloc(strlen(mgfstr)+32);
1069	–	if (dp->mgf == NULL)
1070	–	error(SYSTEM, "out of memory in load_geometry");
1071	–	if (cfact < 0.99 \|\| cfact > 1.01)
1072	–	sprintf(dp->mgf, "xf -s %.5f\n%s\nxf\n", cfact, mgfstr);
1073	–	else
1074	–	strcpy(dp->mgf, mgfstr);
1075	–	}
1076	–
1077	–
1078	–	static void
1079	–	load_bsdf_data( /* load BSDF distribution for this wavelength */
1080	–	struct BSDF_data *dp,
1081	–	ezxml_t wdb
1082	–	)
1083	–	{
1084	–	char *cbasis = ezxml_txt(ezxml_child(wdb,"ColumnAngleBasis"));
1085	–	char *rbasis = ezxml_txt(ezxml_child(wdb,"RowAngleBasis"));
1086	–	char *sdata;
1087	–	int i;
1088	–
1089	–	if ((!cbasis \|\| !cbasis) \| (!rbasis \|\| !rbasis)) {
1090	–	error(WARNING, "missing column/row basis for BSDF");
1091	–	return;
1092	–	}
1093	–	for (i = nabases; i--; )
1094	–	if (!strcasecmp(cbasis, abase_list[i].name)) {
1095	–	dp->ninc = abase_list[i].nangles;
1096	–	dp->ib_priv = (void *)&abase_list[i];
1097	–	dp->ib_vec = ab_getvecR;
1098	–	dp->ib_ndx = ab_getndxR;
1099	–	dp->ib_ohm = ab_getohm;
1100	–	break;
1101	–	}
1102	–	if (i < 0) {
1103	–	sprintf(errmsg, "undefined ColumnAngleBasis '%s'", cbasis);
1104	–	error(WARNING, errmsg);
1105	–	return;
1106	–	}
1107	–	for (i = nabases; i--; )
1108	–	if (!strcasecmp(rbasis, abase_list[i].name)) {
1109	–	dp->nout = abase_list[i].nangles;
1110	–	dp->ob_priv = (void *)&abase_list[i];
1111	–	dp->ob_vec = ab_getvec;
1112	–	dp->ob_ndx = ab_getndx;
1113	–	dp->ob_ohm = ab_getohm;
1114	–	break;
1115	–	}
1116	–	if (i < 0) {
1117	–	sprintf(errmsg, "undefined RowAngleBasis '%s'", rbasis);
1118	–	error(WARNING, errmsg);
1119	–	return;
1120	–	}
1121	–	/* read BSDF data */
1122	–	sdata = ezxml_txt(ezxml_child(wdb,"ScatteringData"));
1123	–	if (!sdata \|\| !*sdata) {
1124	–	error(WARNING, "missing BSDF ScatteringData");
1125	–	return;
1126	–	}
1127	–	dp->bsdf = (float )malloc(sizeof(float)dp->ninc*dp->nout);
1128	–	if (dp->bsdf == NULL)
1129	–	error(SYSTEM, "out of memory in load_bsdf_data");
1130	–	for (i = 0; i < dp->ninc*dp->nout; i++) {
1131	–	char *sdnext = fskip(sdata);
1132	–	if (sdnext == NULL) {
1133	–	error(WARNING, "bad/missing BSDF ScatteringData");
1134	–	free(dp->bsdf); dp->bsdf = NULL;
1135	–	return;
1136	–	}
1137	–	while (sdnext && isspace(sdnext))
1138	–	sdnext++;
1139	–	if (*sdnext == ',') sdnext++;
1140	–	dp->bsdf[i] = atof(sdata);
1141	–	sdata = sdnext;
1142	–	}
1143	–	while (isspace(*sdata))
1144	–	sdata++;
1145	–	if (*sdata) {
1146	–	sprintf(errmsg, "%d extra characters after BSDF ScatteringData",
1147	–	(int)strlen(sdata));
1148	–	error(WARNING, errmsg);
1149	–	}
1150	–	}
1151	–
1152	–
1153	–	static int
1154	–	check_bsdf_data( /* check that BSDF data is sane */
1155	–	struct BSDF_data *dp
1156	–	)
1157	–	{
1158	–	double omega_iarr, omega_oarr;
1159	–	double dom, contrib, hemi_total, full_total;
1160	–	int nneg;
1161	–	FVECT v;
1162	–	int i, o;
1163	–
1164	–	if (dp == NULL \|\| dp->bsdf == NULL)
1165	–	return(0);
1166	–	omega_iarr = (double *)calloc(dp->ninc, sizeof(double));
1167	–	omega_oarr = (double *)calloc(dp->nout, sizeof(double));
1168	–	if ((omega_iarr == NULL) \| (omega_oarr == NULL))
1169	–	error(SYSTEM, "out of memory in check_bsdf_data");
1170	–	/* incoming projected solid angles */
1171	–	hemi_total = .0;
1172	–	for (i = dp->ninc; i--; ) {
1173	–	dom = getBSDF_incohm(dp,i);
1174	–	if (dom <= .0) {
1175	–	error(WARNING, "zero/negative incoming solid angle");
1176	–	continue;
1177	–	}
1178	–	if (!getBSDF_incvec(v,dp,i) \|\| v[2] > FTINY) {
1179	–	error(WARNING, "illegal incoming BSDF direction");
1180	–	free(omega_iarr); free(omega_oarr);
1181	–	return(0);
1182	–	}
1183	–	hemi_total += omega_iarr[i] = dom * -v[2];
1184	–	}
1185	–	if ((hemi_total > 1.02PI) \| (hemi_total < 0.98PI)) {
1186	–	sprintf(errmsg, "incoming BSDF hemisphere off by %.1f%%",
1187	–	100.*(hemi_total/PI - 1.));
1188	–	error(WARNING, errmsg);
1189	–	}
1190	–	dom = PI / hemi_total; /* fix normalization */
1191	–	for (i = dp->ninc; i--; )
1192	–	omega_iarr[i] *= dom;
1193	–	/* outgoing projected solid angles */
1194	–	hemi_total = .0;
1195	–	for (o = dp->nout; o--; ) {
1196	–	dom = getBSDF_outohm(dp,o);
1197	–	if (dom <= .0) {
1198	–	error(WARNING, "zero/negative outgoing solid angle");
1199	–	continue;
1200	–	}
1201	–	if (!getBSDF_outvec(v,dp,o) \|\| v[2] < -FTINY) {
1202	–	error(WARNING, "illegal outgoing BSDF direction");
1203	–	free(omega_iarr); free(omega_oarr);
1204	–	return(0);
1205	–	}
1206	–	hemi_total += omega_oarr[o] = dom * v[2];
1207	–	}
1208	–	if ((hemi_total > 1.02PI) \| (hemi_total < 0.98PI)) {
1209	–	sprintf(errmsg, "outgoing BSDF hemisphere off by %.1f%%",
1210	–	100.*(hemi_total/PI - 1.));
1211	–	error(WARNING, errmsg);
1212	–	}
1213	–	dom = PI / hemi_total; /* fix normalization */
1214	–	for (o = dp->nout; o--; )
1215	–	omega_oarr[o] *= dom;
1216	–	nneg = 0; /* check outgoing totals */
1217	–	for (i = 0; i < dp->ninc; i++) {
1218	–	hemi_total = .0;
1219	–	for (o = dp->nout; o--; ) {
1220	–	double f = BSDF_value(dp,i,o);
1221	–	if (f >= .0)
1222	–	hemi_total += f*omega_oarr[o];
1223	–	else {
1224	–	nneg += (f < -FTINY);
1225	–	BSDF_value(dp,i,o) = .0f;
1226	–	}
1227	–	}
1228	–	if (hemi_total > 1.01) {
1229	–	sprintf(errmsg,
1230	–	"incoming BSDF direction %d passes %.1f%% of light",
1231	–	i, 100.*hemi_total);
1232	–	error(WARNING, errmsg);
1233	–	}
1234	–	}
1235	–	if (nneg) {
1236	–	sprintf(errmsg, "%d negative BSDF values (ignored)", nneg);
1237	–	error(WARNING, errmsg);
1238	–	}
1239	–	full_total = .0; /* reverse roles and check again */
1240	–	for (o = 0; o < dp->nout; o++) {
1241	–	hemi_total = .0;
1242	–	for (i = dp->ninc; i--; )
1243	–	hemi_total += BSDF_value(dp,i,o) * omega_iarr[i];
1244	–
1245	–	if (hemi_total > 1.01) {
1246	–	sprintf(errmsg,
1247	–	"outgoing BSDF direction %d collects %.1f%% of light",
1248	–	o, 100.*hemi_total);
1249	–	error(WARNING, errmsg);
1250	–	}
1251	–	full_total += hemi_total*omega_oarr[o];
1252	–	}
1253	–	full_total /= PI;
1254	–	if (full_total > 1.00001) {
1255	–	sprintf(errmsg, "BSDF transfers %.4f%% of light",
1256	–	100.*full_total);
1257	–	error(WARNING, errmsg);
1258	–	}
1259	–	free(omega_iarr); free(omega_oarr);
1260	–	return(1);
1261	–	}
1262	–
1263	–
1264	–	struct BSDF_data *
1265	–	load_BSDF( /* load BSDF data from file */
1266	–	char *fname
1267	–	)
1268	–	{
1269	–	char *path;
1270	–	ezxml_t fl, wtl, wld, wdb;
1271	–	struct BSDF_data *dp;
1272	–
1273	–	path = getpath(fname, getrlibpath(), R_OK);
1274	–	if (path == NULL) {
1275	–	sprintf(errmsg, "cannot find BSDF file \"%s\"", fname);
1276	–	error(WARNING, errmsg);
1277	–	return(NULL);
1278	–	}
1279	–	fl = ezxml_parse_file(path);
1280	–	if (fl == NULL) {
1281	–	sprintf(errmsg, "cannot open BSDF \"%s\"", path);
1282	–	error(WARNING, errmsg);
1283	–	return(NULL);
1284	–	}
1285	–	if (ezxml_error(fl)[0]) {
1286	–	sprintf(errmsg, "BSDF \"%s\" %s", path, ezxml_error(fl));
1287	–	error(WARNING, errmsg);
1288	–	ezxml_free(fl);
1289	–	return(NULL);
1290	–	}
1291	–	if (strcmp(ezxml_name(fl), "WindowElement")) {
1292	–	sprintf(errmsg,
1293	–	"BSDF \"%s\": top level node not 'WindowElement'",
1294	–	path);
1295	–	error(WARNING, errmsg);
1296	–	ezxml_free(fl);
1297	–	return(NULL);
1298	–	}
1299	–	wtl = ezxml_child(ezxml_child(fl, "Optical"), "Layer");
1300	–	if (strcasecmp(ezxml_txt(ezxml_child(ezxml_child(wtl,
1301	–	"DataDefinition"), "IncidentDataStructure")),
1302	–	"Columns")) {
1303	–	sprintf(errmsg,
1304	–	"BSDF \"%s\": unsupported IncidentDataStructure",
1305	–	path);
1306	–	error(WARNING, errmsg);
1307	–	ezxml_free(fl);
1308	–	return(NULL);
1309	–	}
1310	–	load_angle_basis(ezxml_child(ezxml_child(wtl,
1311	–	"DataDefinition"), "AngleBasis"));
1312	–	dp = (struct BSDF_data *)calloc(1, sizeof(struct BSDF_data));
1313	–	load_geometry(dp, ezxml_child(wtl, "Material"));
1314	–	for (wld = ezxml_child(wtl, "WavelengthData");
1315	–	wld != NULL; wld = wld->next) {
1316	–	if (strcasecmp(ezxml_txt(ezxml_child(wld,"Wavelength")),
1317	–	"Visible"))
1318	–	continue;
1319	–	for (wdb = ezxml_child(wld, "WavelengthDataBlock");
1320	–	wdb != NULL; wdb = wdb->next)
1321	–	if (!strcasecmp(ezxml_txt(ezxml_child(wdb,
1322	–	"WavelengthDataDirection")),
1323	–	"Transmission Front"))
1324	–	break;
1325	–	if (wdb != NULL) { /* load front BTDF */
1326	–	load_bsdf_data(dp, wdb);
1327	–	break; /* ignore the rest */
1328	–	}
1329	–	}
1330	–	ezxml_free(fl); /* done with XML file */
1331	–	if (!check_bsdf_data(dp)) {
1332	–	sprintf(errmsg, "bad/missing BTDF data in \"%s\"", path);
1333	–	error(WARNING, errmsg);
1334	–	free_BSDF(dp);
1335	–	dp = NULL;
1336	–	}
1337	–	return(dp);
1338	–	}
1339	–
1340	–
1341	–	void
1342	–	free_BSDF( /* free BSDF data structure */
1343	–	struct BSDF_data *b
1344	–	)
1345	–	{
1346	–	if (b == NULL)
1347	–	return;
1348	–	if (b->mgf != NULL)
1349	–	free(b->mgf);
1350	–	if (b->bsdf != NULL)
1351	–	free(b->bsdf);
1352	–	free(b);
1353	–	}
1354	–
1355	–
1356	–	int
1357	–	r_BSDF_incvec( /* compute random input vector at given location */
1358	–	FVECT v,
1359	–	struct BSDF_data *b,
1360	–	int i,
1361	–	double rv,
1362	–	MAT4 xm
1363	–	)
1364	–	{
1365	–	FVECT pert;
1366	–	double rad;
1367	–	int j;
1368	–
1369	–	if (!getBSDF_incvec(v, b, i))
1370	–	return(0);
1371	–	rad = sqrt(getBSDF_incohm(b, i) / PI);
1372	–	multisamp(pert, 3, rv);
1373	–	for (j = 0; j < 3; j++)
1374	–	v[j] += rad(2.pert[j] - 1.);
1375	–	if (xm != NULL)
1376	–	multv3(v, v, xm);
1377	–	return(normalize(v) != 0.0);
1378	–	}
1379	–
1380	–
1381	–	int
1382	–	r_BSDF_outvec( /* compute random output vector at given location */
1383	–	FVECT v,
1384	–	struct BSDF_data *b,
1385	–	int o,
1386	–	double rv,
1387	–	MAT4 xm
1388	–	)
1389	–	{
1390	–	FVECT pert;
1391	–	double rad;
1392	–	int j;
1393	–
1394	–	if (!getBSDF_outvec(v, b, o))
1395	–	return(0);
1396	–	rad = sqrt(getBSDF_outohm(b, o) / PI);
1397	–	multisamp(pert, 3, rv);
1398	–	for (j = 0; j < 3; j++)
1399	–	v[j] += rad(2.pert[j] - 1.);
1400	–	if (xm != NULL)
1401	–	multv3(v, v, xm);
1402	–	return(normalize(v) != 0.0);
1403	–	}
1404	–
1405	–
1406	–	static int
1407	–	addrot( /* compute rotation (x,y,z) => (xp,yp,zp) */
1408	–	char *xfarg[],
1409	–	FVECT xp,
1410	–	FVECT yp,
1411	–	FVECT zp
1412	–	)
1413	–	{
1414	–	static char bufs[3][16];
1415	–	int bn = 0;
1416	–	char **xfp = xfarg;
1417	–	double theta;
1418	–
1419	–	if (yp[2]yp[2] + zp[2]zp[2] < 2.FTINYFTINY) {
1420	–	/* Special case for X' along Z-axis */
1421	–	theta = -atan2(yp[0], yp[1]);
1422	–	*xfp++ = "-ry";
1423	–	*xfp++ = xp[2] < 0.0 ? "90" : "-90";
1424	–	*xfp++ = "-rz";
1425	–	sprintf(bufs[bn], "%f", theta*(180./PI));
1426	–	*xfp++ = bufs[bn++];
1427	–	return(xfp - xfarg);
1428	–	}
1429	–	theta = atan2(yp[2], zp[2]);
1430	–	if (!FEQ(theta,0.0)) {
1431	–	*xfp++ = "-rx";
1432	–	sprintf(bufs[bn], "%f", theta*(180./PI));
1433	–	*xfp++ = bufs[bn++];
1434	–	}
1435	–	theta = asin(-xp[2]);
1436	–	if (!FEQ(theta,0.0)) {
1437	–	*xfp++ = "-ry";
1438	–	sprintf(bufs[bn], " %f", theta*(180./PI));
1439	–	*xfp++ = bufs[bn++];
1440	–	}
1441	–	theta = atan2(xp[1], xp[0]);
1442	–	if (!FEQ(theta,0.0)) {
1443	–	*xfp++ = "-rz";
1444	–	sprintf(bufs[bn], "%f", theta*(180./PI));
1445	–	*xfp++ = bufs[bn++];
1446	–	}
1447	–	*xfp = NULL;
1448	–	return(xfp - xfarg);
1449	–	}
1450	–
1451	–
1452	–	int
1453	–	getBSDF_xfm( /* compute BSDF orient. -> world orient. transform */
1454	–	MAT4 xm,
1455	–	FVECT nrm,
1456	–	UpDir ud,
1457	–	char *xfbuf
1458	–	)
1459	–	{
1460	–	char *xfargs[7];
1461	–	XF myxf;
1462	–	FVECT updir, xdest, ydest;
1463	–	int i;
1464	–
1465	–	updir[0] = updir[1] = updir[2] = 0.;
1466	–	switch (ud) {
1467	–	case UDzneg:
1468	–	updir[2] = -1.;
1469	–	break;
1470	–	case UDyneg:
1471	–	updir[1] = -1.;
1472	–	break;
1473	–	case UDxneg:
1474	–	updir[0] = -1.;
1475	–	break;
1476	–	case UDxpos:
1477	–	updir[0] = 1.;
1478	–	break;
1479	–	case UDypos:
1480	–	updir[1] = 1.;
1481	–	break;
1482	–	case UDzpos:
1483	–	updir[2] = 1.;
1484	–	break;
1485	–	case UDunknown:
1486	–	return(0);
1487	–	}
1488	–	fcross(xdest, updir, nrm);
1489	–	if (normalize(xdest) == 0.0)
1490	–	return(0);
1491	–	fcross(ydest, nrm, xdest);
1492	–	xf(&myxf, addrot(xfargs, xdest, ydest, nrm), xfargs);
1493	–	copymat4(xm, myxf.xfm);
1494	–	if (xfbuf == NULL)
1495	–	return(1);
1496	–	/* return xf arguments as well */
1497	–	for (i = 0; xfargs[i] != NULL; i++) {
1498	–	*xfbuf++ = ' ';
1499	–	strcpy(xfbuf, xfargs[i]);
1500	–	while (*xfbuf) ++xfbuf;
1501	–	}
1502	–	return(1);
1503	–	}
1504	–
1505	–	/######### END DEPRECATED ROUTINES #######/
1506	–	/################################################################/

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing ray/src/common/bsdf.c (file contents): Revision 2.18 by greg, Fri Apr 8 23:23:28 2011 UTC vs. Revision 2.46 by greg, Thu Jul 4 15:14:45 2013 UTC

Diff Legend

Comparing ray/src/common/bsdf.c (file contents):
Revision 2.18 by greg, Fri Apr 8 23:23:28 2011 UTC vs.
Revision 2.46 by greg, Thu Jul 4 15:14:45 2013 UTC