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

Comparing ray/src/rt/pmapparm.c (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   #ifndef lint
2   static const char RCSid[] = "$Id$";
3   #endif
4 +
5   /*
6 <   ==================================================================
7 <   Parameters for photon map generation; used by MKPMAP
8 <   For inclusion in mkpmap.c
6 >   ======================================================================
7 >   Parameters for photon map generation and rendering; used by mkpmap
8 >   and rpict/rvu/rtrace.
9    
10     Roland Schregle (roland.schregle@{hslu.ch, gmail.com}
11     (c) Fraunhofer Institute for Solar Energy Systems,
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 (SNSF, #147053)
14 >   ======================================================================
15    
16 +   $Id$
17   */
18  
19  
# Line 21 | Line 23 | static const char RCSid[] = "$Id$";
23   #include <ctype.h>
24  
25  
26 < float pdfSamples = 1000,                /* PDF samples per steradian */
25 <      finalGather = 0.25,               /* fraction of global photons for
26 <                                           irradiance precomputation */
27 <      preDistrib = 0.25,                /* fraction of num photons for
28 <                                           distribution prepass */
29 <      gatherTolerance = 0.5,            /* Photon map lookup tolerance;
30 <                                           lookups returning fewer than this
31 <                                           fraction of minGather/maxGather
32 <                                           are restarted with a larger
33 <                                           search radius */
34 <      maxDistFix = 0;                   /* Static maximum photon search
35 <                                           radius (radius is adaptive if
36 <                                           this is zero) */
26 > float pdfSamples        = 1000,        /* PDF samples per steradian */
27  
28 +      finalGather       = 0.25,        /* fraction of global photons for
29 +                                          irradiance precomputation */
30 +                                          
31 +      preDistrib        = 0.25,        /* fraction of num photons for
32 +                                          distribution prepass */
33 +                                          
34 +      gatherTolerance   = 0.5,         /* Photon map lookup tolerance;
35 +                                          lookups returning fewer than this
36 +                                          fraction of minGather/maxGather
37 +                                          are restarted with a larger
38 +                                          search radius */
39 +                                          
40 +      maxDistFix        = 0;           /* Static maximum photon search
41 +                                          radius (radius is adaptive if
42 +                                          this is zero) */
43 +                                          
44 + #ifdef PMAP_OOC
45 + float          pmapCachePageSize = 8;     /* OOC cache pagesize as multiple
46 +                                           * of maxGather */
47 + unsigned long  pmapCacheSize     = 1e6;   /* OOC cache size in photons */
48 + #endif
49 +
50 +
51   #ifdef PMAP_ROI
52 <   /* Region of interest bbox: {xmin, xmax, ymin, ymax, zmin, zmax} */
53 <   float pmapROI [6] = {-FHUGE, FHUGE, -FHUGE, FHUGE, -FHUGE, FHUGE};                                        
52 > /* Region of interest bbox: {xmin, xmax, ymin, ymax, zmin, zmax} */
53 > float pmapROI [6] = {-FHUGE, FHUGE, -FHUGE, FHUGE, -FHUGE, FHUGE};                                        
54   #endif                                        
55  
43 – unsigned long photonHeapSizeInc = 1000, /* Photon heap size increment */
44 –              photonMaxBounce = 5000;   /* Runaway photon bounce limit */
45 –              
46 – unsigned photonRepTime = 0,             /* Seconds between reports */
47 –         maxPreDistrib = 4,             /* Max predistrib passes */
48 –         defaultGather = 40;            /* Default num photons for lookup */
56  
57 + unsigned long photonMaxBounce = 5000;  /* Runaway photon bounce limit */
58 + unsigned photonRepTime        = 0,     /* Seconds between reports */
59 +         maxPreDistrib        = 4,     /* Max predistrib passes */
60 +         defaultGather        = 40;    /* Default num photons for lookup */
61 +
62 +
63   /* Per photon map params */
64   PhotonMapParams pmapParams [NUM_PMAP_TYPES] = {
65     {NULL, 0, 0, 0}, {NULL, 0, 0, 0}, {NULL, 0, 0, 0},  {NULL, 0, 0, 0},
# Line 64 | Line 77 | int setPmapParam (PhotonMap** pm, const PhotonMapParam
77        (*pm) -> minGather = parm -> minGather;
78        (*pm) -> maxGather = parm -> maxGather;
79        (*pm) -> distribTarget = parm -> distribTarget;
67 –      (*pm) -> heapSizeInc = photonHeapSizeInc;      
80        (*pm) -> maxDist0 = FHUGE;
81        (*pm) -> srcContrib = NULL;
82  

Diff Legend

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