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

Comparing ray/src/rt/pmapopt.c (file contents):
Revision 2.1 by greg, Tue Feb 24 19:39:27 2015 UTC vs.
Revision 2.5 by rschregle, Tue May 26 13:31:19 2015 UTC

# Line 4 | Line 4
4  
5     Roland Schregle (roland.schregle@{hslu.ch, gmail.com})
6     (c) Fraunhofer Institute for Solar Energy Systems,
7 <       Lucerne University of Applied Sciences & Arts
7 >   (c) Lucerne University of Applied Sciences and Arts,
8 >   supported by the Swiss National Science Foundation (SNSF, #147053)
9     ==================================================================  
10    
11     $Id$
# Line 12 | Line 13
13  
14  
15  
16 < #include <stdlib.h>
16 > #include "ray.h"
17   #include "pmapparm.h"
17 – #include "rtio.h"
18 – #include "rterror.h"
18  
19  
20  
# Line 34 | Line 33 | int getPmapRenderOpt (int ac, char *av [])
33        case 'a':
34           switch (av [0][2]) {
35              case 'p': /* photon map */
36 +               /* Asking for photon map, ergo ambounce != 0 */
37 +               ambounce += (ambounce == 0);
38                 if (!check(3, "s")) {
39                    /* File -> assume bwidth = 1 or precomputed pmap */
40                    if (++t >= NUM_PMAP_TYPES)
# Line 71 | Line 72 | int getPmapRenderOpt (int ac, char *av [])
72                 }
73                 else return 2;
74                
75 <            case 'm': /* max photon search radius coefficient */
76 <               if (check(3, "f") || (maxDistCoeff = atof(av [1])) <= 0)
75 >            case 'm': /* Fixed max photon search radius */
76 >               if (check(3, "f") || (maxDistFix = atof(av [1])) <= 0)
77                    error(USER, "invalid max photon search radius coefficient");
78  
79                 return 1;
# Line 89 | Line 90 | int getPmapRenderOpt (int ac, char *av [])
90   void printPmapDefaults ()
91   /* Print defaults for photon map render options */
92   {
93 <   puts("-ap file [bwidth1 [bwidth2]]\t# photon map");
93 <   printf("-am %.1f\t\t\t# max photon search radius coeff\n", maxDistCoeff);
93 >   printf("-am %.1f\t\t\t\t# max photon search radius\n", maxDistFix);
94   }

Diff Legend

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