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

Comparing ray/src/rt/rcmain.c (file contents):
Revision 2.15 by schorsch, Thu Mar 10 18:25:46 2016 UTC vs.
Revision 2.23 by greg, Wed Oct 19 23:10:34 2022 UTC

# Line 43 | Line 43 | int    using_stdout = 0;               /* are we using stdout? */
43   int     imm_irrad = 0;                  /* compute immediate irradiance? */
44   int     lim_dist = 0;                   /* limit distance? */
45  
46 < const char      *modname[MAXMODLIST];   /* ordered modifier name list */
47 < int             nmods = 0;              /* number of modifiers */
46 > int     report_intvl = 0;               /* reporting interval (seconds) */
47  
48 + char    **modname = NULL;               /* ordered modifier name list */
49 + int     nmods = 0;                      /* number of modifiers */
50 + int     modasiz = 0;                    /* allocated modifier array size */
51 +
52   void    (*addobjnotify[8])() = {ambnotify, NULL};
53  
54 < char    RCCONTEXT[] = "RC";             /* our special evaluation context */
54 > char    RCCONTEXT[] = "RC.";            /* our special evaluation context */
55  
56 + #if defined(_WIN32) || defined(_WIN64)
57 + #define RCONTRIB_FEATURES       "Accumulation\nSummation\nRecovery\n" \
58 +                                "ValueContribution\nImmediateIrradiance\n" \
59 +                                "ProgressReporting\nDistanceLimiting\n"
60 + #else
61 + #define RCONTRIB_FEATURES       "Multiprocessing\n" \
62 +                                "Accumulation\nSummation\nRecovery\n" \
63 +                                "ValueContribution\nImmediateIrradiance\n" \
64 +                                "ProgressReporting\nDistanceLimiting\n"
65 + #endif
66  
67   static void
68   printdefaults(void)                     /* print default values to stdout */
# Line 180 | Line 193 | main(int argc, char *argv[])
193          progname = argv[0] = fixargv0(argv[0]);
194          gargv = argv;
195          gargc = argc;
196 +                                        /* feature check only? */
197 +        strcat(RFeatureList, RCONTRIB_FEATURES);
198 +        if (!strcmp(argv[1], "-features"))
199 +                return feature_status(argc-2, argv+2);
200 + #if defined(_WIN32) || defined(_WIN64)
201 +        _setmaxstdio(2048);             /* increase file limit to maximum */
202 + #endif
203                                          /* initialize calcomp routines early */
204          initfunc();
205 <        setcontext(RCCONTEXT);
205 >        calcontext(RCCONTEXT);
206                                          /* option city */
207          for (i = 1; i < argc; i++) {
208                                                  /* expand arguments */
# Line 292 | Line 312 | main(int argc, char *argv[])
312                          check(2,"s");
313                          addmodfile(argv[++i], curout, prms, binval, bincnt);
314                          break;
315 +                case 't':                       /* reporting interval */
316 +                        check(2,"i");
317 +                        report_intvl = atoi(argv[++i]);
318 +                        break;
319                  default:
320                          goto badopt;
321                  }
# Line 363 | Line 387 | main(int argc, char *argv[])
387  
388   badopt:
389          fprintf(stderr,
390 < "Usage: %s [-n nprocs][-V][-r][-e expr][-f source][-o ospec][-p p1=V1,p2=V2][-b binv][-bn N] {-m mod | -M file} [rtrace options] octree\n",
390 > "Usage: %s [-n nprocs][-V][-c count][-r][-e expr][-f source][-o ospec][-p p1=V1,p2=V2][-b binv][-bn N] {-m mod | -M file} [rtrace options] octree\n",
391                          progname);
392          sprintf(errmsg, "command line error at '%s'", argv[i]);
393          error(USER, errmsg);

Diff Legend

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