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.9 by rschregle, Fri Feb 2 19:47:55 2018 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  
20   #include "pmapparm.h"
21   #include "pmapdata.h"
20 #include "standard.h"
22   #include <ctype.h>
23  
24  
25 < 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) */
25 > float pdfSamples        = 1000,        /* PDF samples per steradian */
26  
27 < #ifdef PMAP_ROI
28 <   /* Region of interest bbox: {xmin, xmax, ymin, ymax, zmin, zmax} */
29 <   float pmapROI [6] = {-FHUGE, FHUGE, -FHUGE, FHUGE, -FHUGE, FHUGE};                                        
30 < #endif                                        
27 >      finalGather       = 0.25,        /* fraction of global photons for
28 >                                          irradiance precomputation */
29 >                                          
30 >      preDistrib        = 0.25,        /* fraction of num photons for
31 >                                          distribution prepass */
32 >                                          
33 >      gatherTolerance   = 0.5,         /* Photon map lookup tolerance;
34 >                                          lookups returning fewer than this
35 >                                          fraction of minGather/maxGather
36 >                                          are restarted with a larger
37 >                                          search radius */
38 >                                          
39 >      maxDistFix        = 0,           /* Static maximum photon search
40 >                                          radius (radius is adaptive if
41 >                                          this is zero) */
42 >      
43 >      photonMaxDist     = 0;           /* Maximum cumulative distance of
44 >                                          photon path */
45 >                                          
46 > #ifdef PMAP_OOC
47 > float          pmapCachePageSize = 8;     /* OOC cache pagesize as multiple
48 >                                           * of maxGather */
49 > unsigned long  pmapCacheSize     = 1e6;   /* OOC cache size in photons */
50 > #endif
51  
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 */
52  
53 + /* Regions of interest */
54 + unsigned pmapNumROI = 0;
55 + PhotonMapROI *pmapROI = NULL;
56 +
57 +
58 + unsigned verbose = 0;                  /* Verbose console output */
59 + unsigned long photonMaxBounce = 5000;  /* Runaway photon bounce limit */
60 + unsigned photonRepTime        = 0,     /* Seconds between reports */
61 +         maxPreDistrib        = 4,     /* Max predistrib passes */
62 +         defaultGather        = 40;    /* Default num photons for lookup */
63 +
64 +
65   /* Per photon map params */
66   PhotonMapParams pmapParams [NUM_PMAP_TYPES] = {
67     {NULL, 0, 0, 0}, {NULL, 0, 0, 0}, {NULL, 0, 0, 0},  {NULL, 0, 0, 0},
# Line 64 | Line 79 | int setPmapParam (PhotonMap** pm, const PhotonMapParam
79        (*pm) -> minGather = parm -> minGather;
80        (*pm) -> maxGather = parm -> maxGather;
81        (*pm) -> distribTarget = parm -> distribTarget;
67      (*pm) -> heapSizeInc = photonHeapSizeInc;      
82        (*pm) -> maxDist0 = FHUGE;
83        (*pm) -> srcContrib = NULL;
84  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines