--- ray/src/rt/rv2.c 1989/07/27 22:58:26 1.10 +++ ray/src/rt/rv2.c 1991/04/19 12:45:34 1.22 @@ -28,49 +28,23 @@ extern char *progname; getframe(s) /* get a new frame */ char *s; { - int x0, y0, x1, y1; - - if (!strcmp("all", s)) { - pframe.l = pframe.d = 0; - pframe.r = ourview.hresolu; - pframe.u = ourview.vresolu; - pdepth = 0; + if (getrect(s, &pframe) < 0) return; - } - if (sscanf(s, "%d %d %d %d", &x0, &y0, &x1, &y1) != 4) { - if (dev->getcur == NULL) - return; - (*dev->comout)("Pick first corner\n"); - if ((*dev->getcur)(&x0, &y0) == ABORT) - return; - (*dev->comout)("Pick second corner\n"); - if ((*dev->getcur)(&x1, &y1) == ABORT) - return; - } - if (x0 < x1) { - pframe.l = x0; - pframe.r = x1; - } else { - pframe.l = x1; - pframe.r = x0; - } - if (y0 < y1) { - pframe.d = y0; - pframe.u = y1; - } else { - pframe.d = y1; - pframe.u = y0; - } - if (pframe.l < 0) pframe.l = 0; - if (pframe.d < 0) pframe.d = 0; - if (pframe.r > ourview.hresolu) pframe.r = ourview.hresolu; - if (pframe.u > ourview.vresolu) pframe.u = ourview.vresolu; - if (pframe.l > pframe.r) pframe.l = pframe.r; - if (pframe.d > pframe.u) pframe.d = pframe.u; pdepth = 0; } +getrepaint(s) /* get area and repaint */ +char *s; +{ + RECT box; + + if (getrect(s, &box) < 0) + return; + paintrect(&ptrunk, 0, 0, hresolu, vresolu, &box); +} + + getview(s) /* get/show view parameters */ char *s; { @@ -89,13 +63,14 @@ char *s; } fputs(progname, fp); fprintview(&ourview, fp); + fputs(sskip(s), fp); fputs("\n", fp); fclose(fp); return; } sprintf(buf, "view type (%c): ", ourview.type); (*dev->comout)(buf); - (*dev->comin)(buf); + (*dev->comin)(buf, NULL); if (buf[0] == CTRL(C)) return; if (buf[0] && buf[0] != ourview.type) { nv.type = buf[0]; @@ -105,7 +80,7 @@ char *s; sprintf(buf, "view point (%.6g %.6g %.6g): ", ourview.vp[0], ourview.vp[1], ourview.vp[2]); (*dev->comout)(buf); - (*dev->comin)(buf); + (*dev->comin)(buf, NULL); if (buf[0] == CTRL(C)) return; if (sscanf(buf, "%lf %lf %lf", &nv.vp[0], &nv.vp[1], &nv.vp[2]) == 3) change++; @@ -114,7 +89,7 @@ char *s; sprintf(buf, "view direction (%.6g %.6g %.6g): ", ourview.vdir[0], ourview.vdir[1], ourview.vdir[2]); (*dev->comout)(buf); - (*dev->comin)(buf); + (*dev->comin)(buf, NULL); if (buf[0] == CTRL(C)) return; if (sscanf(buf,"%lf %lf %lf",&nv.vdir[0],&nv.vdir[1],&nv.vdir[2]) == 3) change++; @@ -123,7 +98,7 @@ char *s; sprintf(buf, "view up (%.6g %.6g %.6g): ", ourview.vup[0], ourview.vup[1], ourview.vup[2]); (*dev->comout)(buf); - (*dev->comin)(buf); + (*dev->comin)(buf, NULL); if (buf[0] == CTRL(C)) return; if (sscanf(buf,"%lf %lf %lf",&nv.vup[0],&nv.vup[1],&nv.vup[2]) == 3) change++; @@ -132,22 +107,22 @@ char *s; sprintf(buf, "view horiz and vert size (%.6g %.6g): ", ourview.horiz, ourview.vert); (*dev->comout)(buf); - (*dev->comin)(buf); + (*dev->comin)(buf, NULL); if (buf[0] == CTRL(C)) return; if (sscanf(buf, "%lf %lf", &nv.horiz, &nv.vert) == 2) change++; else { nv.horiz = ourview.horiz; nv.vert = ourview.vert; } - sprintf(buf, "x and y resolution (%d %d): ", - ourview.hresolu, ourview.vresolu); + sprintf(buf, "view shift and lift (%.6g %.6g): ", + ourview.hoff, ourview.voff); (*dev->comout)(buf); - (*dev->comin)(buf); + (*dev->comin)(buf, NULL); if (buf[0] == CTRL(C)) return; - if (sscanf(buf, "%d %d", &nv.hresolu, &nv.vresolu) == 2) + if (sscanf(buf, "%lf %lf", &nv.hoff, &nv.voff) == 2) change++; else { - nv.hresolu = ourview.hresolu; nv.vresolu = ourview.vresolu; + nv.hoff = ourview.hoff; nv.voff = ourview.voff; } if (change) newview(&nv); @@ -163,9 +138,9 @@ char *s; VIEW nv; if (sscanf(s, "%s", buf) == 1) { /* get parameters from a file */ - bcopy(&stdview, &nv, sizeof(VIEW)); + copystruct(&nv, &stdview); if ((fname = getpath(buf, NULL, 0)) == NULL || - (success = viewfile(fname, &nv)) == -1) { + (success = viewfile(fname, &nv, 0, 0)) == -1) { sprintf(errmsg, "cannot open \"%s\"", buf); error(COMMAND, errmsg); return; @@ -176,64 +151,17 @@ char *s; newview(&nv); return; } - if (oldview.hresolu == 0) { /* no old view! */ + if (oldview.type == 0) { /* no old view! */ error(COMMAND, "no previous view"); return; } - bcopy(&ourview, &nv, sizeof(VIEW)); - bcopy(&oldview, &ourview, sizeof(VIEW)); - bcopy(&nv, &oldview, sizeof(VIEW)); + copystruct(&nv, &ourview); + copystruct(&ourview, &oldview); + copystruct(&oldview, &nv); newimage(); } -getinterest(s, direc, vec, mp) /* get area of interest */ -char *s; -int direc; -FVECT vec; -double *mp; -{ - int x, y; - RAY thisray; - register int i; - - if (sscanf(s, "%lf", mp) != 1) - *mp = 1.0; - else if (*mp < -FTINY) /* negative zoom is reduction */ - *mp = -1.0 / *mp; - else if (*mp <= FTINY) { /* too small */ - error(COMMAND, "illegal magnification"); - return(-1); - } - if (sscanf(s, "%*lf %lf %lf %lf", &vec[0], &vec[1], &vec[2]) != 3) { - if (dev->getcur == NULL) - return(-1); - (*dev->comout)("Pick view center\n"); - if ((*dev->getcur)(&x, &y) == ABORT) - return(-1); - rayview(thisray.rorg, thisray.rdir, &ourview, x+.5, y+.5); - if (!direc || ourview.type == VT_PAR) { - rayorigin(&thisray, NULL, PRIMARY, 1.0); - if (!localhit(&thisray, &thescene)) { - error(COMMAND, "not a local object"); - return(-1); - } - } - if (direc) - if (ourview.type == VT_PAR) - for (i = 0; i < 3; i++) - vec[i] = thisray.rop[i] - ourview.vp[i]; - else - VCOPY(vec, thisray.rdir); - else - VCOPY(vec, thisray.rop); - } else if (direc) - for (i = 0; i < 3; i++) - vec[i] -= ourview.vp[i]; - return(0); -} - - getaim(s) /* aim camera */ char *s; { @@ -243,18 +171,12 @@ char *s; if (getinterest(s, 1, nv.vdir, &zfact) < 0) return; + nv.type = ourview.type; VCOPY(nv.vp, ourview.vp); VCOPY(nv.vup, ourview.vup); - nv.hresolu = ourview.hresolu; nv.vresolu = ourview.vresolu; - if ((nv.type = ourview.type) == VT_PAR) { - nv.horiz = ourview.horiz / zfact; - nv.vert = ourview.vert / zfact; - } else { - nv.horiz = atan(tan(ourview.horiz*(PI/180./2.))/zfact) / - (PI/180./2.); - nv.vert = atan(tan(ourview.vert*(PI/180./2.))/zfact) / - (PI/180./2.); - } + nv.hoff = ourview.hoff; nv.voff = ourview.voff; + nv.horiz = ourview.horiz; nv.vert = ourview.vert; + zoomview(&nv, zfact); newview(&nv); } @@ -284,24 +206,18 @@ char *s; error(COMMAND, "missing angle"); return; } + nv.type = ourview.type; VCOPY(nv.vp, ourview.vp); VCOPY(nv.vup, ourview.vup); - nv.hresolu = ourview.hresolu; nv.vresolu = ourview.vresolu; + nv.hoff = ourview.hoff; nv.voff = ourview.voff; spinvector(nv.vdir, ourview.vdir, ourview.vup, angle*(PI/180.)); if (elev != 0.0) { fcross(v1, nv.vdir, ourview.vup); normalize(v1); spinvector(nv.vdir, nv.vdir, v1, elev*(PI/180.)); } - if ((nv.type = ourview.type) == VT_PAR) { - nv.horiz = ourview.horiz / zfact; - nv.vert = ourview.vert / zfact; - } else { - nv.horiz = atan(tan(ourview.horiz*(PI/180./2.))/zfact) / - (PI/180./2.); - nv.vert = atan(tan(ourview.vert*(PI/180./2.))/zfact) / - (PI/180./2.); - } + nv.horiz = ourview.horiz; nv.vert = ourview.vert; + zoomview(&nv, zfact); newview(&nv); } @@ -343,7 +259,7 @@ char *s; if ((*dev->getcur)(&x, &y) == ABORT) return; r.l = r.d = 0; - r.r = ourview.hresolu; r.u = ourview.vresolu; + r.r = hresolu; r.u = vresolu; p = findrect(x, y, &ptrunk, &r, -1); e = 1.0; } else { @@ -355,7 +271,7 @@ char *s; if (*cp == '\0') { /* interactive */ sprintf(buf, "exposure (%lf): ", exposure); (*dev->comout)(buf); - (*dev->comin)(buf); + (*dev->comin)(buf, NULL); for (cp = buf; isspace(*cp); cp++) ; if (*cp == '\0') @@ -408,7 +324,7 @@ register char *s; if (s[0] == '\0') { (*dev->comout)("aa ab ad ar as av dc dj dt lr lw sp st: "); - (*dev->comin)(buf); + (*dev->comin)(buf, NULL); s = buf; } switch (s[0]) { @@ -419,7 +335,7 @@ register char *s; sprintf(buf, "limit weight (%.6g): ", minweight); (*dev->comout)(buf); - (*dev->comin)(buf); + (*dev->comin)(buf, NULL); if (sscanf(buf, "%lf", &d0) != 1) break; } @@ -430,7 +346,7 @@ register char *s; sprintf(buf, "limit reflection (%d): ", maxdepth); (*dev->comout)(buf); - (*dev->comin)(buf); + (*dev->comin)(buf, NULL); if (sscanf(buf, "%d", &i0) != 1) break; } @@ -447,7 +363,7 @@ register char *s; sprintf(buf, "direct jitter (%.6g): ", dstrsrc); (*dev->comout)(buf); - (*dev->comin)(buf); + (*dev->comin)(buf, NULL); if (sscanf(buf, "%lf", &d0) != 1) break; } @@ -458,7 +374,7 @@ register char *s; sprintf(buf, "direct certainty (%.6g): ", shadcert); (*dev->comout)(buf); - (*dev->comin)(buf); + (*dev->comin)(buf, NULL); if (sscanf(buf, "%lf", &d0) != 1) break; } @@ -469,7 +385,7 @@ register char *s; sprintf(buf, "direct threshold (%.6g): ", shadthresh); (*dev->comout)(buf); - (*dev->comin)(buf); + (*dev->comin)(buf, NULL); if (sscanf(buf, "%lf", &d0) != 1) break; } @@ -489,7 +405,7 @@ register char *s; colval(ambval,GRN), colval(ambval,BLU)); (*dev->comout)(buf); - (*dev->comin)(buf); + (*dev->comin)(buf, NULL); if (sscanf(buf, "%lf %lf %lf", &d0, &d1, &d2) != 3) break; @@ -501,7 +417,7 @@ register char *s; sprintf(buf, "ambient accuracy (%.6g): ", ambacc); (*dev->comout)(buf); - (*dev->comin)(buf); + (*dev->comin)(buf, NULL); if (sscanf(buf, "%lf", &d0) != 1) break; } @@ -512,7 +428,7 @@ register char *s; sprintf(buf, "ambient divisions (%d): ", ambdiv); (*dev->comout)(buf); - (*dev->comin)(buf); + (*dev->comin)(buf, NULL); if (sscanf(buf, "%d", &i0) != 1) break; } @@ -523,7 +439,7 @@ register char *s; sprintf(buf, "ambient super-samples (%d): ", ambssamp); (*dev->comout)(buf); - (*dev->comin)(buf); + (*dev->comin)(buf, NULL); if (sscanf(buf, "%d", &i0) != 1) break; } @@ -534,7 +450,7 @@ register char *s; sprintf(buf, "ambient bounces (%d): ", ambounce); (*dev->comout)(buf); - (*dev->comin)(buf); + (*dev->comin)(buf, NULL); if (sscanf(buf, "%d", &i0) != 1) break; } @@ -545,7 +461,7 @@ register char *s; sprintf(buf, "ambient resolution (%d): ", ambres); (*dev->comout)(buf); - (*dev->comin)(buf); + (*dev->comin)(buf, NULL); if (sscanf(buf, "%d", &i0) != 1) break; } @@ -562,7 +478,7 @@ register char *s; if (sscanf(s+2, "%d", &i0) != 1) { sprintf(buf, "sample pixel (%d): ", psample); (*dev->comout)(buf); - (*dev->comin)(buf); + (*dev->comin)(buf, NULL); if (sscanf(buf, "%d", &i0) != 1) break; } @@ -574,7 +490,7 @@ register char *s; sprintf(buf, "sample threshold (%.6g): ", maxdiff); (*dev->comout)(buf); - (*dev->comin)(buf); + (*dev->comin)(buf, NULL); if (sscanf(buf, "%lf", &d0) != 1) break; } @@ -613,8 +529,12 @@ char *s; if ((*dev->getcur)(&x, &y) == ABORT) return; - rayview(thisray.rorg, thisray.rdir, &ourview, x+.5, y+.5); - + if (viewray(thisray.rorg, thisray.rdir, &ourview, + (x+.5)/hresolu, (y+.5)/vresolu) < 0) { + error(COMMAND, "not on image"); + return; + } + } else if (normalize(thisray.rdir) == 0.0) { error(COMMAND, "zero ray direction"); return; @@ -632,7 +552,7 @@ char *s; ofun[thisray.ro->otype].funame, thisray.ro->oname); (*dev->comout)(buf); - (*dev->comin)(buf); + (*dev->comin)(buf, NULL); if (thisray.rot >= FHUGE) (*dev->comout)("at infinity"); else { @@ -640,14 +560,14 @@ char *s; thisray.rop[1], thisray.rop[2]); (*dev->comout)(buf); } - (*dev->comin)(buf); + (*dev->comin)(buf, NULL); sprintf(buf, "with value (%.6g %.6g %.6g)", colval(thisray.rcol,RED), colval(thisray.rcol,GRN), colval(thisray.rcol,BLU)); (*dev->comout)(buf); } - (*dev->comin)(buf); + (*dev->comin)(buf, NULL); } @@ -676,18 +596,21 @@ char *s; /* write header */ fputs(progname, fp); fprintview(&ourview, fp); - fputs("\n", fp); + putc('\n', fp); if (exposure != 1.0) - fprintf(fp, "EXPOSURE=%e\n", exposure); - fprintf(fp, "\n-Y %d +X %d\n", ourview.vresolu, ourview.hresolu); + fputexpos(exposure, fp); + if (dev->pixaspect != 1.0) + fputaspect(dev->pixaspect, fp); + fputformat(COLRFMT, fp); + putc('\n', fp); + fputresolu(YMAJOR|YDECR, hresolu, vresolu, fp); - scanline = (COLR *)malloc(ourview.hresolu*sizeof(COLR)); + scanline = (COLR *)malloc(hresolu*sizeof(COLR)); if (scanline == NULL) error(SYSTEM, "out of memory in writepict"); - for (y = ourview.vresolu-1; y >= 0; y--) { - getpictcolrs(y, scanline, &ptrunk, - ourview.hresolu, ourview.vresolu); - if (fwritecolrs(scanline, ourview.hresolu, fp) < 0) + for (y = vresolu-1; y >= 0; y--) { + getpictcolrs(y, scanline, &ptrunk, hresolu, vresolu); + if (fwritecolrs(scanline, hresolu, fp) < 0) break; } if (fclose(fp) < 0)