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

Comparing ray/src/rt/ambient.c (file contents):
Revision 2.94 by greg, Tue Feb 24 19:39:26 2015 UTC vs.
Revision 2.95 by rschregle, Tue May 19 13:52:37 2015 UTC

# Line 667 | Line 667 | multambient(           /* compute ambient component & multiply
667  
668          /* PMAP: Factor in ambient from global photon map (if enabled) and return
669           * as all ambient components accounted for */
670 <        if (ambGlobalPmap(aval, r, rdepth))
670 >        if (ambPmap(aval, r, rdepth))
671                  return;
672  
673          /* PMAP: Otherwise factor in ambient from caustic photon map
674           * (ambCausticPmap() returns zero if caustic photons disabled) and
675           * continue with RADIANCE ambient calculation */
676          copycolor(caustic, aval);
677 <        ambCausticPmap(caustic, r, rdepth);
677 >        ambPmapCaustic(caustic, r, rdepth);
678          
679          if (ambdiv <= 0)                        /* no ambient calculation */
680                  goto dumbamb;

Diff Legend

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