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

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

Diff Legend

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

Comparing ray/src/common/bsdf.c (file contents): Revision 2.21 by greg, Sun Apr 17 17:45:13 2011 UTC vs. Revision 2.43 by greg, Sat Oct 13 20:15:43 2012 UTC

Diff Legend

Comparing ray/src/common/bsdf.c (file contents):
Revision 2.21 by greg, Sun Apr 17 17:45:13 2011 UTC vs.
Revision 2.43 by greg, Sat Oct 13 20:15:43 2012 UTC