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.12 by rschregle, Wed Nov 21 19:30:59 2018 UTC vs.
Revision 2.18 by rschregle, Thu Feb 18 17:08:50 2021 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,
12 +       supported by the German Research Foundation
13 +       (DFG LU-204/10-2, "Fassadenintegrierte Regelsysteme FARESYS")
14     (c) Lucerne University of Applied Sciences and Arts,
15 <       supported by the Swiss National Science Foundation (SNSF, #147053)
15 >       supported by the Swiss National Science Foundation
16 >       (SNSF #147053, "Daylight Redirecting Components")
17 >   (c) Tokyo University of Science,
18 >       supported by the JSPS Grants-in-Aid for Scientific Research
19 >       (KAKENHI JP19KK0115, "Three-Dimensional Light Flow")  
20     ======================================================================
21    
22     $Id$
# Line 17 | Line 24 | static const char RCSid[] = "$Id$";
24  
25  
26  
27 + #include "pmap.h"
28   #include "pmapio.h"
21 #include "pmapparm.h"
22 #include "pmaptype.h"
29   #include "rtio.h"
30   #include "resolu.h"
31   #include "random.h"
32   #include "math.h"
33  
28 #define PMAPDUMP_REC "$Revision$"  
34  
30
35   /* Defaults */
36   /*    Sphere radius as fraction of avg. intersphere dist */
37   /*    Relative scale for sphere radius (fudge factor) */
# Line 36 | Line 40 | static const char RCSid[] = "$Id$";
40   #define RADSCALE 1.0
41   #define NSPHERES 10000
42  
43 + /* Format for optional ASCII output as XYZ RGB points */
44 + #define POINTFMT "%g\t%g\t%g\t%g\t%g\t%g\n"
45  
46   /* RADIANCE material and object defs for each photon type */
47   typedef struct {
48     char *mat, *obj;
49   } RadianceDef;
50  
45
51   const RadianceDef radDefs [] = {
52 <   {  "void plastic mat.global\n0\n0\n5 %f %f %f 0 0\n",
52 >   {  "void glow mat.global\n0\n0\n4 %g %g %g 0\n",
53        "mat.global sphere obj.global\n0\n0\n4 %g %g %g %g\n"
54     },
55 <   {  "void plastic mat.pglobal\n0\n0\n5 %f %f %f 0 0\n",
56 <      "mat.pglobal sphere obj.global\n0\n0\n4 %g %g %g %g\n"
55 >   {  "void glow mat.pglobal\n0\n0\n4 %g %g %g 0\n",
56 >      "mat.pglobal sphere obj.pglobal\n0\n0\n4 %g %g %g %g\n"
57     },
58 <   {  "void plastic mat.caustic\n0\n0\n5 %f %f %f 0 0\n",
58 >   {  "void glow mat.caustic\n0\n0\n4 %g %g %g 0\n",
59        "mat.caustic sphere obj.caustic\n0\n0\n4 %g %g %g %g\n"
60     },
61 <   {  "void plastic mat.volume\n0\n0\n5 %f %f %f 0 0\n",
61 >   {  "void glow mat.volume\n0\n0\n4 %g %g %g 0\n",
62        "mat.volume sphere obj.volume\n0\n0\n4 %g %g %g %g\n"
63     },
64 <   {  "void plastic mat.direct\n0\n0\n5 %f %f %f 0 0\n",
64 >   {  "void glow mat.direct\n0\n0\n4 %g %g %g 0\n",
65        "mat.direct sphere obj.direct\n0\n0\n4 %g %g %g %g\n"
66     },
67 <   {  "void plastic mat.contrib\n0\n0\n5 %f %f %f 0 0\n",
67 >   {  "void glow mat.contrib\n0\n0\n4 %g %g %g 0\n",
68        "mat.contrib sphere obj.contrib\n0\n0\n4 %g %g %g %g\n"
69     }
70   };
71  
72 +
73   /* Default colour codes are as follows:   global         = blue
74                                            precomp global = cyan
75                                            caustic        = red
# Line 71 | Line 77 | const RadianceDef radDefs [] = {
77                                            direct         = magenta
78                                            contrib        = yellow */
79   const COLOR colDefs [] = {
80 <   {0, 0, 1}, {0, 1, 1}, {1, 0, 0}, {0, 1, 0}, {1, 0, 1}, {1, 1, 0}
80 >   {0.25, 0.25, 2}, {0.1, 1, 1}, {1, 0.1, 0.1},
81 >   {0.1, 1, 0.1}, {1, 0.1, 1}, {1, 1, 0.1}
82   };
83  
84  
85 + static int setBool(char *str, unsigned pos, unsigned *var)
86 + {
87 +   switch ((str) [pos]) {
88 +      case '\0':
89 +         *var = !*var;
90 +         break;
91 +      case 'y': case 'Y': case 't': case 'T': case '+': case '1':
92 +         *var = 1;
93 +         break;
94 +      case 'n': case 'N': case 'f': case 'F': case '-': case '0':
95 +         *var = 0;
96 +         break;
97 +      default:
98 +         return 0;
99 +   }
100 +  
101 +   return 1;
102 + }
103 +
104 +
105   int main (int argc, char** argv)
106   {
107     char           format [MAXFMTLEN];
108     RREAL          rad, radScale = RADSCALE, extent, dumpRatio;
109 <   unsigned       arg, j, ptype, dim;
109 >   unsigned       arg, j, ptype, dim, fluxCol = 0, points = 0;
110     long           numSpheres = NSPHERES;
111 <   COLOR          customCol = {0, 0, 0};
111 >   COLOR          col = {0, 0, 0};
112     FILE           *pmapFile;
113     PhotonMap      pm;
114     PhotonPrimary  pri;
# Line 89 | Line 116 | int main (int argc, char** argv)
116   #ifdef PMAP_OOC
117     char           leafFname [1024];
118   #endif
119 <  
119 >
120     if (argc < 2) {
121 <      puts("Dump photon maps as RADIANCE scene description\n");
121 >      puts("Dump photon maps as RADIANCE scene description "
122 >           "or ASCII point list\n");
123        printf("Usage: %s "
124 <             "[-r radscale1] [-n nspheres1] [-c rcol1 gcol1 bcol1] pmap1 "
125 <             "[-r radscale2] [-n nspheres2] [-c rcol2 gcol2 bcol2] pmap2 "
124 >             "[-a] [-r radscale1] [-n num1] "
125 >             "[-f | -c rcol1 gcol1 bcol1] pmap1 "
126 >             "[-a] [-r radscale2] [-n num2] "
127 >             "[-f | -c rcol2 gcol2 bcol2] pmap2 "
128               "...\n", argv [0]);
129        return 1;
130     }
# Line 103 | Line 133 | int main (int argc, char** argv)
133        /* Parse options */
134        if (argv [arg][0] == '-') {
135           switch (argv [arg][1]) {
136 +            case 'a':
137 +               if (!setBool(argv [arg], 2, &points))
138 +                  error(USER, "invalid option syntax at -a");
139 +               break;
140              case 'r':
141                 if ((radScale = atof(argv [++arg])) <= 0)
142                    error(USER, "invalid radius scale");
# Line 110 | Line 144 | int main (int argc, char** argv)
144                
145              case 'n':
146                 if ((numSpheres = parseMultiplier(argv [++arg])) <= 0)
147 <                  error(USER, "invalid number of spheres");
147 >                  error(USER, "invalid number of points/spheres");
148                 break;
149                
150              case 'c':
151 +               if (fluxCol)
152 +                  error(USER, "-f and -c are mutually exclusive");
153 +              
154 +               if (badarg(argc - arg - 1, &argv [arg + 1], "fff"))
155 +                  error(USER, "invalid RGB colour");
156 +                                
157                 for (j = 0; j < 3; j++)
158 <                  if ((customCol [j] = atof(argv [++arg])) <= 0)
119 <                     error(USER, "invalid RGB colour");
158 >                  col [j] = atof(argv [++arg]);
159                 break;
160                
161 +            case 'f':
162 +               if (intens(col) > 0)
163 +                  error(USER, "-f and -c are mutually exclusive");
164 +                  
165 +               if (!setBool(argv [arg], 2, &fluxCol))
166 +                  error(USER, "invalid option syntax at -f");
167 +               break;
168 +              
169              default:
170                 sprintf(errmsg, "unknown option %s", argv [arg]);
171                 error(USER, errmsg);
# Line 127 | Line 174 | int main (int argc, char** argv)
174          
175           continue;
176        }
177 <      
178 <      /* Dump photon map */
177 >
178 >      /* Open next photon map file */
179        if (!(pmapFile = fopen(argv [arg], "rb"))) {
180           sprintf(errmsg, "can't open %s", argv [arg]);
181           error(SYSTEM, errmsg);
182        }
183 <        
183 >
184        /* Get format string */
185        strcpy(format, PMAP_FORMAT_GLOB);
186        if (checkheader(pmapFile, format, NULL) != 1) {
# Line 141 | Line 188 | int main (int argc, char** argv)
188                   argv [arg], format);
189           error(USER, errmsg);
190        }
191 <      
191 >
192        /* Identify photon map type from format string */
193        for (ptype = 0;
194             ptype < NUM_PMAP_TYPES && strcmp(pmapFormat [ptype], format);
195             ptype++);
196 <      
196 >
197        if (!validPmapType(ptype)) {
198           sprintf(errmsg, "file %s contains an unknown photon map type",
199                  argv [arg]);
# Line 156 | Line 203 | int main (int argc, char** argv)
203        /* Get file format version and check for compatibility */
204        if (strcmp(getstr(format, pmapFile), PMAP_FILEVER))      
205           error(USER, "incompatible photon map file format");
206 +
207 +      if (!points) {
208 +         /* Dump command line as comment */
209 +         fputs("# ", stdout);
210 +         printargs(argc, argv, stdout);
211 +         fputc('\n', stdout);
212 +      }
213          
214 <      /* Dump command line as comment */
215 <      fputs("# ", stdout);
216 <      printargs(argc, argv, stdout);
217 <      fputc('\n', stdout);
218 <      
219 <      /* Dump material def */
220 <      if (intens(customCol) > 0)
221 <         printf(radDefs [ptype].mat,
222 <                customCol [0], customCol [1], customCol [2]);
223 <      else
224 <         printf(radDefs [ptype].mat,
225 <                colDefs [ptype][0], colDefs [ptype][1], colDefs [ptype][2]);
226 <      fputc('\n', stdout);
227 <      
228 <      /* Get number of photons */
229 <      pm.numPhotons = getint(sizeof(pm.numPhotons), pmapFile);
230 <      
214 >      /* Set point/sphere colour if independent of photon flux,
215 >         output RADIANCE material def if required */
216 >      if (!fluxCol) {
217 >         if (intens(col) <= 0)
218 >            copycolor(col, colDefs [ptype]);
219 >         if (!points) {
220 >            printf(radDefs [ptype].mat, col [0], col [1], col [2]);
221 >            fputc('\n', stdout);
222 >         }
223 >      }
224 >
225 >      /* Get number of photons as fixed size, which possibly results in
226 >       * padding of MSB with 0 on some platforms.  Unlike sizeof() however,
227 >       * this ensures portability since this value may span 32 or 64 bits
228 >       * depending on platform.  */
229 >      pm.numPhotons = getint(PMAP_LONGSIZE, pmapFile);      
230 >
231        /* Skip avg photon flux */
232        for (j = 0; j < 3; j++)
233           getflt(pmapFile);
234 <      
234 >
235        /* Get distribution extent (min & max photon positions) */
236        for (j = 0; j < 3; j++) {
237           pm.minPos [j] = getflt(pmapFile);
# Line 204 | Line 258 | int main (int argc, char** argv)
258        rad = radScale * RADCOEFF * pow(extent / numSpheres, 1./dim);
259        
260        /* Photon dump probability to satisfy target sphere count */
261 <      dumpRatio = numSpheres < pm.numPhotons
208 <                  ? (float)numSpheres / pm.numPhotons : 1;
261 >      dumpRatio = min(1, (float)numSpheres / pm.numPhotons);
262        
263        /* Skip primary rays */
264        pm.numPrimary = getint(sizeof(pm.numPrimary), pmapFile);
# Line 215 | Line 268 | int main (int argc, char** argv)
268   #ifdef PMAP_PRIMARYDIR
269           /* Skip primary incident dir */
270           getint(sizeof(pri.dir), pmapFile);        
271 < #endif        
272 < #ifdef PMAP_PRIMARYPOS        
271 > #endif
272 > #ifdef PMAP_PRIMARYPOS
273           /* Skip primary hitpoint */
274           for (j = 0; j < 3; j++)
275              getflt(pmapFile);
# Line 226 | Line 279 | int main (int argc, char** argv)
279   #ifdef PMAP_OOC
280        /* Open leaf file with filename derived from pmap, replace pmapFile
281         * (which is currently the node file) */
282 <      strncpy(leafFname, argv [arg], 1024);
283 <      strncat(leafFname, PMAP_OOC_LEAFSUFFIX, 1024);
282 >      strncpy(leafFname, argv [arg], sizeof(leafFname) - 1);
283 >      strncat(leafFname, PMAP_OOC_LEAFSUFFIX, sizeof(leafFname) - 1);
284        fclose(pmapFile);
285        if (!(pmapFile = fopen(leafFname, "rb"))) {
286           sprintf(errmsg, "cannot open leaf file %s", leafFname);
# Line 235 | Line 288 | int main (int argc, char** argv)
288        }
289   #endif
290              
291 <      /* Load photons */      
291 >      /* Read photons */
292        while (pm.numPhotons-- > 0) {
293   #ifdef PMAP_OOC
294 <         /* Get entire photon record
294 >         /* Get entire photon record from ooC octree leaf file
295              !!! OOC PMAP FILES CURRENTLY DON'T USE PORTABLE I/O !!! */
296           if (!fread(&p, sizeof(p), 1, pmapFile)) {
297              sprintf(errmsg, "error reading OOC leaf file %s", leafFname);
298              error(SYSTEM, errmsg);
299           }
300 < #else        
301 <         /* Get photon position */            
300 > #else /* kd-tree */
301 >         /* Get photon position */
302           for (j = 0; j < 3; j++)
303              p.pos [j] = getflt(pmapFile);
304 < #endif
305 <         /* Dump photon probabilistically acc. to target sphere count */
253 <         if (frandom() <= dumpRatio) {
254 <            printf(radDefs [ptype].obj, p.pos [0], p.pos [1], p.pos [2], rad);
255 <            fputc('\n', stdout);
256 <         }
257 <        
258 < #ifndef PMAP_OOC
259 <         /* Skip photon normal and flux */
304 >
305 >         /* Get photon normal (currently not used) */
306           for (j = 0; j < 3; j++)
307 <            getint(sizeof(p.norm [j]), pmapFile);
308 <            
309 < #ifdef PMAP_FLOAT_FLUX
307 >            p.norm [j] = getint(1, pmapFile);
308 >
309 >         /* Get photon flux */
310 >   #ifdef PMAP_FLOAT_FLUX
311           for (j = 0; j < 3; j++)
312 <            getflt(pmapFile);
313 < #else      
312 >            p.flux [j] = getflt(pmapFile);
313 >   #else
314           for (j = 0; j < 4; j++)
315 <            getint(1, pmapFile);
316 < #endif
315 >            p.flux [j] = getint(1, pmapFile);
316 >   #endif
317 >  
318 >        
319  
320           /* Skip primary ray index */
321           getint(sizeof(p.primary), pmapFile);
# Line 274 | Line 323 | int main (int argc, char** argv)
323           /* Skip flags */
324           getint(sizeof(p.flags), pmapFile);
325   #endif
326 +
327 +         /* Dump photon probabilistically acc. to target sphere count */
328 +         if (frandom() <= dumpRatio) {
329 +            if (fluxCol) {
330 +               /* Get photon flux */
331 +               getPhotonFlux(&p, col);
332 +               /* Scale by dumpRatio for energy conservation */
333 +               scalecolor(col, 1.0 / dumpRatio);
334 +            }
335 +            
336 +            if (!points) {
337 +               if (fluxCol) {
338 +                  /* Dump material def if variable (depends on flux) */
339 +                  printf(radDefs [ptype].mat, col [0], col [1], col [2]);
340 +                  fputc('\n', stdout);
341 +               }
342 +               printf(radDefs [ptype].obj, p.pos [0], p.pos [1], p.pos [2],
343 +                      rad);
344 +               fputc('\n', stdout);
345 +            }
346 +            else /* Dump as XYZ RGB point */
347 +               printf(POINTFMT, p.pos [0], p.pos [1], p.pos [2],
348 +                      col [0], col [1] ,col [2]);
349 +         }
350          
351           if (ferror(pmapFile) || feof(pmapFile)) {
352              sprintf(errmsg, "error reading %s", argv [arg]);
# Line 286 | Line 359 | int main (int argc, char** argv)
359        /* Reset defaults for next dump */
360        radScale = RADSCALE;
361        numSpheres = NSPHERES;
362 <      customCol [0] = customCol [1] = customCol [2] = 0;
362 >      col [0] = col [1] = col [2] = 0;
363 >      fluxCol = points = 0;
364     }
365    
366     return 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines