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

Comparing ray/src/rt/rtmain.c (file contents):
Revision 2.30 by greg, Wed Aug 14 20:07:20 2019 UTC vs.
Revision 2.33 by greg, Mon Apr 6 21:09:07 2020 UTC

# Line 35 | Line 35 | char  *errfile = NULL;                 /* error output file */
35  
36   int  nproc = 1;                         /* number of processes */
37  
38 < extern char  *formstr();                /* string from format */
38 > extern char  *formstr(int f);           /* string from format */
39 > extern int  setrtoutput(void);          /* set output values */
40 >
41   int  inform = 'a';                      /* input format */
42   int  outform = 'a';                     /* output format */
43   char  *outvals = "v";                   /* output specification */
# Line 43 | Line 45 | char  *outvals = "v";                  /* output specification */
45   int  hresolu = 0;                       /* horizontal (scan) size */
46   int  vresolu = 0;                       /* vertical resolution */
47  
48 + extern int  castonly;                   /* only doing ray-casting? */
49 +
50   int  imm_irrad = 0;                     /* compute immediate irradiance? */
51   int  lim_dist = 0;                      /* limit distance? */
52  
# Line 312 | Line 316 | main(int  argc, char  *argv[])
316   #endif
317          if (outform != 'a')
318                  SET_FILE_BINARY(stdout);
319 +        rval = setrtoutput();
320          readoct(octname = octnm, loadflags, &thescene, NULL);
321          nsceneobjs = nobjects;
322  
# Line 319 | Line 324 | main(int  argc, char  *argv[])
324                  printargs(i, argv, stdout);
325                  printf("SOFTWARE= %s\n", VersionID);
326                  fputnow(stdout);
327 +                if (rval > 0)           /* saved from setrtoutput() call */
328 +                        printf("NCOMP=%d\n", rval);
329                  if ((outform == 'f') | (outform == 'd'))
330                          fputendian(stdout);
331                  fputformat(formstr(outform), stdout);
332                  putchar('\n');
333          }
327 –        
328 –        ray_init_pmap();     /* PMAP: set up & load photon maps */
329 –        
330 –        marksources();                  /* find and mark sources */
334  
335 <        setambient();                   /* initialize ambient calculation */
336 <        
335 >        if (!castonly) {        /* any actual ray traversal to do? */
336 >
337 >                ray_init_pmap();        /* PMAP: set up & load photon maps */
338 >                
339 >                marksources();          /* find and mark sources */
340 >
341 >                setambient();           /* initialize ambient calculation */
342 >        } else
343 >                distantsources();       /* else mark only distant sources */
344   #ifdef  PERSIST
345          if (persist) {
346                  fflush(stdout);

Diff Legend

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