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.42 by greg, Tue Nov 28 22:17:00 2017 UTC vs.
Revision 2.46 by greg, Mon Feb 12 18:46:29 2018 UTC

#	Line 106 | Line 106 | compute_through(BSDFDAT *ndp)
106		{0, -1.6},
107		{1.6, 0},
108		};
109	<	const double    peak_over = 2.0;
109	>	const double    peak_over = 1.5;
110		SDSpectralDF    *dfp;
111		FVECT           pdir;
112		double          tomega, srchrad;
#	Line 116 | Line 116 | compute_through(BSDFDAT *ndp)
116
117		setcolor(ndp->cthru, 0, 0, 0);          /* starting assumption */
118
119	+	if (ndp->pr->crtype & (SPECULAR|AMBIENT) && !(ndp->pr->crtype & SHADOW))
120	+	return;                         /* no need for through comp. */
121	+
122		if (ndp->pr->rod > 0)
123		dfp = (ndp->sd->tf != NULL) ? ndp->sd->tf : ndp->sd->tb;
124		else
#	Line 142 | Line 145 | compute_through(BSDFDAT *ndp)
145		goto baderror;
146		cvt_sdcolor(vcol, &sv);
147		addcolor(vsum, vcol);
148	<	if (bright(vcol) > bright(vpeak)) {
148	>	if (sv.cieY > bright(vpeak)) {
149		copycolor(vpeak, vcol);
150		VCOPY(pdir, tdir);
151		}
#	Line 154 | Line 157 | compute_through(BSDFDAT *ndp)
157		goto baderror;
158		if (tomega > 1.5*dfp->minProjSA)
159		return;                         /* not really a peak? */
160	+	tomega /= fabs(pdir[2]);                /* remove cosine factor */
161		if ((bright(vpeak) - ndp->sd->tLamb.cieY*(1./PI))*tomega <= .001)
162		return;                         /* < 0.1% transmission */
163		for (i = 3; i--; )                      /* remove peak from average */
#	Line 187 | Line 191 | bsdf_jitter(FVECT vres, BSDFDAT *ndp, double sr_psa)
191		static int
192		direct_specular_OK(COLOR cval, FVECT ldir, double omega, BSDFDAT *ndp)
193		{
194	<	int     nsamp, ok = 0;
194	>	int     nsamp;
195	>	double  wtot = 0;
196		FVECT   vsrc, vsmp, vjit;
197		double  tomega, tomega2;
198		double  sf, tsr, sd[2];
#	Line 272 | Line 277 | direct_specular_OK(COLOR cval, FVECT ldir, double omeg
277		if (tomega2 < .12*tomega)
278		continue;       /* not safe to include */
279		cvt_sdcolor(csmp, &sv);
280	<	addcolor(cval, csmp);   /* else average it in */
281	<	++ok;
280	>
281	>	if (sf < 2.5*tsr) {     /* weight by Y for small sources */
282	>	scalecolor(csmp, sv.cieY);
283	>	wtot += sv.cieY;
284	>	} else
285	>	wtot += 1.;
286	>	addcolor(cval, csmp);
287		}
288	<	if (!ok)                        /* no valid specular samples? */
288	>	if (wtot <= FTINY)              /* no valid specular samples? */
289		return(0);
290
291	<	sf = 1./(double)ok;             /* compute average BSDF */
291	>	sf = 1./wtot;                   /* weighted average BSDF */
292		scalecolor(cval, sf);
293		/* subtract diffuse contribution */
294		for (i = 3*(diffY > FTINY); i--; )
#	Line 434 | Line 444 | dir_btdf(
444		static int
445		sample_sdcomp(BSDFDAT *ndp, SDComponent *dcp, int xmit)
446		{
447	<	const int       hasthru = (xmit &&
438	<	!(ndp->pr->crtype & (SPECULAR|AMBIENT)) &&
439	<	bright(ndp->cthru) > FTINY);
447	>	const int       hasthru = (xmit && bright(ndp->cthru) > FTINY);
448		int             nstarget = 1;
449		int             nsent = 0;
450		int             n;
#	Line 501 | Line 509 | sample_sdcomp(BSDFDAT *ndp, SDComponent *dcp, int xmit
509		static int
510		sample_sdf(BSDFDAT *ndp, int sflags)
511		{
512	<	int             hasthru = (sflags == SDsampSpT
513	<	&& !(ndp->pr->crtype & (SPECULAR|AMBIENT))
506	<	&& bright(ndp->cthru) > FTINY);
512	>	int             hasthru = (sflags == SDsampSpT &&
513	>	bright(ndp->cthru) > FTINY);
514		int             n, ntotal = 0;
515		double          b = 0;
516		SDSpectralDF    *dfp;
#	Line 538 | Line 545 | sample_sdf(BSDFDAT *ndp, int sflags)
545		} else
546		hasthru = 0;
547		}
548	<	if (dfp->maxHemi - b <= FTINY) {        /* how specular to sample? */
548	>	if (dfp->maxHemi - b <= FTINY) {        /* have specular to sample? */
549		b = 0;
550		} else {
551		FVECT   vjit;
#	Line 669 | Line 676 | m_bsdf(OBJREC *m, RAY *r)
676		if (r->crtype & SHADOW) {
677		RAY     tr;                     /* attempt to pass shadow ray */
678		if (rayorigin(&tr, TRANS, r, nd.cthru) < 0)
679	<	return(1);              /* blocked */
679	>	return(1);              /* no through component */
680		VCOPY(tr.rdir, r->rdir);
681		rayvalue(&tr);                  /* transmit with scaling */
682		multcolor(tr.rcol, tr.rcoef);

Diff Legend

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