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

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

# Line 1 | Line 1
1   /* RCSid $Id$ */
2 +
3   /*
4     ==================================================================
5     Photon map main header
# Line 9 | Line 10
10     supported by the Swiss National Science Foundation (SNSF, #147053)
11     ==================================================================
12    
13 +   $Id$
14   */
15  
16  
# Line 20 | Line 22
22  
23  
24     #ifndef min
25 <      #define min(a, b) ((a) < (b) ? (a) : (b))
25 >      #define min(a, b)          ((a) < (b) ? (a) : (b))
26     #endif
27    
28     #ifndef max
29 <      #define max(a, b) ((a) > (b) ? (a) : (b))
29 >      #define max(a, b)          ((a) > (b) ? (a) : (b))
30     #endif
31    
32 <   #define sqr(a)    ((a) * (a))
32 >   #define sqr(a)                ((a) * (a))
33  
34     /* Average over colour channels */
35     #define colorAvg(col) ((col [0] + col [1] + col [2]) / 3)
# Line 55 | Line 57
57     void cleanUpPmaps (PhotonMap **pmaps);
58     /* Trash all photon maps after processing is complete */
59  
60 <   void distribPhotons (PhotonMap **pmaps);
60 >   void distribPhotons (PhotonMap **pmaps, unsigned numProc);
61     /* Emit photons from light sources and build photon maps for non-NULL
62      * entries in photon map array */
63  

Diff Legend

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