[ViewVC] Diff of: radiance/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.7 by greg, Tue Sep 1 16:27:52 2015 UTC

#	Line 1 \| Line 1
1	+	#ifndef lint
2	+	static const char RCSid[] = "$Id$";
3	+	#endif
4		/*
5		==================================================================
6		Photon map interface to RADIANCE ambient calculation
#	Line 8 \| Line 11
11		supported by the Swiss National Science Foundation (SNSF, #147053)
12		==================================================================
13
11	–	$Id$
14		*/
15
16
#	Line 58 \| Line 60 \| *int ambPmapCaustic (COLOR aval, RAY r, int rdepth)**
60		/* Handle precedence in case of multiple photon maps: contrib > caustic */
61		PhotonMap *pmap = contribPhotonMapping ? contribPmap : causticPmap;
62
63	<	/* Get caustic photon density estimate only at primary rays */
64	<	if (pmap && (!rdepth \|\| (!globalPmap & !contribPmap & !preCompPmap
65	<	&& r->crtype & AMBIENT))) {
63	>	/* Get caustic photon density estimate at primary rays or when
64	>	* filling in ambient rays that have no global photon map to use */
65	>	if (pmap && (!rdepth \|\| !globalPmap & !contribPmap & !preCompPmap)) {
66		/* Temporarily factor ambient value into ray coefficient
67		* (required for contribution photon map) */
68		copycolor(rcoef, r -> rcoef);

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