--- ray/src/common/image.c 1989/10/20 16:53:03 1.2 +++ ray/src/common/image.c 1990/09/13 08:34:15 1.10 @@ -14,160 +14,217 @@ static char SCCSid[] = "$SunId$ LBL"; #include "view.h" -VIEW stdview = STDVIEW(512); /* default view parameters */ +VIEW stdview = STDVIEW; /* default view parameters */ char * -setview(v) /* set vhinc and vvinc, return message on error */ +setview(v) /* set hvec and vvec, return message on error */ register VIEW *v; { - double tan(), dt; - + extern double tan(), normalize(); + if (normalize(v->vdir) == 0.0) /* normalize direction */ return("zero view direction"); - - fcross(v->vhinc, v->vdir, v->vup); /* compute horiz dir */ - if (normalize(v->vhinc) == 0.0) + fcross(v->hvec, v->vdir, v->vup); /* compute horiz dir */ + + if (normalize(v->hvec) == 0.0) return("illegal view up vector"); - - fcross(v->vvinc, v->vhinc, v->vdir); /* compute vert dir */ + fcross(v->vvec, v->hvec, v->vdir); /* compute vert dir */ + if (v->type == VT_PAR) - dt = v->horiz; + v->hn2 = v->horiz; else if (v->type == VT_PER) - dt = 2.0 * tan(v->horiz*(PI/180.0/2.0)); + v->hn2 = 2.0 * tan(v->horiz*(PI/180.0/2.0)); else return("unknown view type"); - if (dt <= FTINY || dt >= FHUGE) + if (v->hn2 <= FTINY || v->hn2 >= FHUGE) return("illegal horizontal view size"); - if (v->hresolu <= 0) - return("illegal horizontal resolution"); + v->hvec[0] *= v->hn2; + v->hvec[1] *= v->hn2; + v->hvec[2] *= v->hn2; + v->hn2 *= v->hn2; - dt /= (double)v->hresolu; - v->vhinc[0] *= dt; - v->vhinc[1] *= dt; - v->vhinc[2] *= dt; - if (v->type == VT_PAR) - dt = v->vert; + v->vn2 = v->vert; else - dt = 2.0 * tan(v->vert*(PI/180.0/2.0)); + v->vn2 = 2.0 * tan(v->vert*(PI/180.0/2.0)); - if (dt <= FTINY || dt >= FHUGE) + if (v->vn2 <= FTINY || v->vn2 >= FHUGE) return("illegal vertical view size"); - if (v->vresolu <= 0) - return("illegal vertical resolution"); - - dt /= (double)v->vresolu; - v->vvinc[0] *= dt; - v->vvinc[1] *= dt; - v->vvinc[2] *= dt; + v->vvec[0] *= v->vn2; + v->vvec[1] *= v->vn2; + v->vvec[2] *= v->vn2; + v->vn2 *= v->vn2; return(NULL); } -rayview(orig, direc, v, x, y) /* compute ray origin and direction */ +normaspect(va, ap, xp, yp) /* fix pixel aspect or resolution */ +double va; /* view aspect ratio */ +double *ap; /* pixel aspect in (or out if 0) */ +int *xp, *yp; /* x and y resolution in (or out if *ap!=0) */ +{ + if (*ap <= FTINY) + *ap = va * *xp / *yp; /* compute pixel aspect */ + else if (va * *xp > *ap * *yp) + *xp = *yp / va * *ap + .5; /* reduce x resolution */ + else + *yp = *xp * va / *ap + .5; /* reduce y resolution */ +} + + +viewray(orig, direc, v, x, y) /* compute ray origin and direction */ FVECT orig, direc; register VIEW *v; double x, y; { - register int i; + x += v->hoff - 0.5; + y += v->voff - 0.5; - x -= 0.5 * v->hresolu; - y -= 0.5 * v->vresolu; - if (v->type == VT_PAR) { /* parallel view */ - for (i = 0; i < 3; i++) - orig[i] = v->vp[i] + x*v->vhinc[i] + y*v->vvinc[i]; + orig[0] = v->vp[0] + x*v->hvec[0] + y*v->vvec[0]; + orig[1] = v->vp[1] + x*v->hvec[1] + y*v->vvec[1]; + orig[2] = v->vp[2] + x*v->hvec[2] + y*v->vvec[2]; VCOPY(direc, v->vdir); } else { /* perspective view */ VCOPY(orig, v->vp); - for (i = 0; i < 3; i++) - direc[i] = v->vdir[i] + x*v->vhinc[i] + y*v->vvinc[i]; + direc[0] = v->vdir[0] + x*v->hvec[0] + y*v->vvec[0]; + direc[1] = v->vdir[1] + x*v->hvec[1] + y*v->vvec[1]; + direc[2] = v->vdir[2] + x*v->hvec[2] + y*v->vvec[2]; normalize(direc); } } -sscanview(vp, s) /* get view parameters */ -register VIEW *vp; -register char *s; +viewpixel(xp, yp, zp, v, p) /* find image location for point */ +double *xp, *yp, *zp; +register VIEW *v; +FVECT p; { - for ( ; ; ) - switch (*s++) { - case '\0': - case '\n': - return(0); - case '-': - switch (*s++) { - case '\0': - return(-1); - case 'x': - if (sscanf(s, "%d", &vp->hresolu) != 1) - return(-1); - s = sskip(s); - continue; - case 'y': - if (sscanf(s, "%d", &vp->vresolu) != 1) - return(-1); - s = sskip(s); - continue; - case 'v': - switch (*s++) { - case '\0': - return(-1); - case 't': - vp->type = *s++; - continue; - case 'p': - if (sscanf(s, "%lf %lf %lf", - &vp->vp[0], - &vp->vp[1], - &vp->vp[2]) != 3) - return(-1); - s = sskip(sskip(sskip(s))); - continue; - case 'd': - if (sscanf(s, "%lf %lf %lf", - &vp->vdir[0], - &vp->vdir[1], - &vp->vdir[2]) != 3) - return(-1); - s = sskip(sskip(sskip(s))); - continue; - case 'u': - if (sscanf(s, "%lf %lf %lf", - &vp->vup[0], - &vp->vup[1], - &vp->vup[2]) != 3) - return(-1); - s = sskip(sskip(sskip(s))); - continue; - case 'h': - if (sscanf(s, "%lf", - &vp->horiz) != 1) - return(-1); - s = sskip(s); - continue; - case 'v': - if (sscanf(s, "%lf", - &vp->vert) != 1) - return(-1); - s = sskip(s); - continue; - } - continue; - } - continue; + extern double sqrt(); + double d; + FVECT disp; + + disp[0] = p[0] - v->vp[0]; + disp[1] = p[1] - v->vp[1]; + disp[2] = p[2] - v->vp[2]; + + if (v->type == VT_PAR) { /* parallel view */ + if (zp != NULL) + *zp = DOT(disp,v->vdir); + } else { /* perspective view */ + d = 1.0/DOT(disp,v->vdir); + if (zp != NULL) { + *zp = sqrt(DOT(disp,disp)); + if (d < 0.0) + *zp = -*zp; } + disp[0] *= d; + disp[1] *= d; + disp[2] *= d; + } + *xp = DOT(disp,v->hvec)/v->hn2 + 0.5 - v->hoff; + *yp = DOT(disp,v->vvec)/v->vn2 + 0.5 - v->voff; } +int +getviewopt(v, ac, av) /* process view argument */ +register VIEW *v; +int ac; +register char *av[]; +{ +#define check(c,n) if ((av[0][c]&&av[0][c]!=' ') || n>=ac) return(-1) + extern double atof(); + + if (ac <= 0 || av[0][0] != '-' || av[0][1] != 'v') + return(-1); + switch (av[0][2]) { + case 't': /* type */ + if (!av[0][3] || av[0][3]==' ') + return(-1); + check(4,0); + v->type = av[0][3]; + return(0); + case 'p': /* point */ + check(3,3); + v->vp[0] = atof(av[1]); + v->vp[1] = atof(av[2]); + v->vp[2] = atof(av[3]); + return(3); + case 'd': /* direction */ + check(3,3); + v->vdir[0] = atof(av[1]); + v->vdir[1] = atof(av[2]); + v->vdir[2] = atof(av[3]); + return(3); + case 'u': /* up */ + check(3,3); + v->vup[0] = atof(av[1]); + v->vup[1] = atof(av[2]); + v->vup[2] = atof(av[3]); + return(3); + case 'h': /* horizontal size */ + check(3,1); + v->horiz = atof(av[1]); + return(1); + case 'v': /* vertical size */ + check(3,1); + v->vert = atof(av[1]); + return(1); + case 's': /* shift */ + check(3,1); + v->hoff = atof(av[1]); + return(1); + case 'l': /* lift */ + check(3,1); + v->voff = atof(av[1]); + return(1); + default: + return(-1); + } +#undef check +} + + +int +sscanview(vp, s) /* get view parameters from string */ +VIEW *vp; +register char *s; +{ + int ac; + char *av[4]; + int na; + int nvopts = 0; + + while (*s == ' ') + s++; + while (*s) { + ac = 0; + do { + av[ac++] = s; + while (*s && *s != ' ') + s++; + while (*s == ' ') + s++; + } while (*s && ac < 4); + if ((na = getviewopt(vp, ac, av)) >= 0) { + if (na+1 < ac) + s = av[na+1]; + nvopts++; + } else if (ac > 1) + s = av[1]; + } + return(nvopts); +} + + fprintview(vp, fp) /* write out view parameters */ register VIEW *vp; FILE *fp; @@ -177,13 +234,13 @@ FILE *fp; fprintf(fp, " -vd %.6g %.6g %.6g", vp->vdir[0], vp->vdir[1], vp->vdir[2]); fprintf(fp, " -vu %.6g %.6g %.6g", vp->vup[0], vp->vup[1], vp->vup[2]); fprintf(fp, " -vh %.6g -vv %.6g", vp->horiz, vp->vert); - fprintf(fp, " -x %d -y %d", vp->hresolu, vp->vresolu); + fprintf(fp, " -vs %.6g -vl %.6g", vp->hoff, vp->voff); } static VIEW *hview; /* view from header */ static int gothview; /* success indicator */ -static char *altname[] = {NULL,"rpict","rview",VIEWSTR,NULL}; +static char *altname[] = {NULL,"rpict","rview","pinterp",VIEWSTR,NULL}; static @@ -194,7 +251,7 @@ char *s; for (an = altname; *an != NULL; an++) if (!strncmp(*an, s, strlen(*an))) { - if (sscanview(hview, s+strlen(*an)) == 0) + if (sscanview(hview, s+strlen(*an)) > 0) gothview++; return; } @@ -202,9 +259,10 @@ char *s; int -viewfile(fname, vp) /* get view from file */ +viewfile(fname, vp, xp, yp) /* get view from file */ char *fname; VIEW *vp; +int *xp, *yp; { extern char *progname; FILE *fp; @@ -217,6 +275,10 @@ VIEW *vp; gothview = 0; getheader(fp, gethview); + + if (xp != NULL && yp != NULL + && fgetresolu(xp, yp, fp) == -1) + gothview = 0; fclose(fp);