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.28 by greg, Tue Nov 13 19:58:33 2018 UTC vs.
Revision 2.31 by greg, Sun Apr 5 15:47:02 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   int  inform = 'a';                      /* input format */
41   int  outform = 'a';                     /* output format */
42   char  *outvals = "v";                   /* output specification */
# Line 89 | Line 90 | main(int  argc, char  *argv[])
90          for (i = 0; addobjnotify[i] != NULL; i++)
91                  ;
92          addobjnotify[i] = tranotify;
92 –                                        /* set our defaults */
93 –        rand_samp = 1;
94 –        maxdepth = -10;
95 –        minweight = 2e-3;
93                                          /* option city */
94          for (i = 1; i < argc; i++) {
95                                                  /* expand arguments */
# Line 316 | Line 313 | main(int  argc, char  *argv[])
313   #endif
314          if (outform != 'a')
315                  SET_FILE_BINARY(stdout);
316 +        rval = setrtoutput();
317          readoct(octname = octnm, loadflags, &thescene, NULL);
318          nsceneobjs = nobjects;
319  
# Line 323 | Line 321 | main(int  argc, char  *argv[])
321                  printargs(i, argv, stdout);
322                  printf("SOFTWARE= %s\n", VersionID);
323                  fputnow(stdout);
324 +                if (rval > 0)           /* saved from setrtoutput() call */
325 +                        printf("NCOMP=%d\n", rval);
326 +                if ((outform == 'f') | (outform == 'd'))
327 +                        fputendian(stdout);
328                  fputformat(formstr(outform), stdout);
329                  putchar('\n');
330          }

Diff Legend

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