--- ray/src/px/pcomb.c 1991/05/24 15:47:53 1.16 +++ ray/src/px/pcomb.c 1995/02/17 18:37:20 2.15 @@ -1,4 +1,4 @@ -/* Copyright (c) 1991 Regents of the University of California */ +/* Copyright (c) 1992 Regents of the University of California */ #ifndef lint static char SCCSid[] = "$SunId$ LBL"; @@ -10,75 +10,95 @@ static char SCCSid[] = "$SunId$ LBL"; * 1/4/89 */ -#include +#include "standard.h" -#include - #include "color.h" +#include "resolu.h" + #include "calcomp.h" +#include "view.h" + #define MAXINP 32 /* maximum number of input files */ -#define WINSIZ 9 /* scanline window size */ -#define MIDSCN 4 /* current scan position */ +#define WINSIZ 17 /* scanline window size */ +#define MIDSCN ((WINSIZ-1)/2+1) -#define BRT (-1) /* special index for brightness */ - struct { - char *name; /* file name */ + char *name; /* file or command name */ FILE *fp; /* stream pointer */ + VIEW vw; /* view for picture */ + RESOLU rs; /* image resolution and orientation */ COLOR *scan[WINSIZ]; /* input scanline window */ COLOR coef; /* coefficient */ + COLOR expos; /* recorded exposure */ } input[MAXINP]; /* input pictures */ int nfiles; /* number of input files */ -char *vcolin[3] = {"ri", "gi", "bi"}; -char *vcolout[3] = {"ro", "go", "bo"}; +char Command[] = ""; +char vcolin[3][4] = {"ri", "gi", "bi"}; +char vcolout[3][4] = {"ro", "go", "bo"}; char vbrtin[] = "li"; char vbrtout[] = "lo"; -char *vcolcoef[3] = {"rc", "gc", "bc"}; -char vbrtcoef[] = "lc"; +char vcolexp[3][4] = {"re", "ge", "be"}; +char vbrtexp[] = "le"; -#define vnfiles "nfiles" -#define vxres "xres" -#define vyres "yres" -#define vxpos "x" -#define vypos "y" +char vray[6][4] = {"Ox", "Oy", "Oz", "Dx", "Dy", "Dz"}; +char vnfiles[] = "nfiles"; +char vxmax[] = "xmax"; +char vymax[] = "ymax"; +char vxres[] = "xres"; +char vyres[] = "yres"; +char vxpos[] = "x"; +char vypos[] = "y"; + int nowarn = 0; /* no warning messages? */ -int original = 0; /* origninal values? */ +int xmax = 0, ymax = 0; /* input resolution */ -int xres=0, yres=0; /* picture resolution */ +int xscan, yscan; /* input position */ -int xpos, ypos; /* picture position */ +int xres, yres; /* output resolution */ +int xpos, ypos; /* output position */ + +char *progname; /* global argv[0] */ + int wrongformat = 0; +int gotview; +FILE *popen(); +extern char *emalloc(); + + main(argc, argv) int argc; char *argv[]; { + int original; double f; int a, i; +#ifdef MSDOS + extern int _fmode; + _fmode = O_BINARY; + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); +#endif + progname = argv[0]; /* scan options */ for (a = 1; a < argc; a++) { if (argv[a][0] == '-') switch (argv[a][1]) { case 'x': - xres = atoi(argv[++a]); - continue; case 'y': - yres = atoi(argv[++a]); + a++; continue; case 'w': nowarn = !nowarn; continue; - case 'o': - original = !original; - continue; case 'f': case 'e': a++; @@ -86,10 +106,15 @@ char *argv[]; } break; } + newheader("RADIANCE", stdout); /* start header */ /* process files */ - for (nfiles = 0; nfiles < MAXINP; nfiles++) + for (nfiles = 0; nfiles < MAXINP; nfiles++) { setcolor(input[nfiles].coef, 1.0, 1.0, 1.0); + setcolor(input[nfiles].expos, 1.0, 1.0, 1.0); + copystruct(&input[nfiles].vw, &stdview); + } nfiles = 0; + original = 0; for ( ; a < argc; a++) { if (nfiles >= MAXINP) { eputs(argv[0]); @@ -102,6 +127,9 @@ char *argv[]; input[nfiles].name = ""; input[nfiles].fp = stdin; break; + case 'o': + original++; + continue; case 's': f = atof(argv[++a]); scalecolor(input[nfiles].coef, f); @@ -115,27 +143,42 @@ char *argv[]; goto usage; } else { - input[nfiles].name = argv[a]; - input[nfiles].fp = fopen(argv[a], "r"); + if (argv[a][0] == '!') { + input[nfiles].name = Command; + input[nfiles].fp = popen(argv[a]+1, "r"); + } else { + input[nfiles].name = argv[a]; + input[nfiles].fp = fopen(argv[a], "r"); + } if (input[nfiles].fp == NULL) { perror(argv[a]); quit(1); } } checkfile(); + if (original) { + colval(input[nfiles].coef,RED) /= + colval(input[nfiles].expos,RED); + colval(input[nfiles].coef,GRN) /= + colval(input[nfiles].expos,GRN); + colval(input[nfiles].coef,BLU) /= + colval(input[nfiles].expos,BLU); + } nfiles++; + original = 0; } - init(); /* set constant expressions */ + init(); /* set constants */ /* go back and get expressions */ for (a = 1; a < argc; a++) { if (argv[a][0] == '-') switch (argv[a][1]) { case 'x': + varset(vxres, ':', eval(argv[++a])); + continue; case 'y': - a++; + varset(vyres, ':', eval(argv[++a])); continue; case 'w': - case 'o': continue; case 'f': fcompile(argv[++a]); @@ -146,11 +189,23 @@ char *argv[]; } break; } + /* set/get output resolution */ + if (!vardefined(vxres)) + varset(vxres, ':', (double)xmax); + if (!vardefined(vyres)) + varset(vyres, ':', (double)ymax); + xres = varvalue(vxres) + .5; + yres = varvalue(vyres) + .5; + if (xres <= 0 || yres <= 0) { + eputs(argv[0]); + eputs(": illegal output resolution\n"); + quit(1); + } /* complete header */ printargs(argc, argv, stdout); fputformat(COLRFMT, stdout); putchar('\n'); - fputresolu(YMAJOR|YDECR, xres, yres, stdout); + fprtresolu(xres, yres, stdout); /* combine pictures */ combine(); quit(0); @@ -158,7 +213,7 @@ usage: eputs("Usage: "); eputs(argv[0]); eputs( -" [-w][-h][-x xr][-y yr][-e expr][-f file] [ [-s f][-c r g b] pic ..]\n"); +" [-w][-x xr][-y yr][-e expr][-f file] [ [-o][-s f][-c r g b] pic ..]\n"); quit(1); } @@ -170,21 +225,23 @@ char *s; double d; COLOR ctmp; - if (isformat(s)) { /* check format */ - formatval(fmt, s); + if (isheadid(s)) /* header id */ + return; /* don't echo */ + if (formatval(fmt, s)) { /* check format */ wrongformat = strcmp(fmt, COLRFMT); - } else if (original && isexpos(s)) { /* exposure */ - d = 1.0/exposval(s); - scalecolor(input[nfiles].coef, d); - } else if (original && iscolcor(s)) { /* color correction */ - colcorval(ctmp, s); - colval(input[nfiles].coef,RED) /= colval(ctmp,RED); - colval(input[nfiles].coef,GRN) /= colval(ctmp,GRN); - colval(input[nfiles].coef,BLU) /= colval(ctmp,BLU); - } else { /* echo unaffected line */ - putchar('\t'); - fputs(s, stdout); + return; /* don't echo */ } + if (isexpos(s)) { /* exposure */ + d = exposval(s); + scalecolor(input[nfiles].expos, d); + } else if (iscolcor(s)) { /* color correction */ + colcorval(ctmp, s); + multcolor(input[nfiles].expos, ctmp); + } else if (isview(s) && sscanview(&input[nfiles].vw, s) > 0) + gotview++; + /* echo line */ + putchar('\t'); + fputs(s, stdout); } @@ -192,6 +249,7 @@ checkfile() /* ready a file */ { register int i; /* process header */ + gotview = 0; fputs(input[nfiles].name, stdout); fputs(":\n", stdout); getheader(input[nfiles].fp, tputs, NULL); @@ -200,43 +258,45 @@ checkfile() /* ready a file */ eputs(": not in Radiance picture format\n"); quit(1); } - if (fgetresolu(&xpos, &ypos, input[nfiles].fp) != (YMAJOR|YDECR)) { + if (!gotview || setview(&input[nfiles].vw) != NULL) + input[nfiles].vw.type = 0; + if (!fgetsresolu(&input[nfiles].rs, input[nfiles].fp)) { eputs(input[nfiles].name); eputs(": bad picture size\n"); quit(1); } - if (xres == 0 && yres == 0) { - xres = xpos; - yres = ypos; - } else if (xpos != xres || ypos != yres) { + if (xmax == 0 && ymax == 0) { + xmax = scanlen(&input[nfiles].rs); + ymax = numscans(&input[nfiles].rs); + } else if (scanlen(&input[nfiles].rs) != xmax || + numscans(&input[nfiles].rs) != ymax) { eputs(input[nfiles].name); eputs(": resolution mismatch\n"); quit(1); } /* allocate scanlines */ for (i = 0; i < WINSIZ; i++) - input[nfiles].scan[i] = (COLOR *)emalloc(xres*sizeof(COLOR)); + input[nfiles].scan[i] = (COLOR *)emalloc(xmax*sizeof(COLOR)); } -init() /* perform final setup */ +init() /* perform final setup */ { - double l_colin(), l_coef(); + double l_colin(), l_expos(), l_ray(); register int i; - /* prime input */ - for (ypos = yres+(MIDSCN-1); ypos >= yres; ypos--) - advance(); /* define constants */ varset(vnfiles, ':', (double)nfiles); - varset(vxres, ':', (double)xres); - varset(vyres, ':', (double)yres); + varset(vxmax, ':', (double)xmax); + varset(vymax, ':', (double)ymax); /* set functions */ for (i = 0; i < 3; i++) { - funset(vcolcoef[i], 1, ':', l_coef); + funset(vcolexp[i], 1, ':', l_expos); funset(vcolin[i], 1, '=', l_colin); } - funset(vbrtcoef, 1, ':', l_coef); + funset(vbrtexp, 1, ':', l_expos); funset(vbrtin, 1, '=', l_colin); + for (i = 0; i < 6; i++) + funset(vray[i], 1, '=', l_ray); } @@ -259,11 +319,14 @@ combine() /* combine pictures */ brtdef = NULL; /* allocate scanline */ scanout = (COLOR *)emalloc(xres*sizeof(COLOR)); + /* set input position */ + yscan = ymax+MIDSCN; /* combine files */ for (ypos = yres-1; ypos >= 0; ypos--) { advance(); varset(vypos, '=', (double)ypos); for (xpos = 0; xpos < xres; xpos++) { + xscan = (long)xpos*xmax/xres; varset(vxpos, '=', (double)xpos); eclock++; if (brtdef != NULL) { @@ -278,7 +341,7 @@ combine() /* combine pictures */ } else { d = 0.0; for (i = 0; i < nfiles; i++) - d += colval(input[i].scan[MIDSCN][xpos],j); + d += colval(input[i].scan[MIDSCN][xscan],j); } if (d < 0.0) d = 0.0; @@ -295,51 +358,50 @@ combine() /* combine pictures */ } -advance() /* read in next scanline */ +advance() /* read in data for next scanline */ { + int ytarget; register COLOR *st; register int i, j; - for (i = 0; i < nfiles; i++) { - st = input[i].scan[WINSIZ-1]; - for (j = WINSIZ-1; j > 0; j--) /* rotate window */ - input[i].scan[j] = input[i].scan[j-1]; - input[i].scan[0] = st; - if (ypos < MIDSCN) /* hit bottom */ - continue; - if (freadscan(st, xres, input[i].fp) < 0) { - eputs(input[i].name); - eputs(": read error\n"); - quit(1); + for (ytarget = (long)ypos*ymax/yres; yscan > ytarget; yscan--) + for (i = 0; i < nfiles; i++) { + st = input[i].scan[WINSIZ-1]; + for (j = WINSIZ-1; j > 0; j--) /* rotate window */ + input[i].scan[j] = input[i].scan[j-1]; + input[i].scan[0] = st; + if (yscan <= MIDSCN) /* hit bottom? */ + continue; + if (freadscan(st, xmax, input[i].fp) < 0) { /* read */ + eputs(input[i].name); + eputs(": read error\n"); + quit(1); + } + if (fabs(colval(input[i].coef,RED)-1.0) > 1e-3 || + fabs(colval(input[i].coef,GRN)-1.0) > 1e-3 || + fabs(colval(input[i].coef,BLU)-1.0) > 1e-3) + for (j = 0; j < xmax; j++) /* adjust color */ + multcolor(st[j], input[i].coef); } - for (j = 0; j < xres; j++) /* adjust color */ - multcolor(st[j], input[i].coef); - } } double -l_coef(nam) /* return picture coefficients */ +l_expos(nam) /* return picture exposure */ register char *nam; { register int fn, n; - double d; - d = argument(1); - if (d > -.5 && d < .5) - return((double)nfiles); - fn = d - .5; - if (fn < 0 || fn >= nfiles) { - errno = EDOM; - return(0.0); - } - if (nam == vbrtcoef) - return(bright(input[fn].coef)); + fn = argument(1) - .5; + if (fn < 0 || fn >= nfiles) + return(1.0); + if (nam == vbrtexp) + return(bright(input[fn].expos)); n = 3; while (n--) - if (nam == vcolcoef[n]) - return(colval(input[fn].coef,n)); - eputs("Bad call to l_coef()!\n"); + if (nam == vcolexp[n]) + return(colval(input[fn].expos,n)); + eputs("Bad call to l_expos()!\n"); quit(1); } @@ -366,12 +428,12 @@ register char *nam; d = argument(2); if (d < 0.0) { xoff = d-.5; - if (xpos+xoff < 0) - xoff = -xpos; + if (xscan+xoff < 0) + xoff = -xscan; } else { xoff = d+.5; - if (xpos+xoff >= xres) - xoff = xres-1-xpos; + if (xscan+xoff >= xmax) + xoff = xmax-1-xscan; } } if (n >= 3) { @@ -380,27 +442,68 @@ register char *nam; yoff = d-.5; if (yoff+MIDSCN < 0) yoff = -MIDSCN; - if (ypos+yoff < 0) - yoff = -ypos; + if (yscan+yoff < 0) + yoff = -yscan; } else { yoff = d+.5; if (yoff+MIDSCN >= WINSIZ) yoff = WINSIZ-1-MIDSCN; - if (ypos+yoff >= yres) - yoff = yres-1-ypos; + if (yscan+yoff >= ymax) + yoff = ymax-1-yscan; } } if (nam == vbrtin) - return(bright(input[fn].scan[MIDSCN+yoff][xpos+xoff])); + return(bright(input[fn].scan[MIDSCN+yoff][xscan+xoff])); n = 3; while (n--) if (nam == vcolin[n]) - return(colval(input[fn].scan[MIDSCN+yoff][xpos+xoff],n)); + return(colval(input[fn].scan[MIDSCN+yoff][xscan+xoff],n)); eputs("Bad call to l_colin()!\n"); quit(1); } +double +l_ray(nam) /* return ray origin or direction */ +register char *nam; +{ + static unsigned long ltick[MAXINP]; + static FVECT lorg[MAXINP], ldir[MAXINP]; + FLOAT loc[2]; + double d; + int fn; + register int i; + + d = argument(1); + if (d > -.5 && d < .5) + return((double)nfiles); + fn = d - .5; + if (fn < 0 || fn >= nfiles) { + errno = EDOM; + return(0.0); + } + if (ltick[fn] < eclock) { /* need to compute? */ + lorg[fn][0] = lorg[fn][1] = lorg[fn][2] = 0.0; + ldir[fn][0] = ldir[fn][1] = ldir[fn][2] = 0.0; + if (input[fn].vw.type == 0) + errno = EDOM; + else { + pix2loc(loc, &input[fn].rs, xscan, ymax-1-yscan); + if (viewray(lorg[fn], ldir[fn], + &input[fn].vw, loc[0], loc[1]) < 0) + errno = ERANGE; + } + ltick[fn] = eclock; + } + i = 6; + while (i--) + if (nam == vray[i]) + return(i < 3 ? lorg[fn][i] : ldir[fn][i-3]); + eputs("Bad call to l_ray()!\n"); + quit(1); +} + + wputs(msg) char *msg; { @@ -416,8 +519,15 @@ char *msg; } -quit(code) -int code; +quit(code) /* exit gracefully */ +int code; { + register int i; + /* close input files */ + for (i = 0; i < nfiles; i++) + if (input[i].name == Command) + pclose(input[i].fp); + else + fclose(input[i].fp); exit(code); }