--- ray/src/gen/mkillum.c 1991/07/23 12:00:29 1.1 +++ ray/src/gen/mkillum.c 1993/09/21 17:09:59 2.6 @@ -8,16 +8,17 @@ static char SCCSid[] = "$SunId$ LBL"; * Make illum sources for optimizing rendering process */ -#include "standard.h" +#include "mkillum.h" -#include "object.h" +#include -#include "otypes.h" +#include /* 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 */ @@ -25,54 +26,41 @@ 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", "-dv-", + "-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", "-y", "0", NULL }; - /* illum flags */ -#define IL_FLAT 0x1 /* flat surface */ -#define IL_LIGHT 0x2 /* light rather than illum */ -#define IL_COLDST 0x4 /* colored distribution */ -#define IL_COLAVG 0x8 /* compute average color */ -#define IL_DATCLB 0x10 /* OK to clobber data file */ +struct rtproc rt; /* our rtrace process */ -struct illum_args { - int flags; /* flags from list above */ - char matname[MAXSTR]; /* illum material name */ - char datafile[MAXSTR]; /* distribution data file name */ - int dfnum; /* data file number */ - char altmatname[MAXSTR]; /* alternate material name */ - int nsamps; /* # of samples in each direction */ - int nalt, nazi; /* # of altitude and azimuth angles */ - FVECT orient; /* coordinate system orientation */ -} thisillum = { /* default values */ - 0, - DFLMAT, - DFLMAT, - 0, - VOIDID, - NSAMPS, -}; +struct illum_args thisillum = { /* our illum and default values */ + 0, + DFLMAT, + DFLDAT, + 0, + VOIDID, + SAMPDENS, + NSAMPS, + 0., + }; -int sampdens = SAMPDENS; /* sample point density */ char matcheck[MAXSTR]; /* current material to include or exclude */ int matselect = S_ALL; /* selection criterion */ -int rt_pd[3]; /* rtrace pipe descriptors */ -float *rt_buf; /* rtrace i/o buffer */ -int rt_bsiz; /* maximum rays for rtrace buffer */ -int rt_nrays; /* current length of rtrace buffer */ +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(); + *atos(), *iskip(), *fskip(), *strcpy(); extern FILE *popen(); @@ -82,20 +70,43 @@ 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] == '\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[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")) { + printopts(); fflush(stdout); rtpath = getpath(rtargv[0], getenv("PATH"), X_OK); if (rtpath == NULL) { eputs(rtargv[0]); @@ -106,18 +117,55 @@ char *argv[]; perror(rtpath); exit(1); } + if (gargc < 2 || argv[gargc-1][0] == '-') + error(USER, "missing octree argument"); /* else initialize and run our calculation */ init(); - mkillum(stdin, "standard input"); - exit(cleanup()); /* cleanup returns rtrace status */ + 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; - - maxbytes = open_process(rt_pd, rtargv); + /* 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 */ + errno = 0; + maxbytes = open_process(rt.pd, rtargv); if (maxbytes == 0) { eputs(rtargv[0]); eputs(": command not found\n"); @@ -125,29 +173,17 @@ 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.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_bsiz--; /* allow for flush ray */ - rt_nrays = 0; + rt.nrays = 0; + /* set up urand */ + initurand(2048); } -int -cleanup() /* close rtrace process and return status */ -{ - int status; - - free((char *)rt_buf); - rt_bsiz = 0; - status = close_process(rt_pd); - if (status < 0) - return(0); /* unknown status */ - return(status); -} - - eputs(s) /* put string to stderr */ register char *s; { @@ -163,7 +199,15 @@ register char *s; } -mkillum(infp, name) /* process stream */ +wputs(s) /* print warning if enabled */ +char *s; +{ + if (warnings) + eputs(s); +} + + +filter(infp, name) /* process stream */ register FILE *infp; char *name; { @@ -177,8 +221,7 @@ char *name; if (c == '#') { /* comment/options */ buf[0] = c; fgets(buf+1, sizeof(buf)-1, infp); - fputs(buf, stdout); - getoptions(buf, name); + xoptions(buf, name); } else if (c == '!') { /* command */ buf[0] = c; fgetline(buf+1, sizeof(buf)-1, infp); @@ -186,7 +229,7 @@ char *name; sprintf(errmsg, "cannot execute \"%s\"", buf); error(SYSTEM, errmsg); } - mkillum(pfp, buf); + filter(pfp, buf); pclose(pfp); } else { /* object */ ungetc(c, infp); @@ -196,7 +239,7 @@ char *name; } -getoptions(s, nm) /* get options from string s */ +xoptions(s, nm) /* process options in string s */ char *s; char *nm; { @@ -205,8 +248,10 @@ char *nm; int nerrs = 0; register char *cp; - if (strncmp(s, "#@mkillum", 9) || !isspace(s[9])) + if (strncmp(s, "#@mkillum", 9) || !isspace(s[9])) { + fputs(s, stdout); /* not for us */ return; + } cp = s+10; while (*cp) { switch (*cp) { @@ -216,10 +261,10 @@ char *nm; cp++; continue; case 'm': /* material name */ - cp++; - if (*cp != '=') + if (*++cp != '=') break; - cp++; + if (!*++cp) + break; atos(thisillum.matname, MAXSTR, cp); cp = sskip(cp); if (!(thisillum.flags & IL_DATCLB)) { @@ -228,11 +273,11 @@ char *nm; } continue; case 'f': /* data file name */ - cp++; - if (*cp != '=') + if (*++cp != '=') break; - cp++; - if (*cp == '\0') { + if (!*++cp) { + strcpy(thisillum.datafile,thisillum.matname); + thisillum.dfnum = 0; thisillum.flags &= ~IL_DATCLB; continue; } @@ -243,10 +288,10 @@ char *nm; continue; case 'i': /* include material */ case 'e': /* exclude material */ - matselect = (*cp++ == 'i') ? S_ELEM : S_COMPL; - if (*cp != '=') + if (cp[1] != '=') break; - cp++; + matselect = (*cp == 'i') ? S_ELEM : S_COMPL; + cp += 2; atos(matcheck, MAXSTR, cp); cp = sskip(cp); continue; @@ -259,18 +304,15 @@ char *nm; matselect = S_NONE; continue; case 'c': /* color calculation */ - cp++; - if (*cp != '=') + if (*++cp != '=') break; - cp++; - switch (*cp) { + 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); @@ -281,30 +323,46 @@ char *nm; cp = sskip(cp); continue; case 'd': /* point sample density */ - cp++; - if (*cp != '=') + if (*++cp != '=') break; - cp++; - if (!isintd(cp, " \t\n")) + if (!isintd(++cp, " \t\n")) break; - sampdens = atoi(cp); + thisillum.sampdens = atoi(cp); cp = sskip(cp); continue; case 's': /* point super-samples */ - cp++; - if (*cp != '=') + if (*++cp != '=') break; - cp++; - if (!isintd(cp, " \t\n")) + if (!isintd(++cp, " \t\n")) break; thisillum.nsamps = atoi(cp); cp = sskip(cp); continue; - case 'o': /* output file */ + case 'l': /* light sources */ cp++; - if (*cp != '=') + if (*cp == '+') + thisillum.flags |= IL_LIGHT; + else if (*cp == '-') + thisillum.flags &= ~IL_LIGHT; + else break; cp++; + continue; + case 'b': /* brightness */ + if (*++cp != '=') + break; + if (!isfltd(++cp, " \t\n")) + 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) + break; atos(buf, sizeof(buf), cp); cp = sskip(cp); if (freopen(buf, "w", stdout) == NULL) { @@ -314,15 +372,126 @@ 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); nerrs++; } + /* print header? */ + checkhead(); + /* issue warnings? */ if (nerrs) { sprintf(errmsg, "(%s): %d error(s) in option line:", nm, nerrs); error(WARNING, errmsg); - eputs(s); + wputs(s); + printf("# %s: the following option line has %d error(s):\n", + progname, nerrs); } + /* print pure comment */ + printf("# %s", s+2); +} + + +printopts() /* 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; +{ + putchar('#'); + while (ac-- > 0) { + putchar(' '); + fputs(*av++, stdout); + } + fputs("\n#@mkillum !\n", stdout); +} + + +xobject(fp, nm) /* translate an object from fp */ +FILE *fp; +char *nm; +{ + OBJREC thisobj; + char str[MAXSTR]; + int doit; + /* read the object */ + if (fgetword(thisillum.altmat, MAXSTR, fp) == NULL) + goto readerr; + if (fgetword(str, MAXSTR, fp) == NULL) + goto readerr; + /* is it an alias? */ + if (!strcmp(str, ALIASID)) { + if (fgetword(str, MAXSTR, fp) == NULL) + goto readerr; + printf("\n%s %s %s", thisillum.altmat, ALIASID, str); + if (fgetword(str, MAXSTR, fp) == NULL) + goto readerr; + printf("\t%s\n", str); + return; + } + thisobj.omod = OVOID; /* unused field */ + if ((thisobj.otype = otype(str)) < 0) { + sprintf(errmsg, "(%s): unknown type \"%s\"", nm, str); + error(USER, errmsg); + } + if (fgetword(str, MAXSTR, fp) == NULL) + goto readerr; + thisobj.oname = str; + if (readfargs(&thisobj.oargs, fp) != 1) + goto readerr; + thisobj.os = NULL; + /* check for translation */ + switch (matselect) { + case S_NONE: + doit = 0; + break; + case S_ALL: + doit = 1; + break; + case S_ELEM: + doit = !strcmp(thisillum.altmat, matcheck); + break; + case S_COMPL: + doit = strcmp(thisillum.altmat, matcheck); + break; + } + doit = doit && issurface(thisobj.otype); + /* print header? */ + checkhead(); + /* process object */ + if (doit) + (*ofun[thisobj.otype].funp)(&thisobj, &thisillum, &rt, nm); + else + printobj(thisillum.altmat, &thisobj); + /* free arguments */ + freefargs(&thisobj.oargs); + return; +readerr: + sprintf(errmsg, "(%s): error reading scene", nm); + error(USER, errmsg); }