--- ray/src/gen/mkillum.c 1991/07/23 17:18:21 1.3 +++ ray/src/gen/mkillum.c 2007/09/14 21:29:08 2.29 @@ -1,109 +1,120 @@ -/* Copyright (c) 1991 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: mkillum.c,v 2.29 2007/09/14 21:29:08 greg Exp $"; #endif - /* * Make illum sources for optimizing rendering process */ -#include "mkillum.h" - #include - #include +#include "platform.h" +#include "mkillum.h" +#include "random.h" + /* default parameters */ -#define SAMPDENS 128 /* points per projected steradian */ +#define SAMPDENS 48 /* points per projected steradian */ #define NSAMPS 32 /* samples per point */ #define DFLMAT "illum_mat" /* material name */ +#define DFLDAT "illum" /* data file name */ /* selection options */ #define S_NONE 0 /* select none */ #define S_ELEM 1 /* select specified element */ #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", "-ab", "2", - "-ad", "256", "-as", "128", "-aa", ".15" }; -int rtargc = 13; - /* overriding rtrace options */ -char *myrtopts[] = { "-I-", "-i-", "-di+", "-ov", "-h-", "-fff", NULL }; - -struct rtproc rt; /* our rtrace process */ - struct illum_args thisillum = { /* our illum and default values */ 0, DFLMAT, - DFLMAT, + DFLDAT, 0, VOIDID, SAMPDENS, NSAMPS, + 0., }; 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? */ -extern char *fgetline(), *fgetword(), *sskip(), - *atos(), *iskip(), *fskip(); -extern FILE *popen(); +void init(char *octnm, int np); +void filter(register FILE *infp, char *name); +void xoptions(char *s, char *nm); +void printopts(void); +void printhead(register int ac, register char **av); +void xobject(FILE *fp, char *nm); -main(argc, argv) /* compute illum distributions using rtrace */ -int argc; -char *argv[]; +int +main( /* compute illum distributions using rtrace */ + int argc, + char *argv[] +) { - extern char *getenv(), *getpath(); - char *rtpath; + int nprocs = 1; FILE *fp; + int rval; register int i; /* set global arguments */ gargv = argv; - /* set up rtrace command */ + progname = gargv[0]; + /* set up rendering defaults */ + dstrsrc = 0.25; + directrelay = 3; + directvis = 0; + ambounce = 2; + /* get options from command line */ for (i = 1; i < argc; i++) { - if (argv[i][0] == '<' && !argv[i][1]) + 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') - 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[gargc-1]; - rtargv[rtargc] = NULL; - /* just asking for defaults? */ - if (!strcmp(argv[gargc-1], "-defaults")) { - 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; } + 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 { + if ((fp = fopen(argv[i], "r")) == NULL) { sprintf(errmsg, "cannot open scene file \"%s\"", argv[i]); error(SYSTEM, errmsg); @@ -111,57 +122,36 @@ char *argv[]; filter(fp, argv[i]); fclose(fp); } - else + } else filter(stdin, "standard input"); quit(0); + return 0; /* pro forma return */ } -quit(status) /* exit with status */ -int status; +void +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); -} - - -init() /* start rtrace and set up buffers */ -{ - extern int o_face(), o_ring(); - int maxbytes; - /* set up object functions */ - ofun[OBJ_FACE].funp = o_face; - ofun[OBJ_RING].funp = o_ring; /* set up signal handling */ + signal(SIGINT, quit); +#ifdef SIGHUP + signal(SIGHUP, quit); +#endif +#ifdef SIGTERM + signal(SIGTERM, quit); +#endif +#ifdef SIGPIPE signal(SIGPIPE, quit); - /* start rtrace process */ - 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(rt.bsiz*(6*sizeof(float))); - if (rt.buf == NULL) - error(SYSTEM, "out of memory in init"); - rt.bsiz--; /* allow for flush ray */ - rt.nrays = 0; +#endif + /* start rendering process(es) */ + ray_pinit(octnm, np); } -eputs(s) /* put string to stderr */ -register char *s; +void +eputs( /* put string to stderr */ + register char *s +) { static int midline = 0; @@ -175,6 +165,7 @@ register char *s; } +void wputs(s) /* print warning if enabled */ char *s; { @@ -183,9 +174,11 @@ char *s; } -filter(infp, name) /* process stream */ -register FILE *infp; -char *name; +void +filter( /* process stream */ + register FILE *infp, + char *name +) { char buf[512]; FILE *pfp; @@ -215,9 +208,11 @@ char *name; } -xoptions(s, nm) /* process options in string s */ -char *s; -char *nm; +void +xoptions( /* process options in string s */ + char *s, + char *nm +) { extern FILE *freopen(); char buf[64]; @@ -234,12 +229,14 @@ char *nm; case ' ': case '\t': case '\n': + case '\r': + case '\f': cp++; continue; case 'm': /* material name */ if (*++cp != '=') break; - if (!*++cp) + if (!*++cp || isspace(*cp)) break; atos(thisillum.matname, MAXSTR, cp); cp = sskip(cp); @@ -251,7 +248,9 @@ char *nm; case 'f': /* data file name */ if (*++cp != '=') break; - if (!*++cp) { + if (!*++cp || isspace(*cp)) { + strcpy(thisillum.datafile,thisillum.matname); + thisillum.dfnum = 0; thisillum.flags &= ~IL_DATCLB; continue; } @@ -262,10 +261,11 @@ char *nm; continue; case 'i': /* include material */ case 'e': /* exclude material */ - matselect = (*cp == 'i') ? S_ELEM : S_COMPL; - if (*++cp != '=') + if (cp[1] != '=') break; - atos(matcheck, MAXSTR, ++cp); + matselect = (*cp == 'i') ? S_ELEM : S_COMPL; + cp += 2; + atos(matcheck, MAXSTR, cp); cp = sskip(cp); continue; case 'a': /* use everything */ @@ -281,12 +281,11 @@ char *nm; break; switch (*++cp) { case 'a': /* average */ - thisillum.flags |= IL_COLAVG; - thisillum.flags &= ~IL_COLDST; + thisillum.flags = (thisillum.flags|IL_COLAVG) + & ~IL_COLDST; break; case 'd': /* distribution */ - thisillum.flags |= IL_COLDST; - thisillum.flags &= ~IL_COLAVG; + thisillum.flags |= (IL_COLDST|IL_COLAVG); break; case 'n': /* none */ thisillum.flags &= ~(IL_COLAVG|IL_COLDST); @@ -299,7 +298,7 @@ char *nm; case 'd': /* point sample density */ if (*++cp != '=') break; - if (!isintd(++cp, " \t\n")) + if (!isintd(++cp, " \t\n\r")) break; thisillum.sampdens = atoi(cp); cp = sskip(cp); @@ -307,23 +306,35 @@ char *nm; case 's': /* point super-samples */ if (*++cp != '=') break; - if (!isintd(++cp, " \t\n")) + if (!isintd(++cp, " \t\n\r")) break; thisillum.nsamps = atoi(cp); cp = sskip(cp); continue; case 'l': /* light sources */ - if (*++cp != '+' && *cp != '-') - break; - if (*cp++ == '+') + cp++; + if (*cp == '+') thisillum.flags |= IL_LIGHT; - else + else if (*cp == '-') thisillum.flags &= ~IL_LIGHT; + else + break; + cp++; continue; + case 'b': /* brightness */ + if (*++cp != '=') + break; + if (!isfltd(++cp, " \t\n\r")) + break; + thisillum.minbrt = atof(cp); + if (thisillum.minbrt < 0.) + thisillum.minbrt = 0.; + cp = sskip(cp); + continue; case 'o': /* output file */ if (*++cp != '=') break; - if (!*++cp) + if (!*++cp || isspace(*cp)) break; atos(buf, sizeof(buf), cp); cp = sskip(cp); @@ -334,9 +345,15 @@ char *nm; } doneheader = 0; continue; + case '!': /* processed file! */ + sprintf(errmsg, "(%s): already processed!", nm); + error(WARNING, errmsg); + matselect = S_NONE; + return; } opterr: /* skip faulty option */ - cp = sskip(cp); + while (*cp && !isspace(*cp)) + cp++; nerrs++; } /* print header? */ @@ -351,26 +368,51 @@ char *nm; progname, nerrs); } /* print pure comment */ - putchar('#'); putchar(' '); fputs(s+2, stdout); + printf("# %s", s+2); } +void +printopts(void) /* print out option default values */ +{ + printf("m=%-15s\t\t# material name\n", thisillum.matname); + printf("f=%-15s\t\t# data file name\n", thisillum.datafile); + if (thisillum.flags & IL_COLAVG) + if (thisillum.flags & IL_COLDST) + printf("c=d\t\t\t\t# color distribution\n"); + else + printf("c=a\t\t\t\t# color average\n"); + else + printf("c=n\t\t\t\t# color none\n"); + if (thisillum.flags & IL_LIGHT) + 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("b=%f\t\t\t# minimum average brightness\n", thisillum.minbrt); +} -printhead(ac, av) /* print out header */ -register int ac; -register char **av; + +void +printhead( /* print out header */ + register int ac, + register char **av +) { putchar('#'); while (ac-- > 0) { putchar(' '); fputs(*av++, stdout); } - putchar('\n'); + fputs("\n#@mkillum !\n", stdout); } -xobject(fp, nm) /* translate an object from fp */ -FILE *fp; -char *nm; +void +xobject( /* translate an object from fp */ + FILE *fp, + char *nm +) { OBJREC thisobj; char str[MAXSTR]; @@ -381,16 +423,16 @@ char *nm; if (fgetword(str, MAXSTR, fp) == NULL) goto readerr; /* is it an alias? */ - if (!strcmp(str, ALIASID)) { + if (!strcmp(str, ALIASKEY)) { if (fgetword(str, MAXSTR, fp) == NULL) goto readerr; - printf("\n%s %s %s", thisillum.altmat, ALIASID, str); + printf("\n%s %s %s", thisillum.altmat, ALIASKEY, 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); @@ -407,7 +449,7 @@ char *nm; doit = 0; break; case S_ALL: - doit = issurface(thisobj.otype); + doit = 1; break; case S_ELEM: doit = !strcmp(thisillum.altmat, matcheck); @@ -416,40 +458,31 @@ char *nm; doit = strcmp(thisillum.altmat, matcheck); break; } - if (doit && ofun[thisobj.otype].funp == o_default) { - sprintf(errmsg, "(%s): cannot make illum for %s \"%s\"", - nm, ofun[thisobj.otype].funame, thisobj.oname); - error(WARNING, errmsg); - doit = 0; - } + doit = doit && issurface(thisobj.otype); /* print header? */ checkhead(); /* process object */ if (doit) - (*ofun[thisobj.otype].funp)(&thisobj, &thisillum, &rt); + 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); } - - -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() {}