--- ray/src/rt/rcmain.c 2016/03/10 18:25:46 2.15 +++ ray/src/rt/rcmain.c 2022/10/19 23:10:34 2.23 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rcmain.c,v 2.15 2016/03/10 18:25:46 schorsch Exp $"; +static const char RCSid[] = "$Id: rcmain.c,v 2.23 2022/10/19 23:10:34 greg Exp $"; #endif /* * rcmain.c - main for rtcontrib ray contribution tracer @@ -43,13 +43,26 @@ int using_stdout = 0; /* are we using stdout? */ int imm_irrad = 0; /* compute immediate irradiance? */ int lim_dist = 0; /* limit distance? */ -const char *modname[MAXMODLIST]; /* ordered modifier name list */ -int nmods = 0; /* number of modifiers */ +int report_intvl = 0; /* reporting interval (seconds) */ +char **modname = NULL; /* ordered modifier name list */ +int nmods = 0; /* number of modifiers */ +int modasiz = 0; /* allocated modifier array size */ + void (*addobjnotify[8])() = {ambnotify, NULL}; -char RCCONTEXT[] = "RC"; /* our special evaluation context */ +char RCCONTEXT[] = "RC."; /* our special evaluation context */ +#if defined(_WIN32) || defined(_WIN64) +#define RCONTRIB_FEATURES "Accumulation\nSummation\nRecovery\n" \ + "ValueContribution\nImmediateIrradiance\n" \ + "ProgressReporting\nDistanceLimiting\n" +#else +#define RCONTRIB_FEATURES "Multiprocessing\n" \ + "Accumulation\nSummation\nRecovery\n" \ + "ValueContribution\nImmediateIrradiance\n" \ + "ProgressReporting\nDistanceLimiting\n" +#endif static void printdefaults(void) /* print default values to stdout */ @@ -180,9 +193,16 @@ main(int argc, char *argv[]) progname = argv[0] = fixargv0(argv[0]); gargv = argv; gargc = argc; + /* feature check only? */ + strcat(RFeatureList, RCONTRIB_FEATURES); + if (!strcmp(argv[1], "-features")) + return feature_status(argc-2, argv+2); +#if defined(_WIN32) || defined(_WIN64) + _setmaxstdio(2048); /* increase file limit to maximum */ +#endif /* initialize calcomp routines early */ initfunc(); - setcontext(RCCONTEXT); + calcontext(RCCONTEXT); /* option city */ for (i = 1; i < argc; i++) { /* expand arguments */ @@ -292,6 +312,10 @@ main(int argc, char *argv[]) check(2,"s"); addmodfile(argv[++i], curout, prms, binval, bincnt); break; + case 't': /* reporting interval */ + check(2,"i"); + report_intvl = atoi(argv[++i]); + break; default: goto badopt; } @@ -363,7 +387,7 @@ main(int argc, char *argv[]) badopt: fprintf(stderr, -"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", +"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", progname); sprintf(errmsg, "command line error at '%s'", argv[i]); error(USER, errmsg);