ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/rt/m_bsdf.c

Comparing ray/src/rt/m_bsdf.c (file contents):
Revision 2.62 by greg, Sat Mar 27 17:50:18 2021 UTC vs.
Revision 2.65 by greg, Fri Aug 27 03:09:27 2021 UTC

#	Line 17 | Line 17 | static const char RCSid[] = "$Id$";
17		#include  "pmapmat.h"
18
19		/*
20	<	*     Arguments to this material include optional diffuse colors.
20	>	*      Arguments to this material include optional diffuse colors.
21		*  String arguments include the BSDF and function files.
22		*      For the MAT_BSDF type, a non-zero thickness causes the useful behavior
23		*  of translating transmitted rays this distance beneath the surface
#	Line 130 | Line 130 | compute_through(BSDFDAT *ndp)
130		{1.8, -1.8}, {-2.4, 0}, {0, 2.4},
131		{0, -2.4}, {2.4, 0},
132		};
133	–	const double    peak_over = 1.5;
133		PEAKSAMP        psamp[NDIR2CHECK];
134		SDSpectralDF    *dfp;
135		FVECT           pdir;
#	Line 165 | Line 164 | compute_through(BSDFDAT *ndp)
164		}
165		qsort(psamp, NDIR2CHECK, sizeof(PEAKSAMP), cmp_psamp);
166		if (psamp[0].vy <= FTINY)
167	<	return;                         /* zero area */
167	>	return;                         /* zero BTDF here */
168		setcolor(vpeak, 0, 0, 0);
169		setcolor(vsurr, 0, 0, 0);
170		vypeak = tomsum = tomsurr = 0;          /* combine top unique values */
#	Line 178 | Line 177 | compute_through(BSDFDAT *ndp)
177		SDqueryMin, ndp->sd);
178		if (ec)
179		goto baderror;
180	<	/* not really a peak? */
180	>
181	>	scalecolor(psamp[i].vcol, tomega);
182	>	/* not part of peak? */
183		if (tomega > 1.5*dfp->minProjSA ||
184		vypeak > 8.*psamp[i].vy*ns) {
185		if (!i) return;         /* abort */
185	–	scalecolor(psamp[i].vcol, tomega);
186		addcolor(vsurr, psamp[i].vcol);
187		tomsurr += tomega;
188		continue;
189		}
190	–	scalecolor(psamp[i].vcol, tomega);
190		addcolor(vpeak, psamp[i].vcol);
191		tomsum += tomega;
192		vypeak += psamp[i].vy;
193		++ns;
194		}
195	<	if (vypeak*tomsurr < peak_over*bright(vsurr)*ns)
196	<	return;                         /* peak not peaky enough */
195	>	if (tomsurr <= FTINY)                   /* no surround implies no peak */
196	>	return;
197		if ((vypeak/ns - (ndp->vray[2] > 0 ? ndp->sd->tLambFront.cieY
198	<	: ndp->sd->tLambBack.cieY)*(1./PI))*tomsum <= .001)
199	<	return;                         /* < 0.1% transmission */
198	>	: ndp->sd->tLambBack.cieY)*(1./PI))*tomsum < .0005)
199	>	return;                         /* < 0.05% transmission */
200		copycolor(ndp->cthru, vpeak);           /* already scaled by omega */
201		multcolor(ndp->cthru, ndp->pr->pcol);   /* modify by pattern */
202	<	if (tomsurr > FTINY) {                  /* surround contribution? */
203	<	scalecolor(vsurr, 1./tomsurr);  /* this one is avg. BTDF */
204	<	copycolor(ndp->cthru_surr, vsurr);
206	<	multcolor(ndp->cthru_surr, ndp->pr->pcol);
207	<	}
202	>	scalecolor(vsurr, 1./tomsurr);          /* surround is avg. BTDF */
203	>	copycolor(ndp->cthru_surr, vsurr);
204	>	multcolor(ndp->cthru_surr, ndp->pr->pcol);
205		return;
206		baderror:
207		objerror(ndp->mp, USER, transSDError(ec));
#	Line 683 | Line 680 | m_bsdf(OBJREC *m, RAY *r)
680		SDfreeCache(nd.sd);
681		return(1);
682		}
683	<	/* diffuse reflectance */
683	>	/* diffuse components */
684		if (hitfront) {
685		cvt_sdcolor(nd.rdiff, &nd.sd->rLambFront);
686		if (m->oargs.nfargs >= 3) {
#	Line 692 | Line 689 | m_bsdf(OBJREC *m, RAY *r)
689		m->oargs.farg[2]);
690		addcolor(nd.rdiff, ctmp);
691		}
692	+	cvt_sdcolor(nd.tdiff, &nd.sd->tLambFront);
693		} else {
694		cvt_sdcolor(nd.rdiff, &nd.sd->rLambBack);
695		if (m->oargs.nfargs >= 6) {
#	Line 700 | Line 698 | m_bsdf(OBJREC *m, RAY *r)
698		m->oargs.farg[5]);
699		addcolor(nd.rdiff, ctmp);
700		}
701	+	cvt_sdcolor(nd.tdiff, &nd.sd->tLambBack);
702		}
703	<	/* diffuse transmittance */
705	<	cvt_sdcolor(nd.tdiff, hitfront ? &nd.sd->tLambFront : &nd.sd->tLambBack);
706	<	if (m->oargs.nfargs >= 9) {
703	>	if (m->oargs.nfargs >= 9) {             /* add diffuse transmittance? */
704		setcolor(ctmp, m->oargs.farg[6],
705		m->oargs.farg[7],
706		m->oargs.farg[8]);

Diff Legend

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