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

Comparing ray/src/rt/pmap.c (file contents):
Revision 2.4 by rschregle, Thu Apr 23 20:02:04 2015 UTC vs.
Revision 2.7 by greg, Fri May 22 14:09:01 2015 UTC

# Line 101 | Line 101 | void savePmaps (const PhotonMap **pmaps, int argc, cha
101    
102     for (t = 0; t < NUM_PMAP_TYPES; t++) {
103        if (pmaps [t])
104 <         savePhotonMap(pmaps [t], pmaps [t] -> fileName, t, argc, argv);
104 >         savePhotonMap(pmaps [t], pmaps [t] -> fileName, argc, argv);
105     }
106   }                  
107  
# Line 206 | Line 206 | void tracePhoton (RAY *ray)
206     OBJREC* mat;
207  
208     if (ray -> rlvl > photonMaxBounce) {
209 + #ifdef PMAP_RUNAWAY_WARN  
210        error(WARNING, "runaway photon!");
211 + #endif      
212        return;
213     }
214 <  
214 >  
215     if (colorAvg(ray -> cext) > FTINY && !photonParticipate(ray))
216        return;
217        
# Line 507 | Line 509 | void distribPhotons (PhotonMap **pmaps)
509        for (srcIdx = 0; srcIdx < nsources; srcIdx++) {
510           unsigned portCnt = 0;
511           emap.src = source + srcIdx;
512 <                  
512 >
513           do {
514              emap.port = emap.src -> sflags & SDISTANT ? photonPorts + portCnt
515                                                        : NULL;

Diff Legend

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