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.4 by greg, Tue Aug 18 18:45:55 2015 UTC vs.
Revision 2.8 by rschregle, Mon Aug 14 21:12:10 2017 UTC

# Line 1 | Line 1
1   #ifndef lint
2   static const char RCSid[] = "$Id$";
3   #endif
4 +
5   /*
6 <   ==================================================================
6 >   ======================================================================
7     Dump photon maps as RADIANCE scene description to stdout
8  
9     Roland Schregle (roland.schregle@{hslu.ch, gmail.com})
10     (c) Fraunhofer Institute for Solar Energy Systems,
11     (c) Lucerne University of Applied Sciences and Arts,
12 <   supported by the Swiss National Science Foundation (SNSF, #147053)
13 <   ==================================================================
12 >       supported by the Swiss National Science Foundation (SNSF, #147053)
13 >   ======================================================================
14    
15     $Id$
16   */
# Line 24 | Line 25 | static const char RCSid[] = "$Id$";
25   #include "random.h"
26   #include "math.h"
27  
28 + #define PMAPDUMP_REC "$Revision$"  
29  
30 +
31   /* Defaults */
32   /*    Sphere radius as fraction of avg. intersphere dist */
33   /*    Relative scale for sphere radius (fudge factor) */
# Line 40 | Line 43 | typedef struct {
43   } RadianceDef;
44  
45    
43 static char header [] = "$Revision$";
46  
45
47   /* Colour code is as follows:    global         = blue
48                                   precomp global = cyan
49                                   caustic        = red
# Line 74 | Line 75 | const RadianceDef radDefs [] = {
75  
76   int main (int argc, char** argv)
77   {
78 <   char format [128];
79 <   RREAL rad, radScale = RADSCALE, vol, dumpRatio;
80 <   FVECT minPos, maxPos;
81 <   unsigned arg, j, ptype;
82 <   long numPhotons, numSpheres = NSPHERES;
83 <   FILE *pmapFile;
84 <   Photon p;
78 >   char           format [128];
79 >   RREAL          rad, radScale = RADSCALE, vol, dumpRatio;
80 >   unsigned       arg, j, ptype;
81 >   long           numSpheres = NSPHERES;
82 >   FILE           *pmapFile;
83 >   PhotonMap      pm;
84 >   PhotonPrimary  pri;
85 >   Photon         p;
86 > #ifdef PMAP_OOC
87 >   char           leafFname [1024];
88 > #endif
89    
90     if (argc < 2) {
91        puts("Dump photon maps as RADIANCE scene description\n");
# Line 128 | Line 133 | int main (int argc, char** argv)
133        
134        /* Identify photon map type from format string */
135        for (ptype = 0;
136 <           strcmp(pmapFormat [ptype], format) && ptype < NUM_PMAP_TYPES;
136 >           ptype < NUM_PMAP_TYPES && strcmp(pmapFormat [ptype], format);
137             ptype++);
138        
139        if (!validPmapType(ptype)) {
# Line 138 | Line 143 | int main (int argc, char** argv)
143        }
144  
145        /* Get file format version and check for compatibility */
146 <      if (getint(sizeof(PMAP_FILEVER), pmapFile) != PMAP_FILEVER)
146 >      if (strcmp(getstr(format, pmapFile), PMAP_FILEVER))      
147           error(USER, "incompatible photon map file format");
148          
149        /* Dump command line as comment */
# Line 150 | Line 155 | int main (int argc, char** argv)
155        fputs(radDefs [ptype].mat, stdout);
156        fputc('\n', stdout);
157        
158 <      /* Get number of photons (is this sizeof() hack portable?) */
159 <      numPhotons = getint(sizeof(((PhotonMap*)NULL) -> heapSize), pmapFile);
158 >      /* Get number of photons */
159 >      pm.numPhotons = getint(sizeof(pm.numPhotons), pmapFile);
160        
161        /* Skip avg photon flux */
162        for (j = 0; j < 3; j++)
# Line 159 | Line 164 | int main (int argc, char** argv)
164        
165        /* Get distribution extent (min & max photon positions) */
166        for (j = 0; j < 3; j++) {
167 <         minPos [j] = getflt(pmapFile);
168 <         maxPos [j] = getflt(pmapFile);
167 >         pm.minPos [j] = getflt(pmapFile);
168 >         pm.maxPos [j] = getflt(pmapFile);
169        }
170        
171        /* Skip centre of gravity, and avg photon dist to it */
# Line 169 | Line 174 | int main (int argc, char** argv)
174        
175        /* Sphere radius based on avg intersphere dist
176           (= sphere distrib density ^-1/3) */
177 <      vol = (maxPos [0] - minPos [0]) * (maxPos [1] - minPos [1]) *
178 <            (maxPos [2] - minPos [2]);
177 >      vol = (pm.maxPos [0] - pm.minPos [0]) * (pm.maxPos [1] - pm.minPos [1]) *
178 >            (pm.maxPos [2] - pm.minPos [2]);
179        rad = radScale * RADCOEFF * pow(vol / numSpheres, 1./3.);
180        
181        /* Photon dump probability to satisfy target sphere count */
182 <      dumpRatio = numSpheres < numPhotons ? (float)numSpheres / numPhotons
183 <                                          : 1;
182 >      dumpRatio = numSpheres < pm.numPhotons
183 >                  ? (float)numSpheres / pm.numPhotons : 1;
184        
185 <      while (numPhotons-- > 0) {
185 >      /* Skip primary rays */
186 >      pm.numPrimary = getint(sizeof(pm.numPrimary), pmapFile);
187 >      while (pm.numPrimary-- > 0) {
188 >         /* Skip source index & incident dir */
189 >         getint(sizeof(pri.srcIdx) + sizeof(pri.dir), pmapFile);
190 > #ifdef PMAP_PRIMARYPOS        
191 >         /* Skip primary hitpoint */
192 >         for (j = 0; j < 3; j++)
193 >            getflt(pmapFile);
194 > #endif
195 >      }
196 >
197 > #ifdef PMAP_OOC
198 >      /* Open leaf file with filename derived from pmap, replace pmapFile
199 >       * (which is currently the node file) */
200 >      strncpy(leafFname, argv [arg], 1024);
201 >      strncat(leafFname, PMAP_OOC_LEAFSUFFIX, 1024);
202 >      fclose(pmapFile);
203 >      if (!(pmapFile = fopen(leafFname, "rb"))) {
204 >         sprintf(errmsg, "cannot open leaf file %s", leafFname);
205 >         error(SYSTEM, errmsg);
206 >      }
207 > #endif
208 >            
209 >      /* Load photons */      
210 >      while (pm.numPhotons-- > 0) {
211 > #ifdef PMAP_OOC
212 >         /* Get entire photon record
213 >            !!! OOC PMAP FILES CURRENTLY DON'T USE PORTABLE I/O !!! */
214 >         if (!fread(&p, sizeof(p), 1, pmapFile)) {
215 >            sprintf(errmsg, "error reading OOC leaf file %s", leafFname);
216 >            error(SYSTEM, errmsg);
217 >         }
218 > #else        
219           /* Get photon position */            
220           for (j = 0; j < 3; j++)
221              p.pos [j] = getflt(pmapFile);
222 <
222 > #endif
223           /* Dump photon probabilistically acc. to target sphere count */
224           if (frandom() <= dumpRatio) {
225              printf(radDefs [ptype].obj, p.pos [0], p.pos [1], p.pos [2], rad);
226              fputc('\n', stdout);
227           }
228          
229 + #ifndef PMAP_OOC
230           /* Skip photon normal and flux */
231           for (j = 0; j < 3; j++)
232              getint(sizeof(p.norm [j]), pmapFile);
233              
234 <         #ifdef PMAP_FLOAT_FLUX
235 <            for (j = 0; j < 3; j++)
236 <               getflt(pmapFile);
237 <         #else      
238 <            for (j = 0; j < 4; j++)
239 <               getint(1, pmapFile);
240 <         #endif
234 > #ifdef PMAP_FLOAT_FLUX
235 >         for (j = 0; j < 3; j++)
236 >            getflt(pmapFile);
237 > #else      
238 >         for (j = 0; j < 4; j++)
239 >            getint(1, pmapFile);
240 > #endif
241  
242           /* Skip primary ray index */
243           getint(sizeof(p.primary), pmapFile);
244  
245           /* Skip flags */
246           getint(sizeof(p.flags), pmapFile);
247 + #endif
248          
249 <         if (feof(pmapFile)) {
249 >         if (ferror(pmapFile) || feof(pmapFile)) {
250              sprintf(errmsg, "error reading %s", argv [arg]);
251              error(USER, errmsg);
252           }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines