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.29 by greg, Sat Aug 1 23:27:04 2015 UTC vs.
Revision 2.30 by greg, Wed Sep 2 18:59:01 2015 UTC

#	Line 13 | Line 13 | static const char RCSid[] = "$Id$";
13		#include  "func.h"
14		#include  "bsdf.h"
15		#include  "random.h"
16	+	#include  "pmapmat.h"
17
18		/*
19		*      Arguments to this material include optional diffuse colors.
#	Line 200 | Line 201 | dir_bsdf(
201		scalecolor(ctmp, dtmp);
202		addcolor(cval, ctmp);
203		}
204	+	if (ambRayInPmap(np->pr))
205	+	return;         /* specular already in photon map */
206		/*
207		*  Compute scattering coefficient using BSDF.
208		*/
#	Line 255 | Line 258 | dir_brdf(
258		scalecolor(ctmp, dtmp);
259		addcolor(cval, ctmp);
260		}
261	+	if (ambRayInPmap(np->pr))
262	+	return;         /* specular already in photon map */
263		/*
264		*  Compute reflection coefficient using BSDF.
265		*/
#	Line 304 | Line 309 | dir_btdf(
309		scalecolor(ctmp, dtmp);
310		addcolor(cval, ctmp);
311		}
312	+	if (ambRayInPmap(np->pr))
313	+	return;         /* specular already in photon map */
314		/*
315		*  Compute scattering coefficient using BSDF.
316		*/

Diff Legend

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