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.7 by rschregle, Tue May 17 17:39:47 2016 UTC vs.
Revision 2.16 by rschregle, Tue Jul 21 16:10:42 2020 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 (DFG)
13 +       as part of the FARESYS project
14     (c) Lucerne University of Applied Sciences and Arts,
15         supported by the Swiss National Science Foundation (SNSF, #147053)
16 +   (c) Tokyo University of Science,
17 +       supported by the Japan Society for the Promotion of Science (JSPS)
18 +       under the Grants-in-Aid for Scientific Research Program (KAKENHI),
19 +       grant number JP19KK0115.
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  
46
47 /* Colour code is as follows:    global         = blue
48                                 precomp global = cyan
49                                 caustic        = red
50                                 volume         = green
51                                 direct         = magenta
52                                 contrib        = yellow */  
51   const RadianceDef radDefs [] = {
52 <   {  "void plastic mat.global\n0\n0\n5 0 0 1 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 0 1 1 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 1 0 0 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 0 1 0 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 1 0 1 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 1 1 0 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
76 +                                          volume         = green
77 +                                          direct         = magenta
78 +                                          contrib        = yellow */
79 + const COLOR colDefs [] = {
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 [128];
108 <   RREAL          rad, radScale = RADSCALE, vol, dumpRatio;
109 <   unsigned       arg, j, ptype;
107 >   char           format [MAXFMTLEN];
108 >   RREAL          rad, radScale = RADSCALE, extent, dumpRatio;
109 >   unsigned       arg, j, ptype, dim, fluxCol = 0, points = 0;
110     long           numSpheres = NSPHERES;
111 +   COLOR          col = {0, 0, 0};
112     FILE           *pmapFile;
113     PhotonMap      pm;
114     PhotonPrimary  pri;
# Line 86 | 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");
122 <      printf("Usage: %s [-r radscale1] [-n nspheres1] pmap1 "
123 <             "[-r radscale2] [-n nspheres2] pmap2 ...\n", argv [0]);
121 >      puts("Dump photon maps as RADIANCE scene description "
122 >           "or ASCII point list\n");
123 >      printf("Usage: %s "
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     }
131    
# Line 98 | 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 105 | 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 +                  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 116 | 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 130 | 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 145 | 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);
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        
154      /* Dump material def */  
155      fputs(radDefs [ptype].mat, stdout);
156      fputc('\n', stdout);
157      
225        /* Get number of photons */
226        pm.numPhotons = getint(sizeof(pm.numPhotons), pmapFile);
227 <      
227 >
228        /* Skip avg photon flux */
229        for (j = 0; j < 3; j++)
230           getflt(pmapFile);
231 <      
231 >
232        /* Get distribution extent (min & max photon positions) */
233        for (j = 0; j < 3; j++) {
234           pm.minPos [j] = getflt(pmapFile);
# Line 172 | Line 239 | int main (int argc, char** argv)
239        for (j = 0; j < 4; j++)
240           getflt(pmapFile);
241        
242 <      /* Sphere radius based on avg intersphere dist
243 <         (= sphere distrib density ^-1/3) */
244 <      vol = (pm.maxPos [0] - pm.minPos [0]) * (pm.maxPos [1] - pm.minPos [1]) *
245 <            (pm.maxPos [2] - pm.minPos [2]);
246 <      rad = radScale * RADCOEFF * pow(vol / numSpheres, 1./3.);
242 >      /* Sphere radius based on avg intersphere dist depending on
243 >         whether the distribution occupies a 1D line (!), a 2D plane,
244 >         or 3D volume (= sphere distrib density ^-1/d, where d is the
245 >         dimensionality of the distribution) */
246 >      for (j = 0, extent = 1.0, dim = 0; j < 3; j++) {
247 >         rad = pm.maxPos [j] - pm.minPos [j];
248 >        
249 >         if (rad > FTINY) {
250 >            dim++;
251 >            extent *= rad;
252 >         }
253 >      }
254 >
255 >      rad = radScale * RADCOEFF * pow(extent / numSpheres, 1./dim);
256        
257        /* Photon dump probability to satisfy target sphere count */
258 <      dumpRatio = numSpheres < pm.numPhotons
183 <                  ? (float)numSpheres / pm.numPhotons : 1;
258 >      dumpRatio = min(1, (float)numSpheres / pm.numPhotons);
259        
260        /* Skip primary rays */
261        pm.numPrimary = getint(sizeof(pm.numPrimary), pmapFile);
262        while (pm.numPrimary-- > 0) {
263 <         getint(sizeof(pri.srcIdx) + sizeof(pri.dir), pmapFile);
263 >         /* Skip source index & incident dir */
264 >         getint(sizeof(pri.srcIdx), pmapFile);
265 > #ifdef PMAP_PRIMARYDIR
266 >         /* Skip primary incident dir */
267 >         getint(sizeof(pri.dir), pmapFile);        
268 > #endif
269 > #ifdef PMAP_PRIMARYPOS
270 >         /* Skip primary hitpoint */
271           for (j = 0; j < 3; j++)
272              getflt(pmapFile);
273 + #endif
274        }
275  
276   #ifdef PMAP_OOC
277        /* Open leaf file with filename derived from pmap, replace pmapFile
278         * (which is currently the node file) */
279 <      strncpy(leafFname, argv [arg], 1024);
280 <      strncat(leafFname, PMAP_OOC_LEAFSUFFIX, 1024);
279 >      strncpy(leafFname, argv [arg], sizeof(leafFname) - 1);
280 >      strncat(leafFname, PMAP_OOC_LEAFSUFFIX, sizeof(leafFname) - 1);
281        fclose(pmapFile);
282        if (!(pmapFile = fopen(leafFname, "rb"))) {
283           sprintf(errmsg, "cannot open leaf file %s", leafFname);
# Line 202 | Line 285 | int main (int argc, char** argv)
285        }
286   #endif
287              
288 <      /* Load photons */      
288 >      /* Read photons */
289        while (pm.numPhotons-- > 0) {
290   #ifdef PMAP_OOC
291 <         /* Get entire photon record
291 >         /* Get entire photon record from ooC octree leaf file
292              !!! OOC PMAP FILES CURRENTLY DON'T USE PORTABLE I/O !!! */
293           if (!fread(&p, sizeof(p), 1, pmapFile)) {
294              sprintf(errmsg, "error reading OOC leaf file %s", leafFname);
295              error(SYSTEM, errmsg);
296           }
297 < #else        
298 <         /* Get photon position */            
297 > #else /* kd-tree */
298 >         /* Get photon position */
299           for (j = 0; j < 3; j++)
300              p.pos [j] = getflt(pmapFile);
301 < #endif
302 <         /* Dump photon probabilistically acc. to target sphere count */
220 <         if (frandom() <= dumpRatio) {
221 <            printf(radDefs [ptype].obj, p.pos [0], p.pos [1], p.pos [2], rad);
222 <            fputc('\n', stdout);
223 <         }
224 <        
225 < #ifndef PMAP_OOC
226 <         /* Skip photon normal and flux */
301 >
302 >         /* Get photon normal (currently not used) */
303           for (j = 0; j < 3; j++)
304 <            getint(sizeof(p.norm [j]), pmapFile);
305 <            
306 < #ifdef PMAP_FLOAT_FLUX
304 >            p.norm [j] = getint(1, pmapFile);
305 >
306 >         /* Get photon flux */
307 >   #ifdef PMAP_FLOAT_FLUX
308           for (j = 0; j < 3; j++)
309 <            getflt(pmapFile);
310 < #else      
309 >            p.flux [j] = getflt(pmapFile);
310 >   #else
311           for (j = 0; j < 4; j++)
312 <            getint(1, pmapFile);
313 < #endif
312 >            p.flux [j] = getint(1, pmapFile);
313 >   #endif
314 >  
315 >        
316  
317           /* Skip primary ray index */
318           getint(sizeof(p.primary), pmapFile);
# Line 241 | Line 320 | int main (int argc, char** argv)
320           /* Skip flags */
321           getint(sizeof(p.flags), pmapFile);
322   #endif
323 +
324 +         /* Dump photon probabilistically acc. to target sphere count */
325 +         if (frandom() <= dumpRatio) {
326 +            if (fluxCol) {
327 +               /* Get photon flux */
328 +               getPhotonFlux(&p, col);
329 +               /* Scale by dumpRatio for energy conservation */
330 +               scalecolor(col, 1.0 / dumpRatio);
331 +            }
332 +            
333 +            if (!points) {
334 +               if (fluxCol) {
335 +                  /* Dump material def if variable (depends on flux) */
336 +                  printf(radDefs [ptype].mat, col [0], col [1], col [2]);
337 +                  fputc('\n', stdout);
338 +               }
339 +               printf(radDefs [ptype].obj, p.pos [0], p.pos [1], p.pos [2],
340 +                      rad);
341 +               fputc('\n', stdout);
342 +            }
343 +            else /* Dump as XYZ RGB point */
344 +               printf(POINTFMT, p.pos [0], p.pos [1], p.pos [2],
345 +                      col [0], col [1] ,col [2]);
346 +         }
347          
348           if (ferror(pmapFile) || feof(pmapFile)) {
349              sprintf(errmsg, "error reading %s", argv [arg]);
# Line 253 | Line 356 | int main (int argc, char** argv)
356        /* Reset defaults for next dump */
357        radScale = RADSCALE;
358        numSpheres = NSPHERES;
359 +      col [0] = col [1] = col [2] = 0;
360 +      fluxCol = points = 0;
361     }
362    
363     return 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines