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

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

Diff Legend

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

Comparing ray/src/common/bsdf.c (file contents): Revision 2.23 by greg, Wed Apr 20 14:44:05 2011 UTC vs. Revision 2.58 by greg, Thu May 14 19:20:13 2020 UTC

Diff Legend

Comparing ray/src/common/bsdf.c (file contents):
Revision 2.23 by greg, Wed Apr 20 14:44:05 2011 UTC vs.
Revision 2.58 by greg, Thu May 14 19:20:13 2020 UTC