--- ray/src/px/pinterp.c 1994/12/27 18:04:29 2.22 +++ ray/src/px/pinterp.c 2003/06/26 00:58:10 2.34 @@ -1,32 +1,30 @@ -/* Copyright (c) 1994 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: pinterp.c,v 2.34 2003/06/26 00:58:10 schorsch Exp $"; #endif - /* * Interpolate and extrapolate pictures with different view parameters. * * Greg Ward 09Dec89 */ -#include "standard.h" +#include "copyright.h" #include +#include "standard.h" +#include "rtprocess.h" /* Windows: must come before color.h */ #include "view.h" - #include "color.h" -#include "resolu.h" - #define LOG2 0.69314718055994530942 #define pscan(y) (ourpict+(y)*hresolu) #define sscan(y) (ourspict+(y)*hresolu) #define wscan(y) (ourweigh+(y)*hresolu) #define zscan(y) (ourzbuf+(y)*hresolu) +#define bscan(y) (ourbpict+(y)*hresolu) #define averaging (ourweigh != NULL) +#define blurring (ourbpict != NULL) #define usematrix (hasmatrix & !averaging) #define zisnorm (!usematrix | ourview.type != VT_PER) @@ -37,7 +35,7 @@ static char SCCSid[] = "$SunId$ LBL"; #define PACKSIZ 256 /* max. calculation packet size */ -#define RTCOM "rtrace -h- -ovl -fff " +#define RTCOM "rtrace -h- -ovl -fff -ld- -i- -I- " #define ABS(x) ((x)>0?(x):-(x)) @@ -59,7 +57,11 @@ COLR *ourpict; /* output picture (COLR's) */ COLOR *ourspict; /* output pixel sums (averaging) */ float *ourweigh = NULL; /* output pixel weights (averaging) */ float *ourzbuf; /* corresponding z-buffer */ +COLOR *ourbpict = NULL; /* blurred picture (view averaging) */ +VIEW avgview; /* average view for -B option */ +int nvavg; /* number of views averaged */ + char *progname; int fillo = F_FORE|F_BACK; /* selected fill options */ @@ -70,11 +72,12 @@ COLR backcolr = BLKCOLR; /* background color */ COLOR backcolor = BLKCOLOR; /* background color (float) */ double backz = 0.0; /* background z value */ int normdist = 1; /* i/o normalized distance? */ +char ourfmt[LPICFMT+1] = PICFMT; /* original picture format */ double ourexp = -1; /* original picture exposure */ int expadj = 0; /* exposure adjustment (f-stops) */ double rexpadj = 1; /* real exposure adjustment */ -VIEW theirview = STDVIEW; /* input view */ +VIEW theirview; /* input view */ int gotview; /* got input view? */ int wrongformat = 0; /* input in another format? */ RESOLU tresolu; /* input resolution */ @@ -82,11 +85,10 @@ double theirexp; /* input picture exposure */ MAT4 theirs2ours; /* transformation matrix */ int hasmatrix = 0; /* has transformation matrix */ -int PDesc[3] = {-1,-1,-1}; /* rtrace process descriptor */ -#define childpid (PDesc[2]) +static SUBPROC PDesc = SP_INACTIVE; /* rtrace process descriptor */ unsigned short queue[PACKSIZ][2]; /* pending pixels */ int packsiz; /* actual packet size */ -int queuesiz; /* number of pixels pending */ +int queuesiz = 0; /* number of pixels pending */ extern double movepixel(); @@ -95,37 +97,41 @@ main(argc, argv) /* interpolate pictures */ int argc; char *argv[]; { -#define check(ol,al) if (argv[i][ol] || \ - badarg(argc-i-1,argv+i+1,al)) \ +#define check(ol,al) if (argv[an][ol] || \ + badarg(argc-an-1,argv+an+1,al)) \ goto badopt int gotvfile = 0; int doavg = -1; + int doblur = 0; char *zfile = NULL; char *expcomp = NULL; - char *err; - int i, rval; + int i, an, rval; progname = argv[0]; - for (i = 1; i < argc && argv[i][0] == '-'; i++) { - rval = getviewopt(&ourview, argc-i, argv+i); + for (an = 1; an < argc && argv[an][0] == '-'; an++) { + rval = getviewopt(&ourview, argc-an, argv+an); if (rval >= 0) { - i += rval; + an += rval; continue; } - switch (argv[i][1]) { + switch (argv[an][1]) { case 'e': /* exposure */ check(2,"f"); - expcomp = argv[++i]; + expcomp = argv[++an]; break; case 't': /* threshold */ check(2,"f"); - zeps = atof(argv[++i]); + zeps = atof(argv[++an]); break; case 'a': /* average */ check(2,NULL); doavg = 1; break; + case 'B': /* blur views */ + check(2,NULL); + doblur = 1; + break; case 'q': /* quick (no avg.) */ check(2,NULL); doavg = 0; @@ -135,7 +141,7 @@ char *argv[]; normdist = !normdist; break; case 'f': /* fill type */ - switch (argv[i][2]) { + switch (argv[an][2]) { case '0': /* none */ check(3,NULL); fillo = 0; @@ -154,27 +160,27 @@ char *argv[]; break; case 's': /* sample */ check(3,"i"); - fillsamp = atoi(argv[++i]); + fillsamp = atoi(argv[++an]); break; case 'c': /* color */ check(3,"fff"); fillfunc = backfill; - setcolor(backcolor, atof(argv[i+1]), - atof(argv[i+2]), atof(argv[i+3])); + setcolor(backcolor, atof(argv[an+1]), + atof(argv[an+2]), atof(argv[an+3])); setcolr(backcolr, colval(backcolor,RED), colval(backcolor,GRN), colval(backcolor,BLU)); - i += 3; + an += 3; break; case 'z': /* z value */ check(3,"f"); fillfunc = backfill; - backz = atof(argv[++i]); + backz = atof(argv[++an]); break; case 'r': /* rtrace */ check(3,"s"); fillfunc = rcalfill; - calstart(RTCOM, argv[++i]); + calstart(RTCOM, argv[++an]); break; default: goto badopt; @@ -182,53 +188,53 @@ char *argv[]; break; case 'z': /* z file */ check(2,"s"); - zfile = argv[++i]; + zfile = argv[++an]; break; case 'x': /* x resolution */ check(2,"i"); - hresolu = atoi(argv[++i]); + hresolu = atoi(argv[++an]); break; case 'y': /* y resolution */ check(2,"i"); - vresolu = atoi(argv[++i]); + vresolu = atoi(argv[++an]); break; case 'p': /* pixel aspect */ - if (argv[i][2] != 'a') + if (argv[an][2] != 'a') goto badopt; check(3,"f"); - pixaspect = atof(argv[++i]); + pixaspect = atof(argv[++an]); break; case 'v': /* view file */ - if (argv[i][2] != 'f') + if (argv[an][2] != 'f') goto badopt; check(3,"s"); - gotvfile = viewfile(argv[++i], &ourview, 0, 0); + gotvfile = viewfile(argv[++an], &ourview, NULL); if (gotvfile < 0) - syserror(argv[i]); + syserror(argv[an]); else if (gotvfile == 0) { fprintf(stderr, "%s: bad view file\n", - argv[i]); + argv[an]); exit(1); } break; default: badopt: fprintf(stderr, "%s: command line error at '%s'\n", - progname, argv[i]); + progname, argv[an]); goto userr; } } /* check arguments */ - if ((argc-i)%2) + if ((argc-an)%2) goto userr; if (fillsamp == 1) fillo &= ~F_BACK; if (doavg < 0) - doavg = (argc-i) > 2; + doavg = (argc-an) > 2; if (expcomp != NULL) if (expcomp[0] == '+' | expcomp[0] == '-') { expadj = atof(expcomp) + (expcomp[0]=='+' ? .5 : -.5); - if (doavg) + if (doavg | doblur) rexpadj = pow(2.0, atof(expcomp)); else rexpadj = pow(2.0, (double)expadj); @@ -237,12 +243,13 @@ char *argv[]; goto userr; rexpadj = atof(expcomp); expadj = log(rexpadj)/LOG2 + (rexpadj>1 ? .5 : -.5); - if (!doavg) + if (!(doavg | doblur)) rexpadj = pow(2.0, (double)expadj); } /* set view */ - if ((err = setview(&ourview)) != NULL) { - fprintf(stderr, "%s: %s\n", progname, err); + if (nextview(doblur ? stdin : (FILE *)NULL) == EOF) { + fprintf(stderr, "%s: no view on standard input!\n", + progname); exit(1); } normaspect(viewaspect(&ourview), &pixaspect, &hresolu, &vresolu); @@ -257,29 +264,37 @@ char *argv[]; if (ourpict == NULL) syserror(progname); } + if (doblur) { + ourbpict = (COLOR *)bmalloc(hresolu*vresolu*sizeof(COLOR)); + if (ourbpict == NULL) + syserror(progname); + } ourzbuf = (float *)bmalloc(hresolu*vresolu*sizeof(float)); if (ourzbuf == NULL) syserror(progname); - bzero((char *)ourzbuf, hresolu*vresolu*sizeof(float)); /* new header */ newheader("RADIANCE", stdout); - /* get input */ - for ( ; i < argc; i += 2) - addpicture(argv[i], argv[i+1]); - /* fill in spaces */ - if (fillo&F_BACK) - backpicture(fillfunc, fillsamp); - else - fillpicture(fillfunc); + fputnow(stdout); + /* run pictures */ + do { + bzero((char *)ourzbuf, hresolu*vresolu*sizeof(float)); + for (i = an; i < argc; i += 2) + addpicture(argv[i], argv[i+1]); + if (fillo&F_BACK) /* fill in spaces */ + backpicture(fillfunc, fillsamp); + else + fillpicture(fillfunc); + /* aft clipping */ + clipaft(); + } while (addblur() && nextview(stdin) != EOF); /* close calculation */ caldone(); - /* aft clipping */ - clipaft(); /* add to header */ printargs(argc, argv, stdout); - if (gotvfile) { + compavgview(); + if (doblur | gotvfile) { fputs(VIEWSTR, stdout); - fprintview(&ourview, stdout); + fprintview(&avgview, stdout); putc('\n', stdout); } if (pixaspect < .99 | pixaspect > 1.01) @@ -290,7 +305,8 @@ char *argv[]; ourexp = rexpadj; if (ourexp < .995 | ourexp > 1.005) fputexpos(ourexp, stdout); - fputformat(COLRFMT, stdout); + if (strcmp(ourfmt, PICFMT)) /* print format if known */ + fputformat(ourfmt, stdout); putc('\n', stdout); /* write picture */ writepicture(); @@ -301,36 +317,106 @@ char *argv[]; exit(0); userr: fprintf(stderr, - "Usage: %s [view opts][-t eps][-z zout][-e spec][-a|-q][-fT][-n] pfile zspec ..\n", + "Usage: %s [view opts][-t eps][-z zout][-e spec][-B][-a|-q][-fT][-n] pfile zspec ..\n", progname); exit(1); #undef check } +int headline(s) /* process header string */ char *s; { char fmt[32]; if (isheadid(s)) - return; + return(0); if (formatval(fmt, s)) { - wrongformat = strcmp(fmt, COLRFMT); - return; + if (globmatch(ourfmt, fmt)) { + wrongformat = 0; + strcpy(ourfmt, fmt); + } else + wrongformat = 1; + return(0); } - putc('\t', stdout); - fputs(s, stdout); - + if (nvavg < 2) { + putc('\t', stdout); + fputs(s, stdout); + } if (isexpos(s)) { theirexp *= exposval(s); - return; + return(0); } if (isview(s) && sscanview(&theirview, s) > 0) gotview++; + return(0); } +nextview(fp) /* get and set next view */ +FILE *fp; +{ + char linebuf[256]; + char *err; + register int i; + + if (fp != NULL) { + do /* get new view */ + if (fgets(linebuf, sizeof(linebuf), fp) == NULL) + return(EOF); + while (!isview(linebuf) || !sscanview(&ourview, linebuf)); + } + /* set new view */ + if ((err = setview(&ourview)) != NULL) { + fprintf(stderr, "%s: %s\n", progname, err); + exit(1); + } + if (!nvavg) { /* first view */ + copystruct(&avgview, &ourview); + return(nvavg++); + } + /* add to average view */ + for (i = 0; i < 3; i++) { + avgview.vp[i] += ourview.vp[i]; + avgview.vdir[i] += ourview.vdir[i]; + avgview.vup[i] += ourview.vup[i]; + } + avgview.horiz += ourview.horiz; + avgview.vert += ourview.vert; + avgview.hoff += ourview.hoff; + avgview.voff += ourview.voff; + avgview.vfore += ourview.vfore; + avgview.vaft += ourview.vaft; + return(nvavg++); +} + + +compavgview() /* compute average view */ +{ + register int i; + double f; + + if (nvavg < 2) + return; + f = 1.0/nvavg; + for (i = 0; i < 3; i++) { + avgview.vp[i] *= f; + avgview.vdir[i] *= f; + avgview.vup[i] *= f; + } + avgview.horiz *= f; + avgview.vert *= f; + avgview.hoff *= f; + avgview.voff *= f; + avgview.vfore *= f; + avgview.vaft *= f; + if (setview(&avgview) != NULL) /* in case of emergency... */ + copystruct(&avgview, &ourview); + pixaspect = viewaspect(&avgview) * hresolu / vresolu; +} + + addpicture(pfile, zspec) /* add picture to output */ char *pfile, *zspec; { @@ -347,8 +433,10 @@ char *pfile, *zspec; syserror(pfile); /* get header with exposure and view */ theirexp = 1.0; + copystruct(&theirview, &stdview); gotview = 0; - printf("%s:\n", pfile); + if (nvavg < 2) + printf("%s:\n", pfile); getheader(pfp, headline, NULL); if (wrongformat || !gotview || !fgetsresolu(&tresolu, pfp)) { fprintf(stderr, "%s: picture format error\n", pfile); @@ -381,8 +469,8 @@ char *pfile, *zspec; if (xlim == NULL) syserror(progname); if (!getperim(xlim, &ylim, zin, zfd)) { /* overlapping area? */ - free((char *)zin); - free((char *)xlim); + free((void *)zin); + free((void *)xlim); if (zfd != -1) close(zfd); fclose(pfp); @@ -401,7 +489,7 @@ char *pfile, *zspec; exit(1); } if (zfd != -1 && lseek(zfd, - (long)ylim.min*scanlen(&tresolu)*sizeof(float), 0) < 0) + (off_t)ylim.min*scanlen(&tresolu)*sizeof(float), 0) < 0) syserror(zspec); /* load image */ for (y = ylim.min; y <= ylim.max; y++) { @@ -416,10 +504,10 @@ char *pfile, *zspec; addscanline(xlim+y, y, scanin, zin, plast); } /* clean up */ - free((char *)xlim); - free((char *)scanin); - free((char *)zin); - free((char *)plast); + free((void *)xlim); + free((void *)scanin); + free((void *)zin); + free((void *)plast); fclose(pfp); if (zfd != -1) close(zfd); @@ -432,9 +520,9 @@ register VIEW *vw1, *vw2; { double m4t[4][4]; - if (vw1->type != VT_PER && vw1->type != VT_PAR) + if (vw1->type != VT_PER & vw1->type != VT_PAR) return(0); - if (vw2->type != VT_PER && vw2->type != VT_PAR) + if (vw2->type != VT_PER & vw2->type != VT_PAR) return(0); setident4(xfmat); xfmat[0][0] = vw1->hvec[0]; @@ -551,10 +639,10 @@ double z; y1 = p0->y + c1*s1y/l1; for (c2 = l2; c2-- > 0; ) { x = x1 + c2*s2x/l2; - if (x < 0 || x >= hresolu) + if (x < 0 | x >= hresolu) continue; y = y1 + c2*s2y/l2; - if (y < 0 || y >= vresolu) + if (y < 0 | y >= vresolu) continue; if (averaging) { if (zscan(y)[x] <= 0 || zscan(y)[x]-z @@ -582,22 +670,25 @@ register FVECT pos; { FVECT pt, tdir, odir; double d; - register int i; if (pos[2] <= 0) /* empty pixel */ return(0); if (usematrix) { pos[0] += theirview.hoff - .5; pos[1] += theirview.voff - .5; + if (normdist & theirview.type == VT_PER) + d = sqrt(1. + pos[0]*pos[0]*theirview.hn2 + + pos[1]*pos[1]*theirview.vn2); + else + d = 1.; + pos[2] += d*theirview.vfore; if (theirview.type == VT_PER) { - if (normdist) /* adjust distance */ - pos[2] /= sqrt(1. + pos[0]*pos[0]*theirview.hn2 - + pos[1]*pos[1]*theirview.vn2); + pos[2] /= d; pos[0] *= pos[2]; pos[1] *= pos[2]; } multp3(pos, pos, theirs2ours); - if (pos[2] <= 0) + if (pos[2] <= ourview.vfore) return(0); if (ourview.type == VT_PER) { pos[0] /= pos[2]; @@ -605,6 +696,7 @@ register FVECT pos; } pos[0] += .5 - ourview.hoff; pos[1] += .5 - ourview.voff; + pos[2] -= ourview.vfore; } else { if (viewray(pt, tdir, &theirview, pos[0], pos[1]) < -FTINY) return(0); @@ -618,19 +710,22 @@ register FVECT pos; if (pos[2] <= 0) return(0); } - if (pos[0] < 0 || pos[0] >= 1-FTINY || pos[1] < 0 || pos[1] >= 1-FTINY) + if (pos[0] < 0 | pos[0] >= 1-FTINY | pos[1] < 0 | pos[1] >= 1-FTINY) return(0); if (!averaging) return(1); - if (ourview.type == VT_PAR) /* compute our direction */ - VCOPY(odir, ourview.vdir); - else - for (i = 0; i < 3; i++) - odir[i] = (pt[i] - ourview.vp[i])/pos[2]; - d = DOT(odir,tdir); /* compute pixel weight */ - if (d >= 1.-1./MAXWT/MAXWT) + /* compute pixel weight */ + if (ourview.type == VT_PAR) { + d = DOT(ourview.vdir,tdir); + d = 1. - d*d; + } else { + VSUB(odir, pt, ourview.vp); + d = DOT(odir,tdir); + d = 1. - d*d/DOT(odir,odir); + } + if (d <= 1./MAXWT/MAXWT) return(MAXWT); /* clip to maximum weight */ - return(1./sqrt(1.-d)); + return(1./sqrt(d)); } @@ -661,7 +756,7 @@ int zfd; yl->min = 32000; yl->max = 0; /* search for points on image */ for (y = step - 1; y < numscans(&tresolu); y += step) { if (zfd != -1) { - if (lseek(zfd, (long)y*scanlen(&tresolu)*sizeof(float), + if (lseek(zfd, (off_t)y*scanlen(&tresolu)*sizeof(float), 0) < 0) syserror("lseek"); if (read(zfd, (char *)zline, @@ -822,7 +917,7 @@ int samp; xback = -2; } } - free((char *)yback); + free((void *)yback); } @@ -835,6 +930,8 @@ int (*fill)(); for (x = 0; x < hresolu; x++) if (zscan(y)[x] <= 0) (*fill)(x,y); + if (fill == rcalfill) + clearqueue(); } @@ -846,7 +943,7 @@ clipaft() /* perform aft clipping as indicated */ double yzn2, vx; if (ourview.vaft <= FTINY) - return; + return(0); tstdist = ourview.vaft - ourview.vfore; for (y = 0; y < vresolu; y++) { if (adjtest) { /* adjust test */ @@ -870,9 +967,50 @@ clipaft() /* perform aft clipping as indicated */ zscan(y)[x] = 0.0; } } + return(1); } +addblur() /* add to blurred picture */ +{ + COLOR cval; + double d; + register int i; + + if (!blurring) + return(0); + i = hresolu*vresolu; + if (nvavg < 2) + if (averaging) + while (i--) { + copycolor(ourbpict[i], ourspict[i]); + d = 1.0/ourweigh[i]; + scalecolor(ourbpict[i], d); + } + else + while (i--) + colr_color(ourbpict[i], ourpict[i]); + else + if (averaging) + while (i--) { + copycolor(cval, ourspict[i]); + d = 1.0/ourweigh[i]; + scalecolor(cval, d); + addcolor(ourbpict[i], cval); + } + else + while (i--) { + colr_color(cval, ourpict[i]); + addcolor(ourbpict[i], cval); + } + /* print view */ + printf("VIEW%d:", nvavg); + fprintview(&ourview, stdout); + putchar('\n'); + return(1); +} + + writepicture() /* write out picture (alters buffer) */ { int y; @@ -881,7 +1019,14 @@ writepicture() /* write out picture (alters buffer) fprtresolu(hresolu, vresolu, stdout); for (y = vresolu-1; y >= 0; y--) - if (averaging) { + if (blurring) { + for (x = 0; x < hresolu; x++) { /* compute avg. */ + d = rexpadj/nvavg; + scalecolor(bscan(y)[x], d); + } + if (fwritescan(bscan(y), hresolu, stdout) < 0) + syserror(progname); + } else if (averaging) { for (x = 0; x < hresolu; x++) { /* average pixels */ d = rexpadj/wscan(y)[x]; scalecolor(sscan(y)[x], d); @@ -950,7 +1095,7 @@ char *prog, *args; int rval; register char **wp, *cp; - if (childpid != -1) { + if (PDesc.running) { fprintf(stderr, "%s: too many calculations\n", progname); exit(1); } @@ -969,7 +1114,7 @@ char *prog, *args; } *wp = NULL; /* start process */ - if ((rval = open_process(PDesc, argv)) < 0) + if ((rval = open_process(&PDesc, argv)) < 0) syserror(progname); if (rval == 0) { fprintf(stderr, "%s: command not found\n", argv[0]); @@ -984,11 +1129,10 @@ char *prog, *args; caldone() /* done with calculation */ { - if (childpid == -1) + if (!PDesc.running) return; clearqueue(); - close_process(PDesc); - childpid = -1; + close_process(&PDesc); } @@ -1024,9 +1168,10 @@ clearqueue() /* process queue */ } /* mark end and get results */ bzero((char *)fbp, 6*sizeof(float)); - if (process(PDesc, fbuf, fbuf, 4*sizeof(float)*queuesiz, + if (process(&PDesc, (char *)fbuf, (char *)fbuf, + 4*sizeof(float)*(queuesiz+1), 6*sizeof(float)*(queuesiz+1)) != - 4*sizeof(float)*queuesiz) { + 4*sizeof(float)*(queuesiz+1)) { fprintf(stderr, "%s: error reading from rtrace process\n", progname); exit(1);