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

Comparing ray/src/rt/pmapparm.h (file contents):
Revision 2.4 by rschregle, Tue May 26 13:31:19 2015 UTC vs.
Revision 2.10 by rschregle, Wed Apr 14 11:26:25 2021 UTC

# Line 1 | Line 1
1 + /* RCSid $Id$ */
2 +
3   /*
4 <   ==================================================================
5 <   Parameters for photon map generation; used by MKPMAP
6 <   For inclusion in mkpmap.c
4 >   ======================================================================
5 >   Parameters for photon map generation and rendering; used by mkpmap
6 >   and rpict/rvu/rtrace.  
7    
8     Roland Schregle (roland.schregle@{hslu.ch, gmail.com}
9     (c) Fraunhofer Institute for Solar Energy Systems,
10 +       supported by the German Research Foundation
11 +       (DFG LU-204/10-2, "Fassadenintegrierte Regelsysteme" (FARESYS))
12     (c) Lucerne University of Applied Sciences and Arts,
13 <   supported by the Swiss National Science Foundation (SNSF, #147053)
14 <   ==================================================================
13 >       supported by the Swiss National Science Foundation
14 >       (SNSF #147053, "Daylight Redirecting Components")
15 >   ======================================================================
16    
17     $Id$
18   */
# Line 25 | Line 30
30        unsigned minGather, maxGather; /* Num photons to gather */
31        unsigned long distribTarget;   /* Num photons to store */
32     } PhotonMapParams;
33 +  
34 +   /* Region of interest */
35 +   typedef struct {
36 +      /* siz [1], siz [2] <= 0 --> sphere, else rectangle */
37 +      float pos [3], siz [3];
38 +   } PhotonMapROI;
39 +  
40 +   #define PMAP_ROI_ISSPHERE(roi) ((roi)->siz[1] <= 0 && (roi)->siz[2] <= 0)
41 +   #define PMAP_ROI_SETSPHERE(roi) ((roi)->siz[1] = (roi)->siz[2] = -1)
42  
43  
44     extern PhotonMapParams pmapParams [NUM_PMAP_TYPES];
# Line 38 | Line 52
52     #define contribPmapParams  (pmapParams [PMAP_TYPE_CONTRIB])
53    
54    
55 <   extern float pdfSamples, preDistrib, finalGather, gatherTolerance,
56 <                maxDistFix;
57 <   extern unsigned long photonHeapSizeInc, photonMaxBounce;
58 <   extern unsigned photonRepTime, maxPreDistrib, defaultGather;
59 < #ifdef PMAP_ROI                
60 <   extern float pmapROI [6];
55 >   extern float         pdfSamples, preDistrib, finalGather,
56 >                        gatherTolerance, maxDistFix, pmapMaxDist,
57 >                        photonMaxDist;
58 >   extern unsigned long photonHeapSizeInc, photonMaxBounce;
59 >   extern unsigned      photonRepTime, maxPreDistrib, defaultGather,
60 >                        verbose;
61 >
62 >   extern unsigned      pmapNumROI;
63 >   extern PhotonMapROI  *pmapROI;
64 >
65 > #ifdef PMAP_OOC
66 >   extern float         pmapCachePageSize;
67 >   extern unsigned long pmapCacheSize;
68   #endif  
69 +
70  
71     struct PhotonMap;
72    

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines