--- ray/src/px/pcomb.c 1996/08/30 17:39:39 2.17 +++ ray/src/px/pcomb.c 2003/06/05 19:29:34 2.23 @@ -1,9 +1,6 @@ -/* Copyright (c) 1992 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: pcomb.c,v 2.23 2003/06/05 19:29:34 schorsch Exp $"; #endif - /* * Combine picture files according to calcomp functions. * @@ -11,17 +8,12 @@ static char SCCSid[] = "$SunId$ LBL"; */ #include "standard.h" - #include "color.h" - -#include "resolu.h" - #include "calcomp.h" - #include "view.h" #define MAXINP 32 /* maximum number of input files */ -#define WINSIZ 17 /* scanline window size */ +#define WINSIZ 64 /* scanline window size */ #define MIDSCN ((WINSIZ-1)/2+1) struct { @@ -46,12 +38,14 @@ char vbrtin[] = "li"; char vbrtout[] = "lo"; char vcolexp[3][4] = {"re", "ge", "be"}; char vbrtexp[] = "le"; +char vpixaspect[] = "pa"; -char vray[6][4] = {"Ox", "Oy", "Oz", "Dx", "Dy", "Dz"}; +char vray[7][4] = {"Ox", "Oy", "Oz", "Dx", "Dy", "Dz", "T"}; char vpsize[] = "S"; char vnfiles[] = "nfiles"; +char vwhteff[] = "WE"; char vxmax[] = "xmax"; char vymax[] = "ymax"; char vxres[] = "xres"; @@ -86,12 +80,9 @@ 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 + SET_DEFAULT_BINARY(); + SET_FILE_BINARY(stdin); + SET_FILE_BINARY(stdout); progname = argv[0]; /* scan options */ for (a = 1; a < argc; a++) { @@ -112,6 +103,7 @@ char *argv[]; break; } newheader("RADIANCE", stdout); /* start header */ + fputnow(stdout); /* process files */ for (nfiles = 0; nfiles < MAXINP; nfiles++) { setcolor(input[nfiles].coef, 1.0, 1.0, 1.0); @@ -169,6 +161,7 @@ char *argv[]; colval(input[nfiles].expos,GRN); colval(input[nfiles].coef,BLU) /= colval(input[nfiles].expos,BLU); + setcolor(input[nfiles].expos, 1.0, 1.0, 1.0); } nfiles++; original = 0; @@ -225,7 +218,7 @@ usage: } -tputs(s) /* put out string preceded by a tab */ +tabputs(s) /* put out string preceded by a tab */ char *s; { char fmt[32]; @@ -233,14 +226,14 @@ char *s; COLOR ctmp; if (isheadid(s)) /* header id */ - return; /* don't echo */ + return(0); /* don't echo */ if (formatval(fmt, s)) { /* check format */ if (globmatch(ourfmt, fmt)) { wrongformat = 0; strcpy(ourfmt, fmt); } else - wrongformat = 1; - return; /* don't echo */ + wrongformat = globmatch(PICFMT, fmt) ? 1 : -1; + return(0); /* don't echo */ } if (isexpos(s)) { /* exposure */ d = exposval(s); @@ -248,13 +241,13 @@ char *s; } else if (iscolcor(s)) { /* color correction */ colcorval(ctmp, s); multcolor(input[nfiles].expos, ctmp); - } else if (isaspect(s)) { + } else if (isaspect(s)) input[nfiles].pa *= aspectval(s); - } else if (isview(s) && sscanview(&input[nfiles].vw, s) > 0) + else if (isview(s) && sscanview(&input[nfiles].vw, s) > 0) gotview++; /* echo line */ putchar('\t'); - fputs(s, stdout); + return(fputs(s, stdout)); } @@ -265,12 +258,16 @@ checkfile() /* ready a file */ gotview = 0; fputs(input[nfiles].name, stdout); fputs(":\n", stdout); - getheader(input[nfiles].fp, tputs, NULL); - if (wrongformat) { + getheader(input[nfiles].fp, tabputs, NULL); + if (wrongformat < 0) { eputs(input[nfiles].name); - eputs(": not in Radiance picture format\n"); + eputs(": not a Radiance picture\n"); quit(1); } + if (wrongformat > 0) { + wputs(input[nfiles].name); + wputs(": warning -- incompatible picture format\n"); + } if (!gotview || setview(&input[nfiles].vw) != NULL) input[nfiles].vw.type = 0; if (!fgetsresolu(&input[nfiles].rs, input[nfiles].fp)) { @@ -314,9 +311,10 @@ double (*ourbright)() = rgb_bright; init() /* perform final setup */ { - double l_colin(), l_expos(), l_ray(), l_psize(); + double l_colin(), l_expos(), l_pixaspect(), l_ray(), l_psize(); register int i; /* define constants */ + varset("PI", ':', PI); varset(vnfiles, ':', (double)nfiles); varset(vxmax, ':', (double)xmax); varset(vymax, ':', (double)ymax); @@ -327,12 +325,16 @@ init() /* perform final setup */ } funset(vbrtexp, 1, ':', l_expos); funset(vbrtin, 1, '=', l_colin); - for (i = 0; i < 6; i++) + funset(vpixaspect, 1, ':', l_pixaspect); + for (i = 0; i < 7; i++) funset(vray[i], 1, '=', l_ray); funset(vpsize, 1, '=', l_psize); /* set brightness function */ - if (!strcmp(ourfmt, CIEFMT)) + if (!strcmp(ourfmt, CIEFMT)) { + varset(vwhteff, ':', 1.0); ourbright = xyz_bright; + } else + varset(vwhteff, ':', WHTEFFICACY); } @@ -390,7 +392,7 @@ combine() /* combine pictures */ quit(1); } } - efree(scanout); + efree((char *)scanout); } @@ -443,6 +445,18 @@ register char *nam; double +l_pixaspect() /* return pixel aspect ratio */ +{ + register int fn; + + fn = argument(1) - .5; + if (fn < 0 || fn >= nfiles) + return(1.0); + return(input[fn].pa); +} + + +double l_colin(nam) /* return color value for picture */ register char *nam; { @@ -450,10 +464,7 @@ register char *nam; register int n, xoff, yoff; double d; - d = argument(1); - if (d > -.5 && d < .5) - return((double)nfiles); - fn = d - .5; + fn = argument(1) - .5; if (fn < 0 || fn >= nfiles) { errno = EDOM; return(0.0); @@ -505,33 +516,31 @@ register char *nam; { static unsigned long ltick[MAXINP]; static FVECT lorg[MAXINP], ldir[MAXINP]; + static double ldist[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; + fn = argument(1) - .5; if (fn < 0 || fn >= nfiles) { errno = EDOM; return(0.0); } - if (ltick[fn] < eclock) { /* need to compute? */ + 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; + ldist[fn] = -1.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; + ldist[fn] = viewray(lorg[fn], ldir[fn], + &input[fn].vw, loc[0], loc[1]); } + ltick[fn] = eclock; } - i = 6; + if (nam == vray[i=6]) + return(ldist[fn]); while (i--) if (nam == vray[i]) return(i < 3 ? lorg[fn][i] : ldir[fn][i-3]); @@ -545,49 +554,48 @@ l_psize() /* compute pixel size in steradians */ { static unsigned long ltick[MAXINP]; static double psize[MAXINP]; - FVECT dir0, org1, dir1; - FLOAT loc[2]; + FVECT dir0, org, dirx, diry; + FLOAT locx[2], locy[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) { + if (d < .5 || d >= nfiles+.5) { errno = EDOM; return(0.0); } - if (ltick[fn] < eclock) /* need to compute? */ - if (input[fn].vw.type == 0 || input[fn].vw.type == VT_PAR) + fn = d - .5; + if (ltick[fn] != eclock) { /* need to compute? */ + psize[fn] = 0.0; + if (input[fn].vw.type == 0) errno = EDOM; - else { - errno = 0; - dir0[0] = funvalue(vray[3], 1, &d); - if (errno) - return(0.0); - dir0[1] = funvalue(vray[4], 1, &d); - if (errno) - return(0.0); - dir0[2] = funvalue(vray[5], 1, &d); - if (errno) - return(0.0); - pix2loc(loc, &input[fn].rs, xscan+1, ymax-yscan); - psize[fn] = 0.0; - if (viewray(org1, dir1, - &input[fn].vw, loc[0], loc[1]) < 0) - errno = ERANGE; - else { + else if (input[fn].vw.type != VT_PAR && + funvalue(vray[6], 1, &d) >= 0) { + for (i = 0; i < 3; i++) + dir0[i] = funvalue(vray[3+i], 1, &d); + pix2loc(locx, &input[fn].rs, xscan+1, ymax-1-yscan); + pix2loc(locy, &input[fn].rs, xscan, ymax-yscan); + if (viewray(org, dirx, &input[fn].vw, + locx[0], locx[1]) >= 0 && + viewray(org, diry, &input[fn].vw, + locy[0], locy[1]) >= 0) { /* approximate solid angle */ - psize[fn] = dist2(dir0, dir1) * input[fn].pa / - (1.0 + input[fn].pa*input[fn].pa); - ltick[fn] = eclock; + for (i = 0; i < 3; i++) { + dirx[i] -= dir0[i]; + diry[i] -= dir0[i]; + } + fcross(dir0, dirx, diry); + psize[fn] = sqrt(DOT(dir0,dir0)); } } + ltick[fn] = eclock; + } return(psize[fn]); } +void wputs(msg) char *msg; { @@ -596,6 +604,7 @@ char *msg; } +void eputs(msg) char *msg; { @@ -603,6 +612,7 @@ char *msg; } +void quit(code) /* exit gracefully */ int code; {