--- ray/src/gen/mkillum.c 1991/07/23 16:13:28 1.2 +++ ray/src/gen/mkillum.c 1991/07/24 12:22:03 1.4 @@ -10,6 +10,8 @@ static char SCCSid[] = "$SunId$ LBL"; #include "mkillum.h" +#include + #include /* default parameters */ @@ -23,11 +25,11 @@ static char SCCSid[] = "$SunId$ LBL"; #define S_ALL 3 /* select all */ /* rtrace command and defaults */ -char *rtargv[64] = { "rtrace", "-dj", ".25", "-dr", "3", "-ab", "2", - "-ad", "256", "-as", "128", "-aa", ".15" }; -int rtargc = 13; +char *rtargv[64] = { "rtrace", "-dj", ".25", "-dr", "3", "-di+", + "-ab", "2", "-ad", "256", "-as", "128", "-aa", ".15", }; +int rtargc = 14; /* overriding rtrace options */ -char *myrtopts[] = { "-I-", "-i-", "-di+", "-ov", "-h-", "-fff", NULL }; +char *myrtopts[] = { "-I-", "-i-", "-ov", "-h-", "-fff", NULL }; struct rtproc rt; /* our rtrace process */ @@ -37,10 +39,10 @@ struct illum_args thisillum = { /* our illum and defa DFLMAT, 0, VOIDID, + SAMPDENS, NSAMPS, }; -int sampdens = SAMPDENS; /* sample point density */ char matcheck[MAXSTR]; /* current material to include or exclude */ int matselect = S_ALL; /* selection criterion */ @@ -66,23 +68,27 @@ char *argv[]; { extern char *getenv(), *getpath(); char *rtpath; + FILE *fp; register int i; /* set global arguments */ - gargc = argc; gargv = argv; + gargv = argv; /* set up rtrace command */ - if (argc < 2) - error(USER, "too few arguments"); - for (i = 1; i < argc-1; i++) { + for (i = 1; i < argc; i++) { + if (argv[i][0] == '<' && !argv[i][1]) + break; rtargv[rtargc++] = argv[i]; if (argv[i][0] == '-' && argv[i][1] == 'w') warnings = !warnings; } + if ((gargc = i) < 2) + error(USER, "too few arguments"); + rtargc--; for (i = 0; myrtopts[i] != NULL; i++) rtargv[rtargc++] = myrtopts[i]; - rtargv[rtargc++] = argv[argc-1]; + rtargv[rtargc++] = argv[gargc-1]; rtargv[rtargc] = NULL; /* just asking for defaults? */ - if (!strcmp(argv[argc-1], "-defaults")) { + if (!strcmp(argv[gargc-1], "-defaults")) { rtpath = getpath(rtargv[0], getenv("PATH"), X_OK); if (rtpath == NULL) { eputs(rtargv[0]); @@ -95,15 +101,49 @@ char *argv[]; } /* else initialize and run our calculation */ init(); - filter(stdin, "standard input"); + if (gargc+1 < argc) + for (i = gargc+1; i < argc; i++) { + if ((fp = fopen(argv[i], "r")) == NULL { + sprintf(errmsg, + "cannot open scene file \"%s\"", argv[i]); + error(SYSTEM, errmsg); + } + filter(fp, argv[i]); + fclose(fp); + } + else + filter(stdin, "standard input"); quit(0); } +quit(status) /* exit with status */ +int status; +{ + 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); +} + + init() /* 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 */ + signal(SIGPIPE, quit); + /* start rtrace process */ maxbytes = open_process(rt.pd, rtargv); if (maxbytes == 0) { eputs(rtargv[0]); @@ -113,30 +153,14 @@ init() /* start rtrace and set up buffers */ if (maxbytes < 0) error(SYSTEM, "cannot start rtrace process"); rt.bsiz = maxbytes/(6*sizeof(float)); - rt.buf = (float *)malloc(rt.bsiz*(6*sizeof(float))); - if (rt.buf == NULL) + 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.bsiz--; /* allow for flush ray */ rt.nrays = 0; } -quit(status) /* exit with status */ -int status; -{ - 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); -} - - eputs(s) /* put string to stderr */ register char *s; { @@ -278,7 +302,7 @@ char *nm; break; if (!isintd(++cp, " \t\n")) break; - sampdens = atoi(cp); + thisillum.sampdens = atoi(cp); cp = sskip(cp); continue; case 's': /* point super-samples */ @@ -289,6 +313,16 @@ char *nm; thisillum.nsamps = atoi(cp); cp = sskip(cp); continue; + case 'l': /* light sources */ + cp++; + if (*cp == '+') + thisillum.flags |= IL_LIGHT; + else if (*cp == '-') + thisillum.flags &= ~IL_LIGHT; + else + break; + cp++; + continue; case 'o': /* output file */ if (*++cp != '=') break; @@ -320,7 +354,7 @@ char *nm; progname, nerrs); } /* print pure comment */ - putchar('#'); putchar(' '); fputs(s+2, stdout); + printf("# %s", s+2); } @@ -356,10 +390,10 @@ char *nm; printf("\n%s %s %s", thisillum.altmat, ALIASID, str); if (fgetword(str, MAXSTR, fp) == NULL) goto readerr; - printf(" %s\n", str); + printf("\t%s\n", str); return; } - thisobj.omod = OVOID; + thisobj.omod = OVOID; /* unused field */ if ((thisobj.otype = otype(str)) < 0) { sprintf(errmsg, "(%s): unknown type \"%s\"", nm, str); error(USER, errmsg); @@ -376,7 +410,7 @@ char *nm; doit = 0; break; case S_ALL: - doit = issurface(thisobj.otype); + doit = 1; break; case S_ELEM: doit = !strcmp(thisillum.altmat, matcheck); @@ -385,26 +419,12 @@ char *nm; doit = strcmp(thisillum.altmat, matcheck); break; } - if (doit) /* make sure we can do it */ - switch (thisobj.otype) { - case OBJ_SPHERE: - case OBJ_FACE: - case OBJ_RING: - break; - default: - sprintf(errmsg, - "(%s): cannot make illum for %s \"%s\"", - nm, ofun[thisobj.otype].funame, - thisobj.oname); - error(WARNING, errmsg); - doit = 0; - break; - } + doit = doit && issurface(thisobj.otype); /* print header? */ checkhead(); /* process object */ if (doit) - mkillum(&thisobj, &thisillum, &rt); + (*ofun[thisobj.otype].funp)(&thisobj, &thisillum, &rt, nm); else printobj(thisillum.altmat, &thisobj); /* free arguments */ @@ -414,20 +434,3 @@ readerr: sprintf(errmsg, "(%s): error reading scene", nm); error(USER, errmsg); } - - -int -otype(ofname) /* get object function number from its name */ -char *ofname; -{ - register int i; - - for (i = 0; i < NUMOTYPE; i++) - if (!strcmp(ofun[i].funame, ofname)) - return(i); - - return(-1); /* not found */ -} - - -o_default() {}