ViewVC Help

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

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

Comparing ray/src/rt/pmapamb.c (file contents):
Revision 2.3 by greg, Wed May 27 16:23:41 2015 UTC vs.
Revision 2.5 by rschregle, Wed Jul 29 18:54:20 2015 UTC

#	Line 58 | Line 58 | int ambPmapCaustic (COLOR aval, RAY *r, int rdepth)
58		/* Handle precedence in case of multiple photon maps: contrib > caustic */
59		PhotonMap *pmap = contribPhotonMapping ? contribPmap : causticPmap;
60
61	<	/* Get caustic photon density estimate only at primary rays */
62	<	if (pmap && (!rdepth || (!globalPmap & !contribPmap & !preCompPmap
63	<	&& r->crtype & AMBIENT))) {
61	>	/* Get caustic photon density estimate at primary rays or when
62	>	* filling in ambient rays that have no global photon map to use */
63	>	if (pmap && (!rdepth || !globalPmap & !contribPmap & !preCompPmap)) {
64		/* Temporarily factor ambient value into ray coefficient
65		* (required for contribution photon map) */
66		copycolor(rcoef, r -> rcoef);

Diff Legend

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