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.8 by rschregle, Mon Aug 14 21:12:10 2017 UTC vs.
Revision 2.11 by greg, Tue Sep 17 16:36:05 2024 UTC

# Line 7 | Line 7
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)
13 >       supported by the Swiss National Science Foundation
14 >       (SNSF #147053, "Daylight Redirecting Components")
15     ======================================================================
16    
17     $Id$
# Line 20 | Line 23
23  
24     #include "pmaptype.h"
25    
26 <      
26 > #ifdef __cplusplus
27 > extern "C" {
28 > #endif
29 >
30     /* Struct for passing params per photon map from rpict/rtrace/rvu */
31     typedef struct {
32        char *fileName;                /* Photon map file */
# Line 28 | Line 34
34        unsigned long distribTarget;   /* Num photons to store */
35     } PhotonMapParams;
36    
37 <   /* Bounding box for region of interest */
38 <      typedef struct {
39 <      float min [3], max [3];
37 >   /* Region of interest */
38 >   typedef struct {
39 >      /* siz [1], siz [2] <= 0 --> sphere, else rectangle */
40 >      float pos [3], siz [3];
41     } PhotonMapROI;
42 +  
43 +   #define PMAP_ROI_ISSPHERE(roi) ((roi)->siz[1] <= 0 && (roi)->siz[2] <= 0)
44 +   #define PMAP_ROI_SETSPHERE(roi) ((roi)->siz[1] = (roi)->siz[2] = -1)
45  
46  
47     extern PhotonMapParams pmapParams [NUM_PMAP_TYPES];
# Line 46 | Line 56
56    
57    
58     extern float         pdfSamples, preDistrib, finalGather,
59 <                        gatherTolerance, maxDistFix;
59 >                        gatherTolerance, maxDistFix, pmapMaxDist,
60 >                        photonMaxDist;
61     extern unsigned long photonHeapSizeInc, photonMaxBounce;
62     extern unsigned      photonRepTime, maxPreDistrib, defaultGather,
63                          verbose;
# Line 68 | Line 79
79     unsigned long parseMultiplier (const char *num);
80     /* Evaluate numeric parameter string with optional multiplier suffix
81        (G = 10^9, M = 10^6, K = 10^3). Returns 0 if parsing fails. */
82 +
83 + #ifdef __cplusplus
84 + }
85 + #endif
86 +
87   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines