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

Comparing ray/src/rt/pmapdump.c (file contents):
Revision 2.13 by rschregle, Thu Jan 10 17:32:39 2019 UTC vs.
Revision 2.14 by rschregle, Tue Jan 22 18:28:23 2019 UTC

# Line 4 | Line 4 | static const char RCSid[] = "$Id$";
4  
5   /*
6     ======================================================================
7 <   Dump photon maps as RADIANCE scene description to stdout
7 >   Dump photon maps as RADIANCE scene description or ASCII point list
8 >   to stdout
9  
10     Roland Schregle (roland.schregle@{hslu.ch, gmail.com})
11     (c) Fraunhofer Institute for Solar Energy Systems,
# Line 17 | Line 18 | static const char RCSid[] = "$Id$";
18  
19  
20  
21 + #include "pmap.h"
22   #include "pmapio.h"
21 – #include "pmapparm.h"
22 – #include "pmaptype.h"
23   #include "rtio.h"
24   #include "resolu.h"
25   #include "random.h"
# Line 34 | Line 34 | static const char RCSid[] = "$Id$";
34   #define RADSCALE 1.0
35   #define NSPHERES 10000
36  
37 + /* Format for optional ASCII output as XYZ RGB points */
38 + #define POINTFMT "%g\t%g\t%g\t%g\t%g\t%g\n"
39  
40   /* RADIANCE material and object defs for each photon type */
41   typedef struct {
42     char *mat, *obj;
43   } RadianceDef;
44  
43 –
44 – /* We use %e for the material def to preserve precision when outputting
45 –   photon flux */
45   const RadianceDef radDefs [] = {
46 <   {  "void glow mat.global\n0\n0\n4 %e %e %e 0\n",
46 >   {  "void glow mat.global\n0\n0\n4 %g %g %g 0\n",
47        "mat.global sphere obj.global\n0\n0\n4 %g %g %g %g\n"
48     },
49 <   {  "void glow mat.pglobal\n0\n0\n4 %e %e %e 0\n",
49 >   {  "void glow mat.pglobal\n0\n0\n4 %g %g %g 0\n",
50        "mat.pglobal sphere obj.pglobal\n0\n0\n4 %g %g %g %g\n"
51     },
52 <   {  "void glow mat.caustic\n0\n0\n4 %e %e %e 0\n",
52 >   {  "void glow mat.caustic\n0\n0\n4 %g %g %g 0\n",
53        "mat.caustic sphere obj.caustic\n0\n0\n4 %g %g %g %g\n"
54     },
55 <   {  "void glow mat.volume\n0\n0\n4 %e %e %e 0\n",
55 >   {  "void glow mat.volume\n0\n0\n4 %g %g %g 0\n",
56        "mat.volume sphere obj.volume\n0\n0\n4 %g %g %g %g\n"
57     },
58 <   {  "void glow mat.direct\n0\n0\n4 %e %e %e 0\n",
58 >   {  "void glow mat.direct\n0\n0\n4 %g %g %g 0\n",
59        "mat.direct sphere obj.direct\n0\n0\n4 %g %g %g %g\n"
60     },
61 <   {  "void glow mat.contrib\n0\n0\n4 %e %e %e 0\n",
61 >   {  "void glow mat.contrib\n0\n0\n4 %g %g %g 0\n",
62        "mat.contrib sphere obj.contrib\n0\n0\n4 %g %g %g %g\n"
63     }
64   };
65  
66 +
67   /* Default colour codes are as follows:   global         = blue
68                                            precomp global = cyan
69                                            caustic        = red
# Line 76 | Line 76 | const COLOR colDefs [] = {
76   };
77  
78  
79 + static int setBool(char *str, unsigned pos, unsigned *var)
80 + {
81 +   switch ((str) [pos]) {
82 +      case '\0':
83 +         *var = !*var;
84 +         break;
85 +      case 'y': case 'Y': case 't': case 'T': case '+': case '1':
86 +         *var = 1;
87 +         break;
88 +      case 'n': case 'N': case 'f': case 'F': case '-': case '0':
89 +         *var = 0;
90 +         break;
91 +      default:
92 +         return 0;
93 +   }
94 +  
95 +   return 1;
96 + }
97 +
98 +
99   int main (int argc, char** argv)
100   {
101     char           format [MAXFMTLEN];
102     RREAL          rad, radScale = RADSCALE, extent, dumpRatio;
103 <   unsigned       arg, j, ptype, dim, fluxCol = 0;
103 >   unsigned       arg, j, ptype, dim, fluxCol = 0, points = 0;
104     long           numSpheres = NSPHERES;
105 <   COLOR          customCol = {0, 0, 0};
105 >   COLOR          col = {0, 0, 0};
106     FILE           *pmapFile;
107     PhotonMap      pm;
108     PhotonPrimary  pri;
# Line 91 | Line 111 | int main (int argc, char** argv)
111     char           leafFname [1024];
112   #endif
113  
94 –   int setBool(char *str, int pos, int *var)
95 –   {
96 –      switch ((str) [pos]) {
97 –         case '\0':
98 –            *var = !*var;
99 –            break;
100 –         case 'y': case 'Y': case 't': case 'T': case '+': case '1':
101 –            *var = 1;
102 –            break;
103 –         case 'n': case 'N': case 'f': case 'F': case '-': case '0':
104 –            *var = 0;
105 –            break;
106 –         default:
107 –            return 0;
108 –      }
109 –      
110 –      return 1;
111 –   }
112 –
114     if (argc < 2) {
115 <      puts("Dump photon maps as RADIANCE scene description\n");
115 >      puts("Dump photon maps as RADIANCE scene description "
116 >           "or ASCII point list\n");
117        printf("Usage: %s "
118 <             "[-r radscale1] [-n nspheres1] [-f | -c rcol1 gcol1 bcol1] pmap1 "
119 <             "[-r radscale2] [-n nspheres2] [-f | -c rcol2 gcol2 bcol2] pmap2 "
118 >             "[-a] [-r radscale1] [-n num1] "
119 >             "[-f | -c rcol1 gcol1 bcol1] pmap1 "
120 >             "[-a] [-r radscale2] [-n num2] "
121 >             "[-f | -c rcol2 gcol2 bcol2] pmap2 "
122               "...\n", argv [0]);
123        return 1;
124     }
# Line 123 | Line 127 | int main (int argc, char** argv)
127        /* Parse options */
128        if (argv [arg][0] == '-') {
129           switch (argv [arg][1]) {
130 +            case 'a':
131 +               if (!setBool(argv [arg], 2, &points))
132 +                  error(USER, "invalid option syntax at -a");
133 +               break;
134              case 'r':
135                 if ((radScale = atof(argv [++arg])) <= 0)
136                    error(USER, "invalid radius scale");
# Line 130 | Line 138 | int main (int argc, char** argv)
138                
139              case 'n':
140                 if ((numSpheres = parseMultiplier(argv [++arg])) <= 0)
141 <                  error(USER, "invalid number of spheres");
141 >                  error(USER, "invalid number of points/spheres");
142                 break;
143                
144              case 'c':
# Line 141 | Line 149 | int main (int argc, char** argv)
149                    error(USER, "invalid RGB colour");
150                                  
151                 for (j = 0; j < 3; j++)
152 <                  customCol [j] = atof(argv [++arg]);
152 >                  col [j] = atof(argv [++arg]);
153                 break;
154                
155              case 'f':
156 <               if (intens(customCol) > 0)
156 >               if (intens(col) > 0)
157                    error(USER, "-f and -c are mutually exclusive");
158                    
159                 if (!setBool(argv [arg], 2, &fluxCol))
# Line 161 | Line 169 | int main (int argc, char** argv)
169           continue;
170        }
171  
172 <      /* Dump photon map */
172 >      /* Open next photon map file */
173        if (!(pmapFile = fopen(argv [arg], "rb"))) {
174           sprintf(errmsg, "can't open %s", argv [arg]);
175           error(SYSTEM, errmsg);
# Line 190 | Line 198 | int main (int argc, char** argv)
198        if (strcmp(getstr(format, pmapFile), PMAP_FILEVER))      
199           error(USER, "incompatible photon map file format");
200  
201 <      /* Dump command line as comment */
202 <      fputs("# ", stdout);
203 <      printargs(argc, argv, stdout);
204 <      fputc('\n', stdout);
197 <
198 <      /* Dump common material def if constant for all photons,
199 <         i.e. independent of individual flux */
200 <      if (!fluxCol) {
201 <         if (intens(customCol) > 0)
202 <            printf(radDefs [ptype].mat,
203 <                   customCol [0], customCol [1], customCol [2]);
204 <         else
205 <            printf(radDefs [ptype].mat, colDefs [ptype][0],
206 <                   colDefs [ptype][1], colDefs [ptype][2]);
201 >      if (!points) {
202 >         /* Dump command line as comment */
203 >         fputs("# ", stdout);
204 >         printargs(argc, argv, stdout);
205           fputc('\n', stdout);
206        }
207 +        
208 +      /* Set point/sphere colour if independent of photon flux,
209 +         output RADIANCE material def if required */
210 +      if (!fluxCol) {
211 +         if (intens(col) <= 0)
212 +            copycolor(col, colDefs [ptype]);
213 +         if (!points) {
214 +            printf(radDefs [ptype].mat, col [0], col [1], col [2]);
215 +            fputc('\n', stdout);
216 +         }
217 +      }
218        
219        /* Get number of photons */
220        pm.numPhotons = getint(sizeof(pm.numPhotons), pmapFile);
# Line 240 | Line 249 | int main (int argc, char** argv)
249        rad = radScale * RADCOEFF * pow(extent / numSpheres, 1./dim);
250        
251        /* Photon dump probability to satisfy target sphere count */
252 <      dumpRatio = numSpheres < pm.numPhotons
244 <                  ? (float)numSpheres / pm.numPhotons : 1;
252 >      dumpRatio = min(1, (float)numSpheres / pm.numPhotons);
253        
254        /* Skip primary rays */
255        pm.numPrimary = getint(sizeof(pm.numPrimary), pmapFile);
# Line 271 | Line 279 | int main (int argc, char** argv)
279        }
280   #endif
281              
282 <      /* Load photons */      
282 >      /* Read photons */
283        while (pm.numPhotons-- > 0) {
284   #ifdef PMAP_OOC
285           /* Get entire photon record from ooC octree leaf file
# Line 307 | Line 315 | int main (int argc, char** argv)
315  
316           /* Dump photon probabilistically acc. to target sphere count */
317           if (frandom() <= dumpRatio) {
318 <            if (fluxCol) {
319 <               /* Dump individual material def per photon acc. to flux */
320 <               getPhotonFlux(&p, customCol);
321 <               printf(radDefs [ptype].mat,
322 <                      customCol [0], customCol [1], customCol [2]);
318 >            if (fluxCol)
319 >               /* Get photon flux */
320 >               getPhotonFlux(&p, col);
321 >            
322 >            if (!points) {
323 >               if (fluxCol) {
324 >                  /* Dump material def if variable (depends on flux) */
325 >                  printf(radDefs [ptype].mat, col [0], col [1], col [2]);
326 >                  fputc('\n', stdout);
327 >               }
328 >               printf(radDefs [ptype].obj, p.pos [0], p.pos [1], p.pos [2],
329 >                      rad);
330                 fputc('\n', stdout);
331              }
332 <            
333 <            printf(radDefs [ptype].obj, p.pos [0], p.pos [1], p.pos [2], rad);
334 <            fputc('\n', stdout);
332 >            else /* Dump as XYZ RGB point */
333 >               printf(POINTFMT, p.pos [0], p.pos [1], p.pos [2],
334 >                      col [0], col [1] ,col [2]);
335           }
336 <              
336 >        
337           if (ferror(pmapFile) || feof(pmapFile)) {
338              sprintf(errmsg, "error reading %s", argv [arg]);
339              error(USER, errmsg);
# Line 330 | Line 345 | int main (int argc, char** argv)
345        /* Reset defaults for next dump */
346        radScale = RADSCALE;
347        numSpheres = NSPHERES;
348 <      customCol [0] = customCol [1] = customCol [2] = 0;
349 <      fluxCol = 0;
348 >      col [0] = col [1] = col [2] = 0;
349 >      fluxCol = points = 0;
350     }
351    
352     return 0;

Diff Legend

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