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

Comparing ray/src/common/bsdf_t.c (file contents):
Revision 3.11 by greg, Thu Apr 28 17:46:25 2011 UTC vs.
Revision 3.53 by greg, Wed Dec 15 01:38:50 2021 UTC

#	Line 10 \| Line 10 \| static const char RCSid[] = "$Id$";
10		*
11		*/
12
13	+	#define _USE_MATH_DEFINES
14		#include "rtio.h"
15		#include <stdlib.h>
16		#include <math.h>
#	Line 20 \| Line 21 \| static const char RCSid[] = "$Id$";
21		#include "hilbert.h"
22
23		/* Callback function type for SDtraverseTre() */
24	<	typedef int SDtreCallback(float val, const double *cmin,
25	<	double csiz, void *cptr);
25	<
24	>	typedef int SDtreCallback(float val, const double *cmin, double csiz,
25	>	void *cptr);
26		/* reference width maximum (1.0) */
27		static const unsigned iwbits = sizeof(unsigned)*4;
28	<	static const unsigned iwmax = (1<<(sizeof(unsigned)*4))-1;
28	>	static const unsigned iwmax = 1<<(sizeof(unsigned)*4);
29		/* maximum cumulative value */
30		static const unsigned cumlmax = ~0;
31	+	/* constant z-vector */
32	+	static const FVECT zvec = {.0, .0, 1.};
33	+	/* quantization value */
34	+	static double quantum = 1./256.;
35	+	/* our RGB primaries */
36	+	static C_COLOR tt_RGB_prim[3];
37	+	static float tt_RGB_coef[3];
38
39	+	static const double czero[SD_MAXDIM];
40	+
41	+	enum {tt_Y, tt_u, tt_v}; /* tree components (tt_Y==0) */
42	+
43		/* Struct used for our distribution-building callback */
44		typedef struct {
45	<	int nic; /* number of input coordinates */
45	>	short nic; /* number of input coordinates */
46	>	short rev; /* reversing query */
47		unsigned alen; /* current array length */
48		unsigned nall; /* number of allocated entries */
49		unsigned wmin; /* minimum square size so far */
#	Line 61 \| Line 73 \| SDnewNode(int nd, int lg)
73		if (lg < 0) {
74		st = (SDNode *)malloc(sizeof(SDNode) +
75		sizeof(st->u.t[0])*((1<<nd) - 1));
76	<	if (st != NULL)
65	<	memset(st->u.t, 0, sizeof(st->u.t[0])<<nd);
66	<	} else
67	<	st = (SDNode *)malloc(sizeof(SDNode) +
68	<	sizeof(st->u.v[0])((1 << ndlg) - 1));
69	<
70	<	if (st == NULL) {
71	<	if (lg < 0)
76	>	if (st == NULL) {
77		sprintf(SDerrorDetail,
78		"Cannot allocate %d branch BSDF tree", 1<<nd);
79	<	else
79	>	return NULL;
80	>	}
81	>	memset(st->u.t, 0, sizeof(st->u.t[0])<<nd);
82	>	} else {
83	>	st = (SDNode *)malloc(sizeof(SDNode) +
84	>	sizeof(st->u.v[0])((1 << ndlg) - 1));
85	>	if (st == NULL) {
86		sprintf(SDerrorDetail,
87		"Cannot allocate %d BSDF leaves", 1 << nd*lg);
88	<	return NULL;
88	>	return NULL;
89	>	}
90		}
91		st->ndim = nd;
92		st->log2GR = lg;
#	Line 85 \| Line 97 \| SDnewNode(int nd, int lg)
97		static void
98		SDfreeTre(SDNode *st)
99		{
100	<	int i;
100	>	int n;
101
102		if (st == NULL)
103		return;
104	<	for (i = (st->log2GR < 0) << st->ndim; i--; )
105	<	SDfreeTre(st->u.t[i]);
106	<	free((void *)st);
104	>	for (n = (st->log2GR < 0) << st->ndim; n--; )
105	>	SDfreeTre(st->u.t[n]);
106	>	free(st);
107		}
108
109		/* Free a variable-resolution BSDF */
#	Line 102 \| Line 114 \| *SDFreeBTre(void p)**
114
115		if (sdt == NULL)
116		return;
117	<	SDfreeTre(sdt->st);
117	>	SDfreeTre(sdt->stc[tt_Y]);
118	>	SDfreeTre(sdt->stc[tt_u]);
119	>	SDfreeTre(sdt->stc[tt_v]);
120		free(sdt);
121		}
122
#	Line 125 \| Line 139 \| *fill_grid_branch(float dptr, const float sptr, int n*
139		static float *
140		grid_branch_start(SDNode *st, int n)
141		{
142	<	unsigned skipsiz = 1 << st->log2GR;
142	>	unsigned skipsiz = 1 << (st->log2GR - 1);
143		float *vptr = st->u.v;
144		int i;
145
146	<	for (i = 0; i < st->ndim; skipsiz <<= st->log2GR)
147	<	if (1<<i++ & n)
148	<	vptr += skipsiz >> 1;
146	>	for (i = st->ndim; i--; skipsiz <<= st->log2GR)
147	>	if (1<<i & n)
148	>	vptr += skipsiz;
149		return vptr;
150		}
151
#	Line 165 \| Line 179 \| *SDsimplifyTre(SDNode st)**
179		return st;
180		}
181
182	+	/* Assign the given voxel in tree (produces no grid nodes) */
183	+	static SDNode *
184	+	SDsetVoxel(SDNode sroot, int nd, const double tmin, const double tsiz, float val)
185	+	{
186	+	double ctrk[SD_MAXDIM];
187	+	double csiz = 1.;
188	+	SDNode *st;
189	+	int i, n;
190	+	/* check arguments */
191	+	for (i = nd; i-- > 0; )
192	+	if ((tmin[i] < .0) \| (tmin[i] >= 1.-FTINY))
193	+	break;
194	+	if ((i >= 0) \| (nd <= 0) \| (tsiz <= FTINY) \| (tsiz > 1.+FTINY) \|
195	+	(sroot != NULL && sroot->ndim != nd)) {
196	+	SDfreeTre(sroot);
197	+	return NULL;
198	+	}
199	+	if (tsiz >= 1.-FTINY) { /* special case when tree is a leaf */
200	+	SDfreeTre(sroot);
201	+	if ((sroot = SDnewNode(nd, 0)) != NULL)
202	+	sroot->u.v[0] = val;
203	+	return sroot;
204	+	}
205	+	/* make sure we have branching root */
206	+	if (sroot != NULL && sroot->log2GR >= 0) {
207	+	SDfreeTre(sroot); sroot = NULL;
208	+	}
209	+	if (sroot == NULL && (sroot = SDnewNode(nd, -1)) == NULL)
210	+	return NULL;
211	+	st = sroot; /* climb/grow tree */
212	+	memset(ctrk, 0, sizeof(ctrk));
213	+	for ( ; ; ) {
214	+	csiz = .5; / find appropriate branch */
215	+	n = 0;
216	+	for (i = nd; i--; )
217	+	if (ctrk[i]+csiz <= tmin[i]+FTINY) {
218	+	ctrk[i] += csiz;
219	+	n \|= 1 << i;
220	+	}
221	+	/* reached desired voxel? */
222	+	if (csiz <= tsiz+FTINY) {
223	+	SDfreeTre(st->u.t[n]);
224	+	st = st->u.t[n] = SDnewNode(nd, 0);
225	+	break;
226	+	}
227	+	/* else grow tree as needed */
228	+	if (st->u.t[n] != NULL && st->u.t[n]->log2GR >= 0) {
229	+	SDfreeTre(st->u.t[n]); st->u.t[n] = NULL;
230	+	}
231	+	if (st->u.t[n] == NULL)
232	+	st->u.t[n] = SDnewNode(nd, -1);
233	+	if ((st = st->u.t[n]) == NULL)
234	+	break;
235	+	}
236	+	if (st == NULL) {
237	+	SDfreeTre(sroot);
238	+	return NULL;
239	+	}
240	+	st->u.v[0] = val; /* assign leaf and return root */
241	+	return sroot;
242	+	}
243	+
244		/* Find smallest leaf in tree */
245		static double
246		SDsmallestLeaf(const SDNode *st)
#	Line 190 \| Line 266 \| *SDiterSum(const float va, int nd, int shft, const int**
266		const unsigned skipsiz = 1 << --nd*shft;
267		double sum = .0;
268		int i;
269	<
269	>
270	>	va += imin skipsiz;
271	>
272		if (skipsiz == 1)
273		for (i = imin; i < imax; i++)
274	<	sum += va[i];
274	>	sum += *va++;
275		else
276	<	for (i = imin; i < imax; i++)
277	<	sum += SDiterSum(va + i*skipsiz, nd, shft, imin+1, imax+1);
276	>	for (i = imin; i < imax; i++, va += skipsiz)
277	>	sum += SDiterSum(va, nd, shft, imin+1, imax+1);
278		return sum;
279		}
280
#	Line 204 \| Line 282 \| *SDiterSum(const float va, int nd, int shft, const int**
282		static double
283		SDavgTreBox(const SDNode st, const double bmin, const double *bmax)
284		{
207	–	int imin[SD_MAXDIM], imax[SD_MAXDIM];
285		unsigned n;
286		int i;
287
#	Line 214 \| Line 291 \| *SDavgTreBox(const SDNode st, const double bmin, cons*
291		for (i = st->ndim; i--; ) {
292		if (bmin[i] >= 1.)
293		return .0;
294	<	if (bmax[i] <= .0)
294	>	if (bmax[i] <= 0)
295		return .0;
296		if (bmin[i] >= bmax[i])
297		return .0;
#	Line 222 \| Line 299 \| *SDavgTreBox(const SDNode st, const double bmin, cons*
299		if (st->log2GR < 0) { /* iterate on subtree */
300		double sum = .0, wsum = 1e-20;
301		double sbmin[SD_MAXDIM], sbmax[SD_MAXDIM], w;
225	–
302		for (n = 1 << st->ndim; n--; ) {
303		w = 1.;
304		for (i = st->ndim; i--; ) {
#	Line 234 \| Line 310 \| *SDavgTreBox(const SDNode st, const double bmin, cons*
310		}
311		if (sbmin[i] < .0) sbmin[i] = .0;
312		if (sbmax[i] > 1.) sbmax[i] = 1.;
313	+	if (sbmin[i] >= sbmax[i]) {
314	+	w = .0;
315	+	break;
316	+	}
317		w *= sbmax[i] - sbmin[i];
318		}
319		if (w > 1e-10) {
#	Line 242 \| Line 322 \| *SDavgTreBox(const SDNode st, const double bmin, cons*
322		}
323		}
324		return sum / wsum;
325	+	} else { /* iterate over leaves */
326	+	int imin[SD_MAXDIM], imax[SD_MAXDIM];
327	+
328	+	n = 1;
329	+	for (i = st->ndim; i--; ) {
330	+	imin[i] = (bmin[i] <= 0) ? 0 :
331	+	(int)((1 << st->log2GR)*bmin[i]);
332	+	imax[i] = (bmax[i] >= 1.) ? (1 << st->log2GR) :
333	+	(int)((1 << st->log2GR)*bmax[i] + .999999);
334	+	n *= imax[i] - imin[i];
335	+	}
336	+	if (n)
337	+	return SDiterSum(st->u.v, st->ndim,
338	+	st->log2GR, imin, imax) / (double)n;
339		}
340	<	n = 1; /* iterate over leaves */
247	<	for (i = st->ndim; i--; ) {
248	<	imin[i] = (bmin[i] <= 0) ? 0
249	<	: (int)((1 << st->log2GR)*bmin[i]);
250	<	imax[i] = (bmax[i] >= 1.) ? (1 << st->log2GR)
251	<	: (int)((1 << st->log2GR)*bmax[i] + .999999);
252	<	n *= imax[i] - imin[i];
253	<	}
254	<	if (!n)
255	<	return .0;
256	<
257	<	return SDiterSum(st->u.v, st->ndim, st->log2GR, imin, imax) / (double)n;
340	>	return .0;
341		}
342
343		/* Recursive call for SDtraverseTre() */
#	Line 266 \| Line 349 \| *SDdotravTre(const SDNode st, const double pos, int c*
349		int rv, rval = 0;
350		double bmin[SD_MAXDIM];
351		int i, n;
352	+	/* paranoia */
353	+	if (st == NULL)
354	+	return 0;
355		/* in branches? */
356		if (st->log2GR < 0) {
357		unsigned skipmask = 0;
272	–
358		csiz *= .5;
359		for (i = st->ndim; i--; )
360	<	if (1<<i & cmask)
360	>	if (1<<i & cmask) {
361		if (pos[i] < cmin[i] + csiz)
362	<	for (n = 1 << st->ndim; n--; )
362	>	for (n = 1 << st->ndim; n--; ) {
363		if (n & 1<<i)
364		skipmask \|= 1<<n;
365	+	}
366		else
367	<	for (n = 1 << st->ndim; n--; )
367	>	for (n = 1 << st->ndim; n--; ) {
368		if (!(n & 1<<i))
369		skipmask \|= 1<<n;
370	+	}
371	+	}
372		for (n = 1 << st->ndim; n--; ) {
373		if (1<<n & skipmask)
374		continue;
#	Line 314 \| Line 402 \| *SDdotravTre(const SDNode st, const double pos, int c*
402		clim[i][0] = 0;
403		clim[i][1] = 1 << st->log2GR;
404		}
317	–	/* fill in unused dimensions */
318	–	for (i = SD_MAXDIM; i-- > st->ndim; ) {
319	–	clim[i][0] = 0; clim[i][1] = 1;
320	–	}
405		#if (SD_MAXDIM == 4)
406		bmin[0] = cmin[0] + csiz*clim[0][0];
407		for (cpos[0] = clim[0][0]; cpos[0] < clim[0][1]; cpos[0]++) {
408		bmin[1] = cmin[1] + csiz*clim[1][0];
409		for (cpos[1] = clim[1][0]; cpos[1] < clim[1][1]; cpos[1]++) {
410		bmin[2] = cmin[2] + csiz*clim[2][0];
411	<	for (cpos[2] = clim[2][0]; cpos[2] < clim[2][1]; cpos[2]++) {
412	<	bmin[3] = cmin[3] + csiz*(cpos[3] = clim[3][0]);
411	>	if (st->ndim == 3) {
412	>	cpos[2] = clim[2][0];
413		n = cpos[0];
414	<	for (i = 1; i < st->ndim; i++)
414	>	for (i = 1; i < 3; i++)
415		n = (n << st->log2GR) + cpos[i];
416	<	for ( ; cpos[3] < clim[3][1]; cpos[3]++) {
416	>	for ( ; cpos[2] < clim[2][1]; cpos[2]++) {
417		rval += rv = (*cf)(st->u.v[n++], bmin, csiz, cptr);
418		if (rv < 0)
419		return rv;
420	<	bmin[3] += csiz;
420	>	bmin[2] += csiz;
421		}
422	<	bmin[2] += csiz;
422	>	} else {
423	>	for (cpos[2] = clim[2][0]; cpos[2] < clim[2][1]; cpos[2]++) {
424	>	bmin[3] = cmin[3] + csiz*(cpos[3] = clim[3][0]);
425	>	n = cpos[0];
426	>	for (i = 1; i < 4; i++)
427	>	n = (n << st->log2GR) + cpos[i];
428	>	for ( ; cpos[3] < clim[3][1]; cpos[3]++) {
429	>	rval += rv = (*cf)(st->u.v[n++], bmin, csiz, cptr);
430	>	if (rv < 0)
431	>	return rv;
432	>	bmin[3] += csiz;
433	>	}
434	>	bmin[2] += csiz;
435	>	}
436		}
437		bmin[1] += csiz;
438		}
#	Line 353 \| Line 450 \| static int
450		SDtraverseTre(const SDNode st, const double pos, int cmask,
451		SDtreCallback cf, void cptr)
452		{
356	–	static double czero[SD_MAXDIM];
453		int i;
454		/* check arguments */
455		if ((st == NULL) \| (cf == NULL))
#	Line 378 \| Line 474 \| *SDlookupTre(const SDNode st, const double pos, doubl*
474		hcube[i] = .0;
475		}
476		/* climb the tree */
477	<	while (st->log2GR < 0) {
477	>	while (st != NULL && st->log2GR < 0) {
478		n = 0; /* move to appropriate branch */
479		if (hcube) hcube[st->ndim] *= .5;
480		for (i = st->ndim; i--; ) {
#	Line 391 \| Line 487 \| *SDlookupTre(const SDNode st, const double pos, doubl*
487		st = st->u.t[n]; /* avoids tail recursion */
488		pos = spos;
489		}
490	+	if (st == NULL) /* should never happen? */
491	+	return .0;
492		if (st->log2GR == 0) /* short cut */
493		return st->u.v[0];
494		n = t = 0; /* find grid array index */
#	Line 406 \| Line 504 \| *SDlookupTre(const SDNode st, const double pos, doubl*
504		return st->u.v[n]; /* no interpolation */
505		}
506
507	+	/* Convert CIE (Y,u',v') color to our RGB */
508	+	static void
509	+	SDyuv2rgb(double yval, double uprime, double vprime, float rgb[3])
510	+	{
511	+	const double dfact = 1./(6.uprime - 16.vprime + 12.);
512	+	C_COLOR cxy;
513	+
514	+	c_cset(&cxy, 9.uprimedfact, 4.vprimedfact);
515	+	c_toSharpRGB(&cxy, yval, rgb);
516	+	}
517	+
518		/* Query BSDF value and sample hypercube for the given vectors */
519	<	static float
520	<	SDqueryTre(const SDTre sdt, const FVECT outVec, const FVECT inVec, double hc)
519	>	static int
520	>	SDqueryTre(const SDTre sdt, float coef,
521	>	const FVECT inVec, const FVECT outVec, double *hc)
522		{
523	<	static const FVECT zvec = {.0, .0, 1.};
524	<	FVECT rOutVec;
525	<	double gridPos[4];
523	>	const RREAL *vtmp;
524	>	float yval;
525	>	FVECT rOutVec;
526	>	RREAL gridPos[4];
527
528	+	if (sdt->stc[tt_Y] == NULL) /* paranoia, I hope */
529	+	return 0;
530	+
531		switch (sdt->sidef) { /* whose side are you on? */
532	<	case SD_UFRONT:
532	>	case SD_FREFL:
533		if ((outVec[2] < 0) \| (inVec[2] < 0))
534	<	return -1.;
534	>	return 0;
535		break;
536	<	case SD_UBACK:
536	>	case SD_BREFL:
537		if ((outVec[2] > 0) \| (inVec[2] > 0))
538	<	return -1.;
538	>	return 0;
539		break;
540	<	case SD_XMIT:
541	<	if ((outVec[2] > 0) == (inVec[2] > 0))
542	<	return -1.;
540	>	case SD_FXMIT:
541	>	if (outVec[2] > 0) {
542	>	if (inVec[2] > 0)
543	>	return 0;
544	>	vtmp = outVec; outVec = inVec; inVec = vtmp;
545	>	} else if (inVec[2] < 0)
546	>	return 0;
547		break;
548	+	case SD_BXMIT:
549	+	if (inVec[2] > 0) {
550	+	if (outVec[2] > 0)
551	+	return 0;
552	+	vtmp = outVec; outVec = inVec; inVec = vtmp;
553	+	} else if (outVec[2] < 0)
554	+	return 0;
555	+	break;
556		default:
557	<	return -1.;
557	>	return 0;
558		}
559		/* convert vector coordinates */
560	<	if (sdt->st->ndim == 3) {
561	<	spinvector(rOutVec, outVec, zvec, -atan2(inVec[1],inVec[0]));
562	<	gridPos[0] = .5 - .5sqrt(inVec[0]inVec[0] + inVec[1]*inVec[1]);
563	<	SDdisk2square(gridPos+1, rOutVec[0], rOutVec[1]);
564	<	} else if (sdt->st->ndim == 4) {
565	<	SDdisk2square(gridPos, -inVec[0], -inVec[1]);
566	<	SDdisk2square(gridPos+2, outVec[0], outVec[1]);
560	>	if (sdt->stc[tt_Y]->ndim == 3) {
561	>	spinvector(rOutVec, outVec, zvec, -atan2(-inVec[1],-inVec[0]));
562	>	gridPos[0] = (.5-FTINY) -
563	>	.5sqrt(inVec[0]inVec[0] + inVec[1]*inVec[1]);
564	>	disk2square(gridPos+1, rOutVec[0], rOutVec[1]);
565	>	} else if (sdt->stc[tt_Y]->ndim == 4) {
566	>	disk2square(gridPos, -inVec[0], -inVec[1]);
567	>	disk2square(gridPos+2, outVec[0], outVec[1]);
568		} else
569	<	return -1.; /* should be internal error */
570	<
571	<	return SDlookupTre(sdt->st, gridPos, hc);
569	>	return 0; /* should be internal error */
570	>	/* get BSDF value */
571	>	yval = SDlookupTre(sdt->stc[tt_Y], gridPos, hc);
572	>	if (coef == NULL) /* just getting hypercube? */
573	>	return 1;
574	>	if (sdt->stc[tt_u] == NULL \|\| sdt->stc[tt_v] == NULL) {
575	>	*coef = yval;
576	>	return 1; /* no color */
577	>	}
578	>	/* else decode color */
579	>	SDyuv2rgb(yval, SDlookupTre(sdt->stc[tt_u], gridPos, NULL),
580	>	SDlookupTre(sdt->stc[tt_v], gridPos, NULL), coef);
581	>	coef[0] *= tt_RGB_coef[0];
582	>	coef[1] *= tt_RGB_coef[1];
583	>	coef[2] *= tt_RGB_coef[2];
584	>	return 3;
585		}
586
587		/* Compute non-diffuse component for variable-resolution BSDF */
#	Line 454 \| Line 594 \| SDgetTreBSDF(float coef[SDmaxCh], const FVECT outVec,
594		\|\| sdc->dist == NULL)
595		return 0;
596		/* get nearest BSDF value */
597	<	coef[0] = SDqueryTre((SDTre *)sdc->dist, outVec, inVec, NULL);
458	<	return (coef[0] >= 0); /* monochromatic for now */
597	>	return SDqueryTre((SDTre *)sdc->dist, coef, outVec, inVec, NULL);
598		}
599
600		/* Callback to build cumulative distribution using SDtraverseTre() */
#	Line 464 \| Line 603 \| *build_scaffold(float val, const double cmin, double c**
603		{
604		SDdistScaffold sp = (SDdistScaffold )cptr;
605		int wid = csiz*(double)iwmax + .5;
606	+	double revcmin[2];
607		bitmask_t bmin[2], bmax[2];
608
609	<	cmin += sp->nic; /* skip to output coords */
609	>	if (sp->rev) { /* need to reverse sense? */
610	>	revcmin[0] = 1. - cmin[0] - csiz;
611	>	revcmin[1] = 1. - cmin[1] - csiz;
612	>	cmin = revcmin;
613	>	} else {
614	>	cmin += sp->nic; /* else skip to output coords */
615	>	}
616		if (wid < sp->wmin) /* new minimum width? */
617		sp->wmin = wid;
618		if (wid > sp->wmax) /* new maximum? */
619		sp->wmax = wid;
620		if (sp->alen >= sp->nall) { /* need more space? */
621		struct outdir_s *ndarr;
622	<	sp->nall += 8192;
622	>	sp->nall = (int)(1.5*sp->nall) + 256;
623		ndarr = (struct outdir_s *)realloc(sp->darr,
624		sizeof(struct outdir_s)*sp->nall);
625	<	if (ndarr == NULL)
625	>	if (ndarr == NULL) {
626	>	sprintf(SDerrorDetail,
627	>	"Cannot grow scaffold to %u entries", sp->nall);
628		return -1; /* abort build */
629	+	}
630		sp->darr = ndarr;
631		}
632		/* find Hilbert entry index */
#	Line 509 \| Line 658 \| *sscmp(const void p1, const void p2)*
658
659		/* Create a new cumulative distribution for the given input direction */
660		static SDTreCDst *
661	<	make_cdist(const SDTre sdt, const double pos)
661	>	make_cdist(const SDTre sdt, const double invec, int rev)
662		{
663		SDdistScaffold myScaffold;
664	+	double pos[4];
665	+	int cmask;
666		SDTreCDst *cd;
667		struct outdir_s *sp;
668		double scale, cursum;
#	Line 519 \| Line 670 \| *make_cdist(const SDTre sdt, const double pos)*
670		/* initialize scaffold */
671		myScaffold.wmin = iwmax;
672		myScaffold.wmax = 0;
673	<	myScaffold.nic = sdt->st->ndim - 2;
673	>	myScaffold.nic = sdt->stc[tt_Y]->ndim - 2;
674	>	myScaffold.rev = rev;
675		myScaffold.alen = 0;
676	<	myScaffold.nall = 8192;
676	>	myScaffold.nall = 512;
677		myScaffold.darr = (struct outdir_s )malloc(sizeof(struct outdir_s)
678		myScaffold.nall);
679		if (myScaffold.darr == NULL)
680		return NULL;
681	+	/* set up traversal */
682	+	cmask = (1<<myScaffold.nic) - 1;
683	+	for (i = myScaffold.nic; i--; )
684	+	pos[i+2*rev] = invec[i];
685	+	cmask <<= 2*rev;
686		/* grow the distribution */
687	<	if (SDtraverseTre(sdt->st, pos, (1<<myScaffold.nic)-1,
688	<	&build_scaffold, &myScaffold) < 0) {
687	>	if (SDtraverseTre(sdt->stc[tt_Y], pos, cmask,
688	>	build_scaffold, &myScaffold) < 0) {
689		free(myScaffold.darr);
690		return NULL;
691		}
#	Line 536 \| Line 693 \| *make_cdist(const SDTre sdt, const double pos)*
693		cd = (SDTreCDst *)malloc(sizeof(SDTreCDst) +
694		sizeof(cd->carr[0])*myScaffold.alen);
695		if (cd == NULL) {
696	+	sprintf(SDerrorDetail,
697	+	"Cannot allocate %u entry cumulative distribution",
698	+	myScaffold.alen);
699		free(myScaffold.darr);
700		return NULL;
701		}
702	+	cd->isodist = (myScaffold.nic == 1);
703		/* sort the distribution */
704		qsort(myScaffold.darr, cd->calen = myScaffold.alen,
705	<	sizeof(struct outdir_s), &sscmp);
705	>	sizeof(struct outdir_s), sscmp);
706
707		/* record input range */
708		scale = myScaffold.wmin / (double)iwmax;
709		for (i = myScaffold.nic; i--; ) {
710	<	cd->clim[i][0] = floor(pos[i]/scale) * scale;
710	>	cd->clim[i][0] = floor(pos[i+2rev]/scale) scale;
711		cd->clim[i][1] = cd->clim[i][0] + scale;
712		}
713	+	if (cd->isodist) { /* avoid issue in SDqueryTreProjSA() */
714	+	cd->clim[1][0] = cd->clim[0][0];
715	+	cd->clim[1][1] = cd->clim[0][1];
716	+	}
717		cd->max_psa = myScaffold.wmax / (double)iwmax;
718		cd->max_psa = cd->max_psa M_PI;
719	<	cd->sidef = sdt->sidef;
719	>	if (rev)
720	>	cd->sidef = (sdt->sidef==SD_BXMIT) ? SD_FXMIT : SD_BXMIT;
721	>	else
722	>	cd->sidef = sdt->sidef;
723		cd->cTotal = 1e-20; /* compute directional total */
724		sp = myScaffold.darr;
725		for (i = myScaffold.alen; i--; sp++)
#	Line 576 \| Line 744 \| *make_cdist(const SDTre sdt, const double pos)*
744		const SDCDst *
745		SDgetTreCDist(const FVECT inVec, SDComponent *sdc)
746		{
747	+	unsigned long cacheLeft = SDmaxCache;
748		const SDTre *sdt;
749	<	double inCoord[2];
581	<	int vflags;
749	>	RREAL inCoord[2];
750		int i;
751	<	SDTreCDst cd, cdlast;
751	>	int mode;
752	>	SDTreCDst cd, cdlast, *cdlimit;
753		/* check arguments */
754		if ((inVec == NULL) \| (sdc == NULL) \|\|
755		(sdt = (SDTre *)sdc->dist) == NULL)
756		return NULL;
757	<	if (sdt->st->ndim == 3) /* isotropic BSDF? */
758	<	inCoord[0] = .5 - .5sqrt(inVec[0]inVec[0] + inVec[1]*inVec[1]);
759	<	else if (sdt->st->ndim == 4)
760	<	SDdisk2square(inCoord, -inVec[0], -inVec[1]);
761	<	else
757	>	switch (mode = sdt->sidef) { /* check direction */
758	>	case SD_FREFL:
759	>	if (inVec[2] < 0)
760	>	return NULL;
761	>	break;
762	>	case SD_BREFL:
763	>	if (inVec[2] > 0)
764	>	return NULL;
765	>	break;
766	>	case SD_FXMIT:
767	>	if (inVec[2] < 0)
768	>	mode = SD_BXMIT;
769	>	break;
770	>	case SD_BXMIT:
771	>	if (inVec[2] > 0)
772	>	mode = SD_FXMIT;
773	>	break;
774	>	default:
775	>	return NULL;
776	>	}
777	>	if (sdt->stc[tt_Y]->ndim == 3) { /* isotropic BSDF? */
778	>	if (mode != sdt->sidef) /* XXX unhandled reciprocity */
779	>	return &SDemptyCD;
780	>	inCoord[0] = (.5-FTINY) -
781	>	.5sqrt(inVec[0]inVec[0] + inVec[1]*inVec[1]);
782	>	} else if (sdt->stc[tt_Y]->ndim == 4) {
783	>	if (mode != sdt->sidef) /* use reciprocity? */
784	>	disk2square(inCoord, inVec[0], inVec[1]);
785	>	else
786	>	disk2square(inCoord, -inVec[0], -inVec[1]);
787	>	} else
788		return NULL; /* should be internal error */
789	<	cdlast = NULL; /* check for direction in cache list */
789	>	/* quantize to avoid f.p. errors */
790	>	for (i = sdt->stc[tt_Y]->ndim - 2; i--; )
791	>	inCoord[i] = floor(inCoord[i]/quantum)quantum + .5quantum;
792	>	cdlast = cdlimit = NULL; /* check for direction in cache list */
793	>	/* PLACE MUTEX LOCK HERE FOR THREAD-SAFE */
794		for (cd = (SDTreCDst *)sdc->cdList; cd != NULL;
795	<	cdlast = cd, cd = (SDTreCDst *)cd->next) {
796	<	for (i = sdt->st->ndim - 2; i--; )
795	>	cdlast = cd, cd = cd->next) {
796	>	if (cacheLeft) { /* check cache size limit */
797	>	long csiz = sizeof(SDTreCDst) +
798	>	sizeof(cd->carr[0])*cd->calen;
799	>	if (cacheLeft > csiz)
800	>	cacheLeft -= csiz;
801	>	else {
802	>	cdlimit = cdlast;
803	>	cacheLeft = 0;
804	>	}
805	>	}
806	>	if (cd->sidef != mode)
807	>	continue;
808	>	for (i = sdt->stc[tt_Y]->ndim - 2; i--; )
809		if ((cd->clim[i][0] > inCoord[i]) \|
810		(inCoord[i] >= cd->clim[i][1]))
811		break;
812		if (i < 0)
813		break; /* means we have a match */
814		}
815	<	if (cd == NULL) /* need to create new entry? */
816	<	cdlast = cd = make_cdist(sdt, inCoord);
815	>	if (cd == NULL) { /* need to create new entry? */
816	>	if (cdlimit != NULL) /* exceeded cache size limit? */
817	>	while ((cd = cdlimit->next) != NULL) {
818	>	cdlimit->next = cd->next;
819	>	free(cd);
820	>	}
821	>	cdlast = cd = make_cdist(sdt, inCoord, mode != sdt->sidef);
822	>	}
823		if (cdlast != NULL) { /* move entry to head of cache list */
824		cdlast->next = cd->next;
825	<	cd->next = sdc->cdList;
825	>	cd->next = (SDTreCDst *)sdc->cdList;
826		sdc->cdList = (SDCDst *)cd;
827		}
828	+	/* END MUTEX LOCK */
829		return (SDCDst )cd; / ready to go */
830		}
831
#	Line 624 \| Line 842 \| *SDqueryTreProjSA(double psa, const FVECT v1, const RR**
842		/* get projected solid angle(s) */
843		if (v2 != NULL) {
844		const SDTre sdt = (SDTre )sdc->dist;
845	<	double hcube[SD_MAXDIM];
846	<	if (SDqueryTre(sdt, v1, v2, hcube) < 0) {
845	>	double hcube[SD_MAXDIM+1];
846	>	if (!SDqueryTre(sdt, NULL, v1, v2, hcube)) {
847		strcpy(SDerrorDetail, "Bad call to SDqueryTreProjSA");
848		return SDEinternal;
849		}
850	<	myPSA[0] = hcube[sdt->st->ndim];
850	>	myPSA[0] = hcube[sdt->stc[tt_Y]->ndim];
851		myPSA[1] = myPSA[0] = myPSA[0] M_PI;
852		} else {
853		const SDTreCDst cd = (const SDTreCDst )SDgetTreCDist(v1, sdc);
854		if (cd == NULL)
855	<	return SDEmemory;
856	<	myPSA[0] = M_PI * (cd->clim[0][1] - cd->clim[0][0]) *
857	<	(cd->clim[1][1] - cd->clim[1][0]);
858	<	myPSA[1] = cd->max_psa;
855	>	myPSA[0] = myPSA[1] = 0;
856	>	else {
857	>	myPSA[0] = M_PI * (cd->clim[0][1] - cd->clim[0][0]) *
858	>	(cd->clim[1][1] - cd->clim[1][0]);
859	>	myPSA[1] = cd->max_psa;
860	>	}
861		}
862		switch (qflags) { /* record based on flag settings */
863		case SDqueryVal:
#	Line 652 \| Line 872 \| *SDqueryTreProjSA(double psa, const FVECT v1, const RR**
872		psa[1] = myPSA[1];
873		/* fall through */
874		case SDqueryMin:
875	<	if (myPSA[0] < psa[0])
875	>	if ((myPSA[0] > 0) & (myPSA[0] < psa[0]))
876		psa[0] = myPSA[0];
877		break;
878		}
#	Line 668 \| Line 888 \| SDsampTreCDist(FVECT ioVec, double randX, const SDCDst
888		const SDTreCDst cd = (const SDTreCDst )cdp;
889		const unsigned target = randX*cumlmax;
890		bitmask_t hndx, hcoord[2];
891	<	double gpos[3];
891	>	FVECT gpos;
892	>	double rotangle;
893		int i, iupper, ilower;
894		/* check arguments */
895		if ((ioVec == NULL) \| (cd == NULL))
896		return SDEargument;
897	+	if (!cd->sidef)
898	+	return SDEnone; /* XXX should never happen */
899		if (ioVec[2] > 0) {
900	<	if (!(cd->sidef & SD_UFRONT))
900	>	if ((cd->sidef != SD_FREFL) & (cd->sidef != SD_FXMIT))
901		return SDEargument;
902	<	} else if (!(cd->sidef & SD_UBACK))
902	>	} else if ((cd->sidef != SD_BREFL) & (cd->sidef != SD_BXMIT))
903		return SDEargument;
904		/* binary search to find position */
905		ilower = 0; iupper = cd->calen;
906		while ((i = (iupper + ilower) >> 1) != ilower)
907	<	if ((long)target >= (long)cd->carr[i].cuml)
907	>	if (target >= cd->carr[i].cuml)
908		ilower = i;
909		else
910		iupper = i;
#	Line 696 \| Line 919 \| SDsampTreCDist(FVECT ioVec, double randX, const SDCDst
919		for (i = 2; i--; )
920		gpos[i] = ((double)hcoord[i] + rand()*(1./(RAND_MAX+.5))) /
921		(double)((bitmask_t)1 << nBitsC);
922	<	SDsquare2disk(gpos, gpos[0], gpos[1]);
922	>	square2disk(gpos, gpos[0], gpos[1]);
923		/* compute Z-coordinate */
924		gpos[2] = 1. - gpos[0]gpos[0] - gpos[1]gpos[1];
925	<	if (gpos[2] > 0) /* paranoia, I hope */
703	<	gpos[2] = sqrt(gpos[2]);
925	>	gpos[2] = sqrt(gpos[2]*(gpos[2]>0));
926		/* emit from back? */
927	<	if (ioVec[2] > 0 ^ cd->sidef != SD_XMIT)
927	>	if ((cd->sidef == SD_BREFL) \| (cd->sidef == SD_FXMIT))
928		gpos[2] = -gpos[2];
929	<	VCOPY(ioVec, gpos);
929	>	if (cd->isodist) { /* rotate isotropic sample */
930	>	rotangle = atan2(-ioVec[1],-ioVec[0]);
931	>	spinvector(ioVec, gpos, zvec, rotangle);
932	>	} else
933	>	VCOPY(ioVec, gpos);
934		return SDEnone;
935		}
936
#	Line 717 \| Line 943 \| next_token(char spp)**
943		return **spp;
944		}
945
946	<	#define eat_token(spp,c) (next_token(spp)==(c) ? ((spp))++ : 0)
946	>	/* Advance pointer past matching token (or any token if c==0) */
947	>	#define eat_token(spp,c) ((next_token(spp)==(c)) ^ !(c) ? ((spp))++ : 0)
948
949		/* Count words from this point in string to '}' */
950		static int
#	Line 743 \| Line 970 \| load_values(char spp, float va, int n)*
970		char *svnext;
971
972		while (n-- > 0 && (svnext = fskip(*spp)) != NULL) {
973	<	v++ = atof(spp);
973	>	if ((v++ = atof(spp)) < 0)
974	>	v[-1] = 0;
975		*spp = svnext;
976		eat_token(spp, ',');
977		}
#	Line 773 \| Line 1001 \| load_tree_data(char spp, int nd)**
1001		} else { /* else load value grid */
1002		int bsiz;
1003		n = count_values(spp); / see how big the grid is */
1004	<	for (bsiz = 0; bsiz < 8*sizeof(size_t)-1; bsiz += nd)
1004	>	for (bsiz = 0; bsiz < 8*sizeof(size_t); bsiz += nd)
1005		if (1<<bsiz == n)
1006		break;
1007		if (bsiz >= 8*sizeof(size_t)) {
#	Line 802 \| Line 1030 \| load_tree_data(char spp, int nd)**
1030		static SDError
1031		get_extrema(SDSpectralDF *df)
1032		{
1033	<	SDNode st = ((SDTre *)df->comp[0].dist).st;
1033	>	SDNode st = ((SDTre *)df->comp[0].dist).stc[tt_Y];
1034		double stepWidth, dhemi, bmin[4], bmax[4];
1035
1036		stepWidth = SDsmallestLeaf(st);
1037	+	if (quantum > stepWidth) /* adjust quantization factor */
1038	+	quantum = stepWidth;
1039		df->minProjSA = M_PIstepWidthstepWidth;
1040		if (stepWidth < .03125)
1041		stepWidth = .03125; /* 1/32 resolution good enough */
#	Line 840 \| Line 1070 \| *get_extrema(SDSpectralDF df)**
1070
1071		/* Load BSDF distribution for this wavelength */
1072		static SDError
1073	<	load_bsdf_data(SDData *sd, ezxml_t wdb, int ndim)
1073	>	load_bsdf_data(SDData *sd, ezxml_t wdb, int ct, int ndim)
1074		{
1075		SDSpectralDF *df;
1076		SDTre *sdt;
1077		char *sdata;
848	–	int i;
1078		/* allocate BSDF component */
1079		sdata = ezxml_txt(ezxml_child(wdb, "WavelengthDataDirection"));
1080		if (!sdata)
#	Line 853 \| Line 1082 \| *load_bsdf_data(SDData sd, ezxml_t wdb, int ndim)**
1082		/*
1083		* Remember that front and back are reversed from WINDOW 6 orientations
1084		*/
1085	<	if (!strcasecmp(sdata, "Transmission")) {
1086	<	if (sd->tf != NULL)
858	<	SDfreeSpectralDF(sd->tf);
859	<	if ((sd->tf = SDnewSpectralDF(1)) == NULL)
1085	>	if (!strcasecmp(sdata, "Transmission Front")) {
1086	>	if (sd->tb == NULL && (sd->tb = SDnewSpectralDF(1)) == NULL)
1087		return SDEmemory;
1088	+	df = sd->tb;
1089	+	} else if (!strcasecmp(sdata, "Transmission Back")) {
1090	+	if (sd->tf == NULL && (sd->tf = SDnewSpectralDF(1)) == NULL)
1091	+	return SDEmemory;
1092		df = sd->tf;
1093		} else if (!strcasecmp(sdata, "Reflection Front")) {
1094	<	if (sd->rb != NULL) /* note back-front reversal */
864	<	SDfreeSpectralDF(sd->rb);
865	<	if ((sd->rb = SDnewSpectralDF(1)) == NULL)
1094	>	if (sd->rb == NULL && (sd->rb = SDnewSpectralDF(1)) == NULL)
1095		return SDEmemory;
1096		df = sd->rb;
1097		} else if (!strcasecmp(sdata, "Reflection Back")) {
1098	<	if (sd->rf != NULL) /* note front-back reversal */
870	<	SDfreeSpectralDF(sd->rf);
871	<	if ((sd->rf = SDnewSpectralDF(1)) == NULL)
1098	>	if (sd->rf == NULL && (sd->rf = SDnewSpectralDF(1)) == NULL)
1099		return SDEmemory;
1100		df = sd->rf;
1101		} else
1102		return SDEnone;
876	–	/* XXX should also check "ScatteringDataType" for consistency? */
1103		/* get angle bases */
1104		sdata = ezxml_txt(ezxml_child(wdb,"AngleBasis"));
1105		if (!sdata \|\| strcasecmp(sdata, "LBNL/Shirley-Chiu")) {
#	Line 881 \| Line 1107 \| *load_bsdf_data(SDData sd, ezxml_t wdb, int ndim)**
1107		!sdata ? "Missing" : "Unsupported", sd->name);
1108		return !sdata ? SDEformat : SDEsupport;
1109		}
1110	<	/* allocate BSDF tree */
1111	<	sdt = (SDTre *)malloc(sizeof(SDTre));
1112	<	if (sdt == NULL)
1113	<	return SDEmemory;
1114	<	if (df == sd->rf)
1115	<	sdt->sidef = SD_UFRONT;
1116	<	else if (df == sd->rb)
1117	<	sdt->sidef = SD_UBACK;
1118	<	else
1119	<	sdt->sidef = SD_XMIT;
1120	<	sdt->st = NULL;
1121	<	df->comp[0].cspec[0] = c_dfcolor; /* XXX monochrome for now */
1122	<	df->comp[0].dist = sdt;
1123	<	df->comp[0].func = &SDhandleTre;
1110	>	if (df->comp[0].dist == NULL) { /* need to allocate BSDF tree? */
1111	>	sdt = (SDTre *)malloc(sizeof(SDTre));
1112	>	if (sdt == NULL)
1113	>	return SDEmemory;
1114	>	if (df == sd->rf)
1115	>	sdt->sidef = SD_FREFL;
1116	>	else if (df == sd->rb)
1117	>	sdt->sidef = SD_BREFL;
1118	>	else if (df == sd->tf)
1119	>	sdt->sidef = SD_FXMIT;
1120	>	else /* df == sd->tb */
1121	>	sdt->sidef = SD_BXMIT;
1122	>	sdt->stc[tt_Y] = sdt->stc[tt_u] = sdt->stc[tt_v] = NULL;
1123	>	df->comp[0].dist = sdt;
1124	>	df->comp[0].func = &SDhandleTre;
1125	>	} else {
1126	>	sdt = (SDTre *)df->comp[0].dist;
1127	>	if (sdt->stc[ct] != NULL) {
1128	>	SDfreeTre(sdt->stc[ct]);
1129	>	sdt->stc[ct] = NULL;
1130	>	}
1131	>	}
1132		/* read BSDF data */
1133		sdata = ezxml_txt(ezxml_child(wdb, "ScatteringData"));
1134		if (!sdata \|\| !next_token(&sdata)) {
#	Line 902 \| Line 1136 \| *load_bsdf_data(SDData sd, ezxml_t wdb, int ndim)**
1136		sd->name);
1137		return SDEformat;
1138		}
1139	<	sdt->st = load_tree_data(&sdata, ndim);
1140	<	if (sdt->st == NULL)
1139	>	sdt->stc[ct] = load_tree_data(&sdata, ndim);
1140	>	if (sdt->stc[ct] == NULL)
1141		return SDEformat;
1142		if (next_token(&sdata)) { /* check for unconsumed characters */
1143		sprintf(SDerrorDetail,
#	Line 912 \| Line 1146 \| *load_bsdf_data(SDData sd, ezxml_t wdb, int ndim)**
1146		return SDEformat;
1147		}
1148		/* flatten branches where possible */
1149	<	sdt->st = SDsimplifyTre(sdt->st);
1150	<	if (sdt->st == NULL)
1149	>	sdt->stc[ct] = SDsimplifyTre(sdt->stc[ct]);
1150	>	if (sdt->stc[ct] == NULL)
1151		return SDEinternal;
1152	<	return get_extrema(df); /* compute global quantities */
1152	>	/* compute global quantities for Y */
1153	>	return (ct == tt_Y) ? get_extrema(df) : SDEnone;
1154		}
1155
1156		/* Find minimum value in tree */
#	Line 950 \| Line 1185 \| *SDsubtractTreVal(SDNode st, float val)**
1185		SDsubtractTreVal(st->u.t[n], val);
1186		} else {
1187		for (n = 1<<(st->ndim*st->log2GR); n--; )
1188	<	st->u.v[n] -= val;
1188	>	if ((st->u.v[n] -= val) < 0)
1189	>	st->u.v[n] = .0f;
1190		}
1191		}
1192
1193	<	/* Subtract minimum value from BSDF */
1193	>	/* Subtract minimum Y value from BSDF */
1194		static double
1195	<	subtract_min(SDNode *st)
1195	>	subtract_min_Y(SDNode *st)
1196		{
1197	<	float vmin;
1197	>	const float vmaxmin = 1.5/M_PI;
1198	>	float vmin;
1199		/* be sure to skip unused portion */
1200		if (st->ndim == 3) {
1201		int n;
1202	<	vmin = 1./M_PI;
1202	>	vmin = vmaxmin;
1203		if (st->log2GR < 0) {
1204	<	for (n = 0; n < 4; n++) {
1204	>	for (n = 0; n < 8; n += 2) {
1205		float v = SDgetTreMin(st->u.t[n]);
1206		if (v < vmin)
1207		vmin = v;
#	Line 978 \| Line 1215 \| *subtract_min(SDNode st)**
1215		} else /* anisotropic covers entire tree */
1216		vmin = SDgetTreMin(st);
1217
1218	<	if (vmin <= FTINY)
1219	<	return .0;
1218	>	if ((vmin >= vmaxmin) \| (vmin <= .01/M_PI))
1219	>	return .0; /* not worth bothering about */
1220
1221		SDsubtractTreVal(st, vmin);
1222
1223		return M_PI * vmin; /* return hemispherical value */
1224		}
1225
1226	+	/* Struct used in callback to find RGB extrema */
1227	+	typedef struct {
1228	+	SDNode *stc; / original Y, u' & v' trees */
1229	+	float rgb[3]; /* RGB value */
1230	+	SDNode new_stu, new_stv; /* replacement u' & v' trees */
1231	+	} SDextRGBs;
1232	+
1233	+	/* Callback to find minimum RGB from Y value plus CIE (u',v') trees */
1234	+	static int
1235	+	get_min_RGB(float yval, const double cmin, double csiz, void cptr)
1236	+	{
1237	+	SDextRGBs mp = (SDextRGBs )cptr;
1238	+	double cmax[SD_MAXDIM];
1239	+	float rgb[3];
1240	+
1241	+	if (mp->stc[tt_Y]->ndim == 3) {
1242	+	if (cmin[0] + .5*csiz >= .5)
1243	+	return 0; /* ignore dead half of isotropic */
1244	+	} else
1245	+	cmax[3] = cmin[3] + csiz;
1246	+	cmax[0] = cmin[0] + csiz;
1247	+	cmax[1] = cmin[1] + csiz;
1248	+	cmax[2] = cmin[2] + csiz;
1249	+	/* average RGB color over voxel */
1250	+	SDyuv2rgb(yval, SDavgTreBox(mp->stc[tt_u], cmin, cmax),
1251	+	SDavgTreBox(mp->stc[tt_v], cmin, cmax), rgb);
1252	+	/* track smallest components */
1253	+	if (rgb[0] < mp->rgb[0]) mp->rgb[0] = rgb[0];
1254	+	if (rgb[1] < mp->rgb[1]) mp->rgb[1] = rgb[1];
1255	+	if (rgb[2] < mp->rgb[2]) mp->rgb[2] = rgb[2];
1256	+	return 0;
1257	+	}
1258	+
1259	+	/* Callback to build adjusted u' tree */
1260	+	static int
1261	+	adjust_utree(float uprime, const double cmin, double csiz, void cptr)
1262	+	{
1263	+	SDextRGBs mp = (SDextRGBs )cptr;
1264	+	double cmax[SD_MAXDIM];
1265	+	double yval;
1266	+	float rgb[3];
1267	+	C_COLOR clr;
1268	+
1269	+	if (mp->stc[tt_Y]->ndim == 3) {
1270	+	if (cmin[0] + .5*csiz >= .5)
1271	+	return 0; /* ignore dead half of isotropic */
1272	+	} else
1273	+	cmax[3] = cmin[3] + csiz;
1274	+	cmax[0] = cmin[0] + csiz;
1275	+	cmax[1] = cmin[1] + csiz;
1276	+	cmax[2] = cmin[2] + csiz;
1277	+	/* average RGB color over voxel */
1278	+	SDyuv2rgb(yval=SDavgTreBox(mp->stc[tt_Y], cmin, cmax), uprime,
1279	+	SDavgTreBox(mp->stc[tt_v], cmin, cmax), rgb);
1280	+	/* subtract minimum (& clamp) */
1281	+	if ((rgb[0] -= mp->rgb[0]) < 1e-5yval) rgb[0] = 1e-5yval;
1282	+	if ((rgb[1] -= mp->rgb[1]) < 1e-5yval) rgb[1] = 1e-5yval;
1283	+	if ((rgb[2] -= mp->rgb[2]) < 1e-5yval) rgb[2] = 1e-5yval;
1284	+	c_fromSharpRGB(rgb, &clr); /* compute new u' for adj. RGB */
1285	+	uprime = 4.clr.cx/(-2.clr.cx + 12.*clr.cy + 3.);
1286	+	/* assign in new u' tree */
1287	+	mp->new_stu = SDsetVoxel(mp->new_stu, mp->stc[tt_Y]->ndim,
1288	+	cmin, csiz, uprime);
1289	+	return -(mp->new_stu == NULL);
1290	+	}
1291	+
1292	+	/* Callback to build adjusted v' tree */
1293	+	static int
1294	+	adjust_vtree(float vprime, const double cmin, double csiz, void cptr)
1295	+	{
1296	+	SDextRGBs mp = (SDextRGBs )cptr;
1297	+	double cmax[SD_MAXDIM];
1298	+	double yval;
1299	+	float rgb[3];
1300	+	C_COLOR clr;
1301	+
1302	+	if (mp->stc[tt_Y]->ndim == 3) {
1303	+	if (cmin[0] + .5*csiz >= .5)
1304	+	return 0; /* ignore dead half of isotropic */
1305	+	} else
1306	+	cmax[3] = cmin[3] + csiz;
1307	+	cmax[0] = cmin[0] + csiz;
1308	+	cmax[1] = cmin[1] + csiz;
1309	+	cmax[2] = cmin[2] + csiz;
1310	+	/* average RGB color over voxel */
1311	+	SDyuv2rgb(yval=SDavgTreBox(mp->stc[tt_Y], cmin, cmax),
1312	+	SDavgTreBox(mp->stc[tt_u], cmin, cmax),
1313	+	vprime, rgb);
1314	+	/* subtract minimum (& clamp) */
1315	+	if ((rgb[0] -= mp->rgb[0]) < 1e-5yval) rgb[0] = 1e-5yval;
1316	+	if ((rgb[1] -= mp->rgb[1]) < 1e-5yval) rgb[1] = 1e-5yval;
1317	+	if ((rgb[2] -= mp->rgb[2]) < 1e-5yval) rgb[2] = 1e-5yval;
1318	+	c_fromSharpRGB(rgb, &clr); /* compute new v' for adj. RGB */
1319	+	vprime = 9.clr.cy/(-2.clr.cx + 12.*clr.cy + 3.);
1320	+	/* assign in new v' tree */
1321	+	mp->new_stv = SDsetVoxel(mp->new_stv, mp->stc[tt_Y]->ndim,
1322	+	cmin, csiz, vprime);
1323	+	return -(mp->new_stv == NULL);
1324	+	}
1325	+
1326	+	/* Subtract minimum (diffuse) color and return luminance & CIE (x,y) */
1327	+	static double
1328	+	subtract_min_RGB(C_COLOR cs, SDNode stc[])
1329	+	{
1330	+	SDextRGBs my_min;
1331	+	double ymin;
1332	+
1333	+	my_min.stc = stc;
1334	+	my_min.rgb[0] = my_min.rgb[1] = my_min.rgb[2] = FHUGE;
1335	+	my_min.new_stu = my_min.new_stv = NULL;
1336	+	/* get minimum RGB value */
1337	+	SDtraverseTre(stc[tt_Y], NULL, 0, get_min_RGB, &my_min);
1338	+	/* convert to C_COLOR */
1339	+	ymin = c_fromSharpRGB(my_min.rgb, cs);
1340	+	if ((ymin >= .5*FHUGE) \| (ymin <= .01/M_PI))
1341	+	return .0; /* close to zero or no tree */
1342	+	/* adjust u' & v' trees */
1343	+	SDtraverseTre(stc[tt_u], NULL, 0, adjust_utree, &my_min);
1344	+	SDtraverseTre(stc[tt_v], NULL, 0, adjust_vtree, &my_min);
1345	+	SDfreeTre(stc[tt_u]); SDfreeTre(stc[tt_v]);
1346	+	stc[tt_u] = SDsimplifyTre(my_min.new_stu);
1347	+	stc[tt_v] = SDsimplifyTre(my_min.new_stv);
1348	+	/* subtract Y & return hemispherical */
1349	+	SDsubtractTreVal(stc[tt_Y], ymin);
1350	+
1351	+	return M_PI * ymin;
1352	+	}
1353	+
1354		/* Extract and separate diffuse portion of BSDF */
1355		static void
1356		extract_diffuse(SDValue dv, SDSpectralDF df)
1357		{
1358		int n;
1359	+	SDTre *sdt;
1360
1361		if (df == NULL \|\| df->ncomp <= 0) {
1362		dv->spec = c_dfcolor;
1363		dv->cieY = .0;
1364		return;
1365		}
1366	<	dv->spec = df->comp[0].cspec[0];
1367	<	dv->cieY = subtract_min(((SDTre )df->comp[0].dist).st);
1368	<	/* in case of multiple components */
1369	<	for (n = df->ncomp; --n; ) {
1370	<	double ymin = subtract_min(((SDTre )df->comp[n].dist).st);
1371	<	c_cmix(&dv->spec, dv->cieY, &dv->spec, ymin, &df->comp[n].cspec[0]);
1372	<	dv->cieY += ymin;
1366	>	sdt = (SDTre *)df->comp[0].dist;
1367	>	/* subtract minimum color/grayscale */
1368	>	if (sdt->stc[tt_u] != NULL && sdt->stc[tt_v] != NULL) {
1369	>	int i = 3*(tt_RGB_coef[1] < .001);
1370	>	while (i--) { /* initialize on first call */
1371	>	float rgb[3];
1372	>	rgb[0] = rgb[1] = rgb[2] = .0f; rgb[i] = 1.f;
1373	>	tt_RGB_coef[i] = c_fromSharpRGB(rgb, &tt_RGB_prim[i]);
1374	>	}
1375	>	memcpy(df->comp[0].cspec, tt_RGB_prim, sizeof(tt_RGB_prim));
1376	>	dv->cieY = subtract_min_RGB(&dv->spec, sdt->stc);
1377	>	} else {
1378	>	df->comp[0].cspec[0] = dv->spec = c_dfcolor;
1379	>	dv->cieY = subtract_min_Y(sdt->stc[tt_Y]);
1380		}
1381		df->maxHemi -= dv->cieY; /* adjust maximum hemispherical */
1382	<	/* make sure everything is set */
1383	<	c_ccvt(&dv->spec, C_CSXY+C_CSSPEC);
1382	>
1383	>	c_ccvt(&dv->spec, C_CSXY); /* make sure (x,y) is set */
1384		}
1385
1386		/* Load a variable-resolution BSDF tree from an open XML file */
#	Line 1040 \| Line 1413 \| *SDloadTre(SDData sd, ezxml_t wtl)**
1413		/* load BSDF components */
1414		for (wld = ezxml_child(wtl, "WavelengthData");
1415		wld != NULL; wld = wld->next) {
1416	<	if (strcasecmp(ezxml_txt(ezxml_child(wld,"Wavelength")),
1417	<	"Visible"))
1418	<	continue; /* just visible for now */
1416	>	const char *cnm = ezxml_txt(ezxml_child(wld,"Wavelength"));
1417	>	int ct = -1;
1418	>	if (!strcasecmp(cnm, "Visible"))
1419	>	ct = tt_Y;
1420	>	else if (!strcasecmp(cnm, "CIE-u"))
1421	>	ct = tt_u;
1422	>	else if (!strcasecmp(cnm, "CIE-v"))
1423	>	ct = tt_v;
1424	>	else
1425	>	continue;
1426		for (wdb = ezxml_child(wld, "WavelengthDataBlock");
1427		wdb != NULL; wdb = wdb->next)
1428	<	if ((ec = load_bsdf_data(sd, wdb, rank)) != SDEnone)
1428	>	if ((ec = load_bsdf_data(sd, wdb, ct, rank)) != SDEnone)
1429		return ec;
1430		}
1431		/* separate diffuse components */
1432		extract_diffuse(&sd->rLambFront, sd->rf);
1433		extract_diffuse(&sd->rLambBack, sd->rb);
1434	<	extract_diffuse(&sd->tLamb, sd->tf);
1434	>	extract_diffuse(&sd->tLambFront, sd->tf);
1435	>	if (sd->tb != NULL) {
1436	>	extract_diffuse(&sd->tLambBack, sd->tb);
1437	>	if (sd->tf == NULL)
1438	>	sd->tLambFront = sd->tLambBack;
1439	>	} else if (sd->tf != NULL)
1440	>	sd->tLambBack = sd->tLambFront;
1441		/* return success */
1442		return SDEnone;
1443		}
1444
1445		/* Variable resolution BSDF methods */
1446	<	SDFunc SDhandleTre = {
1446	>	const SDFunc SDhandleTre = {
1447		&SDgetTreBSDF,
1448		&SDqueryTreProjSA,
1449		&SDgetTreCDist,

Diff Legend

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

Comparing ray/src/common/bsdf_t.c (file contents): Revision 3.11 by greg, Thu Apr 28 17:46:25 2011 UTC vs. Revision 3.53 by greg, Wed Dec 15 01:38:50 2021 UTC

Diff Legend

Comparing ray/src/common/bsdf_t.c (file contents):
Revision 3.11 by greg, Thu Apr 28 17:46:25 2011 UTC vs.
Revision 3.53 by greg, Wed Dec 15 01:38:50 2021 UTC