--- ray/src/gen/mkillum.c 2003/11/16 10:29:38 2.19 +++ ray/src/gen/mkillum.c 2020/07/20 15:54:29 2.43 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: mkillum.c,v 2.19 2003/11/16 10:29:38 schorsch Exp $"; +static const char RCSid[] = "$Id: mkillum.c,v 2.43 2020/07/20 15:54:29 greg Exp $"; #endif /* * Make illum sources for optimizing rendering process @@ -8,9 +8,8 @@ static const char RCSid[] = "$Id: mkillum.c,v 2.19 200 #include #include -#include "platform.h" +#include "paths.h" /* win_popen() */ #include "mkillum.h" -#include "random.h" /* default parameters */ #define SAMPDENS 48 /* points per projected steradian */ @@ -23,16 +22,6 @@ static const char RCSid[] = "$Id: mkillum.c,v 2.19 200 #define S_COMPL 2 /* select all but element */ #define S_ALL 3 /* select all */ - /* rtrace command and defaults */ -char *rtargv[64] = { "rtrace", "-dj", ".25", "-dr", "3", "-dv-", - "-ab", "2", "-ad", "1024", "-as", "512", "-aa", ".1", }; -int rtargc = 14; - /* overriding rtrace options */ -char *myrtopts[] = { "-I-", "-i-", "-ld-", "-ov", "-h-", - "-fff", "-y", "0", NULL }; - -struct rtproc rt; /* our rtrace process */ - struct illum_args thisillum = { /* our illum and default values */ 0, DFLMAT, @@ -47,22 +36,19 @@ struct illum_args thisillum = { /* our illum and defa char matcheck[MAXSTR]; /* current material to include or exclude */ int matselect = S_ALL; /* selection criterion */ -FUN ofun[NUMOTYPE] = INIT_OTYPE; /* object types */ - int gargc; /* global argc */ char **gargv; /* global argv */ -#define progname gargv[0] int doneheader = 0; /* printed header yet? */ #define checkhead() if (!doneheader++) printhead(gargc,gargv) int warnings = 1; /* print warnings? */ -void init(void); -void filter(register FILE *infp, char *name); +void init(char *octnm, int np); +void filter(FILE *infp, char *name); void xoptions(char *s, char *nm); void printopts(void); -void printhead(register int ac, register char **av); +void printhead(int ac, char **av); void xobject(FILE *fp, char *nm); @@ -72,59 +58,59 @@ main( /* compute illum distributions using rtrace */ char *argv[] ) { - char *rtpath; + int nprocs = 1; FILE *fp; - register int i; + int rval; + int i; /* set global arguments */ gargv = argv; - /* set up rtrace command */ + progname = gargv[0]; + /* set up rendering defaults */ + dstrsrc = 0.5; + directrelay = 3; + ambounce = 2; + /* get options from command line */ for (i = 1; i < argc; i++) { - if (argv[i][0] == '<' && argv[i][1] == '\0') + while ((rval = expandarg(&argc, &argv, i)) > 0) + ; + if (rval < 0) { + sprintf(errmsg, "cannot expand '%s'", argv[i]); + error(SYSTEM, errmsg); + } + if (argv[i][0] != '-') break; - rtargv[rtargc++] = argv[i]; - if (argv[i][0] == '-' && argv[i][1] == 'w') - switch (argv[i][2]) { - case '\0': - warnings = !warnings; - break; - case '+': - case 'T': case 't': - case 'Y': case 'y': - case '1': - warnings = 1; - break; - case '-': - case 'F': case 'f': - case 'N': case 'n': - case '0': - warnings = 0; - break; - } - } - gargc = i; - rtargc--; - for (i = 0; myrtopts[i] != NULL; i++) - rtargv[rtargc++] = myrtopts[i]; - rtargv[rtargc++] = argv[gargc-1]; - rtargv[rtargc] = NULL; - /* just asking for defaults? */ - if (!strcmp(argv[gargc-1], "-defaults")) { - printopts(); fflush(stdout); - rtpath = getpath(rtargv[0], getenv("PATH"), X_OK); - if (rtpath == NULL) { - eputs(rtargv[0]); - eputs(": command not found\n"); - exit(1); + if (!strcmp(argv[i], "-w")) { + warnings = 0; + continue; } - execv(rtpath, rtargv); - perror(rtpath); - exit(1); + if (!strcmp(argv[i], "-n")) { + nprocs = atoi(argv[++i]); + if (nprocs <= 0) + error(USER, "illegal number of processes"); + continue; + } + if (!strcmp(argv[i], "-defaults")) { + printopts(); + print_rdefaults(); + quit(0); + } + rval = getrenderopt(argc-i, argv+i); + if (rval < 0) { + sprintf(errmsg, "bad render option at '%s'", argv[i]); + error(USER, errmsg); + } + i += rval; } - if (gargc < 2 || argv[gargc-1][0] == '-') + gargc = ++i; + /* add "mandatory" render options */ + do_irrad = 0; + if (gargc > argc || argv[gargc-1][0] == '-') error(USER, "missing octree argument"); /* else initialize and run our calculation */ - init(); - if (gargc+1 < argc) + init(argv[gargc-1], nprocs); + if (gargc < argc) { + if (gargc == argc-1 || argv[gargc][0] != '<' || argv[gargc][1]) + error(USER, "use '< file1 file2 ..' for multiple inputs"); for (i = gargc+1; i < argc; i++) { if ((fp = fopen(argv[i], "r")) == NULL) { sprintf(errmsg, @@ -134,66 +120,35 @@ main( /* compute illum distributions using rtrace */ filter(fp, argv[i]); fclose(fp); } - else + } else filter(stdin, "standard input"); - return 0; + quit(0); + return 0; /* pro forma return */ } void -quit(status) /* exit with status */ -int status; +init(char *octnm, int np) /* start rendering process(es) */ { - int rtstat; - - rtstat = close_process(&(rt.pd)); - if (status == 0) { - if (rtstat < 0) - error(WARNING, - "unknown return status from rtrace process"); - else - status = rtstat; - } - exit(status); -} - -void -init(void) /* start rtrace and set up buffers */ -{ - extern int o_face(), o_sphere(), o_ring(); - int maxbytes; - /* set up object functions */ - ofun[OBJ_FACE].funp = o_face; - ofun[OBJ_SPHERE].funp = o_sphere; - ofun[OBJ_RING].funp = o_ring; /* set up signal handling */ -#ifdef SIGPIPE /* not present on Windows */ + signal(SIGINT, quit); +#ifdef SIGHUP + signal(SIGHUP, quit); +#endif +#ifdef SIGTERM + signal(SIGTERM, quit); +#endif +#ifdef SIGPIPE signal(SIGPIPE, quit); #endif - /* start rtrace process */ - errno = 0; - maxbytes = open_process(&(rt.pd), rtargv); - if (maxbytes == 0) { - eputs(rtargv[0]); - eputs(": command not found\n"); - exit(1); - } - if (maxbytes < 0) - error(SYSTEM, "cannot start rtrace process"); - rt.bsiz = maxbytes/(6*sizeof(float)); - rt.buf = (float *)malloc(6*sizeof(float)*rt.bsiz--); - rt.dest = (float **)malloc(sizeof(float *)*rt.bsiz); - if (rt.buf == NULL || rt.dest == NULL) - error(SYSTEM, "out of memory in init"); - rt.nrays = 0; - /* set up urand */ - initurand(16384); + /* start rendering process(es) */ + ray_pinit(octnm, np); } void eputs( /* put string to stderr */ - register char *s + char *s ) { static int midline = 0; @@ -218,14 +173,26 @@ char *s; void +quit(ec) /* make sure exit is called */ +int ec; +{ + if (ray_pnprocs > 0) /* close children if any */ + ray_pclose(0); + else if (ray_pnprocs < 0) + _exit(ec); /* avoid flush() in child */ + exit(ec); +} + + +void filter( /* process stream */ - register FILE *infp, + FILE *infp, char *name ) { char buf[512]; FILE *pfp; - register int c; + int c; while ((c = getc(infp)) != EOF) { if (isspace(c)) @@ -257,10 +224,10 @@ xoptions( /* process options in string s */ char *nm ) { - extern FILE *freopen(); char buf[64]; + int negax; int nerrs = 0; - register char *cp; + char *cp; if (strncmp(s, "#@mkillum", 9) || !isspace(s[9])) { fputs(s, stdout); /* not for us */ @@ -338,15 +305,20 @@ xoptions( /* process options in string s */ } cp = sskip(cp); continue; - case 'd': /* point sample density */ + case 'd': /* sample density */ if (*++cp != '=') break; - if (!isintd(++cp, " \t\n\r")) - break; - thisillum.sampdens = atoi(cp); + if (!*++cp || isspace(*cp)) + continue; + if (isintd(cp, " \t\n\r")) { + thisillum.sampdens = atoi(cp); + } else { + error(WARNING, "direct BSDF input unsupported"); + goto opterr; + } cp = sskip(cp); continue; - case 's': /* point super-samples */ + case 's': /* surface super-samples */ if (*++cp != '=') break; if (!isintd(++cp, " \t\n\r")) @@ -430,16 +402,16 @@ printopts(void) /* print out option default values * printf("l+\t\t\t\t# light type on\n"); else printf("l-\t\t\t\t# light type off\n"); - printf("d=%d\t\t\t\t# density of points\n", thisillum.sampdens); - printf("s=%d\t\t\t\t# samples per point\n", thisillum.nsamps); + printf("d=%d\t\t\t\t# density of directions\n", thisillum.sampdens); + printf("s=%d\t\t\t\t# samples per direction\n", thisillum.nsamps); printf("b=%f\t\t\t# minimum average brightness\n", thisillum.minbrt); } void printhead( /* print out header */ - register int ac, - register char **av + int ac, + char **av ) { putchar('#'); @@ -506,13 +478,26 @@ xobject( /* translate an object from fp */ checkhead(); /* process object */ if (doit) - (*ofun[thisobj.otype].funp)(&thisobj, &thisillum, &rt, nm); + switch (thisobj.otype) { + case OBJ_FACE: + my_face(&thisobj, &thisillum, nm); + break; + case OBJ_SPHERE: + my_sphere(&thisobj, &thisillum, nm); + break; + case OBJ_RING: + my_ring(&thisobj, &thisillum, nm); + break; + default: + my_default(&thisobj, &thisillum, nm); + break; + } else printobj(thisillum.altmat, &thisobj); /* free arguments */ freefargs(&thisobj.oargs); return; readerr: - sprintf(errmsg, "(%s): error reading scene", nm); + sprintf(errmsg, "(%s): error reading input", nm); error(USER, errmsg); }