ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/pmapamb.c
(Generate patch)

Comparing ray/src/rt/pmapamb.c (file contents):
Revision 2.7 by greg, Tue Sep 1 16:27:52 2015 UTC vs.
Revision 2.8 by rschregle, Tue May 17 17:39:47 2016 UTC

# Line 1 | Line 1
1   #ifndef lint
2   static const char RCSid[] = "$Id$";
3   #endif
4 +
5   /*
6     ==================================================================
7     Photon map interface to RADIANCE ambient calculation
# Line 11 | Line 12 | static const char RCSid[] = "$Id$";
12     supported by the Swiss National Science Foundation (SNSF, #147053)
13     ==================================================================  
14    
15 +   $Id$
16   */
17  
18  
# Line 28 | Line 30 | int ambPmap (COLOR aval, RAY *r, int rdepth)
30     PhotonMap *pmap = contribPhotonMapping ? contribPmap
31                                            : preCompPmap ? preCompPmap
32                                                          : globalPmap;
33 <        
33 >      
34     /* Get photon irradiance either via 1 ambient bounce (final
35      * gather) if ambounce > 0, or directly if ambounce < 0. */
36     if (pmap && (rdepth || ambounce < 0)) {
# Line 69 | Line 71 | int ambPmapCaustic (COLOR aval, RAY *r, int rdepth)
71        multcolor(r -> rcoef, aval);
72        
73        /* Set caustic flag and get photon irradiance via callback */
74 <      pmap -> lookupFlags = PMAP_CAUST_BIT;
74 >      pmap -> lookupCaustic = 1;
75        (pmap -> lookup)(pmap, r, photonIrrad);
76        
77        /* Factor irradiance into ambient value and restore ray coeficient */

Diff Legend

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